导入模板确定

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRequest/PurchaseclaimRequestMainServiceImpl.java

@@ -241,15 +241,15 @@ public class PurchaseclaimRequestMainServiceImpl implements PurchaseclaimRequest
                         detailDO.setNumber(createReqVO.getNumber());
                         detailDO.setMasterId(createReqVO.getId());
                         detailDO.setAmount(detailDO.getQty().multiply(detailDO.getSinglePrice()).setScale(6,BigDecimal.ROUND_HALF_UP));
+                        String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_CLAIM_REQUEST.getCode());
+                        createReqVO.setNumber(number);
                     }
                 }
-                if(!errorList.isEmpty()){
+                if(errorList.isEmpty()){
                     // 判断如果不存在，在进行插入
                     PurchaseclaimRequestMainDO existPurchaseclaimRequestMainDO = purchaseclaimRequestMainMapper.selectByAsnNumberAndSupplierCode(createReqVO.getAsnNumber(), createReqVO.getSupplierCode());
                     if(existPurchaseclaimRequestMainDO == null && mode != 3){
                         createReqVO.setStatus(DictFrameworkUtils.parseDictDataValue(DictTypeConstants.REQUEST_STATUS, "新增"));
-                        String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_CLAIM_RECORD.getCode());
-                        createReqVO.setNumber(number);
                         BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchaseClaimRequest");
                         if(businesstypeDO != null){
                             createReqVO.setBusinessType(businesstypeDO.getCode());
@@ -267,8 +267,6 @@ public class PurchaseclaimRequestMainServiceImpl implements PurchaseclaimRequest
                     }
                     else if(existPurchaseclaimRequestMainDO != null && mode != 2){
                         createReqVO.setStatus(DictFrameworkUtils.parseDictDataValue(DictTypeConstants.REQUEST_STATUS, "新增"));
-                        String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_CLAIM_RECORD.getCode());
-                        createReqVO.setNumber(number);
                         BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchaseClaimRequest");
                         if(businesstypeDO != null){
                             createReqVO.setBusinessType(businesstypeDO.getCode());

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainServiceImpl.java

@@ -97,9 +97,8 @@ public class PurchasereceiptRecordMainServiceImpl implements PurchasereceiptReco
     public PurchasereceiptRecordDetailDO selectPurchasereceiptExist(String ppoNumber,String psupplierCode,String pNumber,String ppoLine,String pitemCode){
         QueryWrapper queryWrapperMain = new QueryWrapper();
         queryWrapperMain.eq("number",pNumber);
-        queryWrapperMain.eq("supplier_code",psupplierCode);
         PurchasereceiptRecordMainDO purchasereceiptRecordMainDO = purchasereceiptRecordMainMapper.selectOne(queryWrapperMain);
-        if(purchasereceiptRecordMainDO != null && "TRUE".equals(purchasereceiptRecordMainDO.getAvailable())){
+        if(purchasereceiptRecordMainDO != null && "TRUE".equals(purchasereceiptRecordMainDO.getAvailable()) && purchasereceiptRecordMainDO.getSupplierCode().equals(psupplierCode)){
             QueryWrapper queryWrapperDetail = new QueryWrapper();
             queryWrapperDetail.eq("po_number",ppoNumber);
             queryWrapperDetail.eq("po_line",ppoLine);