修改发货申请 导入/新增/修改 校验模板

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestMainUpdateReqVO.java

@@ -14,6 +14,6 @@ public class IssueRequestMainUpdateReqVO extends IssueRequestMainBaseVO {
 
     @SubObject
     @Schema(description = "子表数据")
-    private List<IssueRequestDetailCreateReqVO> subList;
+    private List<IssueRequestDetailUpdateReqVO> subList;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/issueRequest/IssueRequestDetailConvert.java

@@ -35,9 +35,10 @@ public interface IssueRequestDetailConvert {
     List<IssueRequestDetailExcelVO> convertList02(List<IssueRequestDetailDO> list);
 
     List<IssueRequestDetailDO> convertList03(List<IssueRequestDetailCreateReqVO> list);
-
     List<IssueRequestDetailDO> convertList04(List<IssueRequestDetailUpdateReqVO> list);
 
+    List<IssueRequestDetailDO> convertList05(List<IssueRequestDetailUpdateReqVO> list);
+
     @Mappings({
             @Mapping(source = "mainDO.number", target = "number"),
             @Mapping(source = "mainDO.remark", target = "remark"),

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainServiceImpl.java

@@ -268,8 +268,8 @@ public class IssueRequestMainServiceImpl implements IssueRequestMainService {
         BusinesstypeDO businesstypeDO = new BusinesstypeDO();
         IssueRequestMainDO issueRequestMainDO = validateMainMethod(updateReqVO,businesstypeDO,requestsettingDO);
         //子表校验
-        List<IssueRequestDetailCreateReqVO> subList = updateReqVO.getSubList();
-        List<IssueRequestDetailDO> subDOList = IssueRequestDetailConvert.INSTANCE.convertList03(subList);
+        List<IssueRequestDetailUpdateReqVO> subList = updateReqVO.getSubList();
+        List<IssueRequestDetailDO> subDOList = IssueRequestDetailConvert.INSTANCE.convertList05(subList);
         for (IssueRequestDetailDO issueRequestDetailDO : subDOList) {
             validateDetailMethod(issueRequestDetailDO,businesstypeDO,issueRequestMainDO);
         }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainService.java

@@ -90,5 +90,5 @@ public interface SupplierdeliverRecordMainService {
      * @param ppoLine 订单行
      * @return 供应商发货记录子
      */
-    public SupplierdeliverRecordDetailDO selectSupplierdeliverRecordMainDO(String psupplierCode,String pnumber, String pitemCode, String ppoNumber, String ppoLine);
+    public SupplierdeliverRecordDetailDO selectSupplierdeliverRecordMainDO(String psupplierCode,String pasnNumber, String pitemCode, String ppoNumber, String ppoLine);
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainServiceImpl.java

@@ -93,9 +93,9 @@ public class SupplierdeliverRecordMainServiceImpl implements SupplierdeliverReco
         return supplierdeliverRecordMainMapper.selectList(exportReqVO);
     }
     @Override
-    public SupplierdeliverRecordDetailDO selectSupplierdeliverRecordMainDO(String psupplierCode,String pnumber, String pitemCode, String ppoNumber, String ppoLine) {
+    public SupplierdeliverRecordDetailDO selectSupplierdeliverRecordMainDO(String psupplierCode,String pasnNumber, String pitemCode, String ppoNumber, String ppoLine) {
         QueryWrapper queryWrapper = new QueryWrapper();
-        queryWrapper.eq("number",pnumber);
+        queryWrapper.eq("asn_number",pasnNumber);
         queryWrapper.eq("supplier_code",psupplierCode);
         SupplierdeliverRecordMainDO supplierdeliverRecordMainDO = supplierdeliverRecordMainMapper.selectOne(queryWrapper);
         if(supplierdeliverRecordMainDO != null && "TRUE".equals(supplierdeliverRecordMainDO.getAvailable())){
@@ -104,7 +104,6 @@ public class SupplierdeliverRecordMainServiceImpl implements SupplierdeliverReco
             queryWrapper1.eq("item_code",pitemCode);
             queryWrapper1.eq("po_number",ppoNumber);
             queryWrapper1.eq("po_line",ppoLine);
-            queryWrapper1.eq("number",pnumber);
             SupplierdeliverRecordDetailDO supplierdeliverRecordDetailDO = supplierdeliverRecordDetailMapper.selectOne(queryWrapper1);
             if(supplierdeliverRecordDetailDO != null){
                 return supplierdeliverRecordDetailDO;
@@ -113,7 +112,7 @@ public class SupplierdeliverRecordMainServiceImpl implements SupplierdeliverReco
 
             }
         }else {
-            throw new UtilException( "发货订单无效" + pnumber + "无效");
+            throw new UtilException( "发货订单" + pasnNumber + "无效");
         }
     }
 }