From 50b910bf25979516958f976ff9bf2bafdb38d93a Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <925258474@qq.com>
Date: Fri, 20 Sep 2024 15:14:53 +0800
Subject: [PATCH] no message

---
 .../main/java/com/youchain/businessdata/domain/Asn.java  | 2 +-
 .../businessdata/repository/PickDetailRepository.java    | 3 +--
 .../youchain/businessdata/rest/AsnDetailController.java  | 9 ++++-----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/youchain-system/src/main/java/com/youchain/businessdata/domain/Asn.java b/youchain-system/src/main/java/com/youchain/businessdata/domain/Asn.java
index fa75d51..cd6086f 100644
--- a/youchain-system/src/main/java/com/youchain/businessdata/domain/Asn.java
+++ b/youchain-system/src/main/java/com/youchain/businessdata/domain/Asn.java
@@ -47,7 +47,7 @@ public class Asn  extends BaseEntity implements Serializable {
 
     @Column(name = "`code`",unique = true,nullable = false)
     @NotBlank
-    @ApiModelProperty(value = "单号")
+    @ApiModelProperty(value = "凭证号")
     private String code;
 
     @OneToOne
diff --git a/youchain-system/src/main/java/com/youchain/businessdata/repository/PickDetailRepository.java b/youchain-system/src/main/java/com/youchain/businessdata/repository/PickDetailRepository.java
index 1119c65..ba82c0c 100644
--- a/youchain-system/src/main/java/com/youchain/businessdata/repository/PickDetailRepository.java
+++ b/youchain-system/src/main/java/com/youchain/businessdata/repository/PickDetailRepository.java
@@ -15,7 +15,6 @@
 */
 package com.youchain.businessdata.repository;
 
-import com.youchain.businessdata.domain.AsnDetail;
 import com.youchain.businessdata.domain.PickDetail;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
@@ -60,4 +59,4 @@ public interface PickDetailRepository extends JpaRepository<PickDetail, Long>, J
     @Query(value = "SELECT IFNULL(sum(allocated_qty),0) FROM `data_pick_detail` a WHERE source_id=:id", nativeQuery = true)
     Double getBcQty(@Param("id") Long id);
 
-}
\ No newline at end of file
+}
diff --git a/youchain-system/src/main/java/com/youchain/businessdata/rest/AsnDetailController.java b/youchain-system/src/main/java/com/youchain/businessdata/rest/AsnDetailController.java
index befc713..fc2b388 100644
--- a/youchain-system/src/main/java/com/youchain/businessdata/rest/AsnDetailController.java
+++ b/youchain-system/src/main/java/com/youchain/businessdata/rest/AsnDetailController.java
@@ -148,18 +148,17 @@ public class AsnDetailController {
     @Log("新增asn_detail")
     @ApiOperation("新增asn_detail")
     @PreAuthorize("@el.check('super:man')")
-    @Transient
     public ResponseEntity<Object> createAsnDetail(@Validated @RequestBody AsnDetail asnDetail) {
+        if(asnDetail.getAsn()==null){
+            return new ResponseEntity<>(ApiResult.fail(HttpStatus.BAD_REQUEST.value(), "请先提交入库单!", null),HttpStatus.BAD_REQUEST);
+        }
         asnDetail.setStatus(BizStatus.OPEN);
         asnDetail.setDept(UserUtils.getDept());
         if (asnDetail.getRemark() == null && asnDetail.getAsn().getDescription() != null) {
             asnDetail.setRemark(asnDetail.getAsn().getDescription());
         }
         asnDetailService.create(asnDetail);
-//        Stock stock=asnDetail.getStock();
-//        stock.setStatus(BaseStatus.USED);
-//        stockService.update(stock);
-        //orderQty
+
         //添加订单数量
         if (asnDetail.getOrderQty() != null && asnDetail.getOrderQty() != 0) {
             Asn asn = asnDetail.getAsn();