修改Bug。

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobDetailUpdateReqVO.java

@@ -2,9 +2,13 @@ package com.win.module.wms.controller.inspectJob.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @Schema(description = "管理后台 - 检验任务子更新 Request VO")
 @Data
@@ -40,4 +44,22 @@ public class InspectJobDetailUpdateReqVO extends InspectJobDetailBaseVO {
     @NotNull(message = "到库存状态不能为空")
     private String toInventoryStatus;
 
+    @Schema(description = "单价")
+    private BigDecimal singlePrice;
+
+    @Schema(description = "金额")
+    private BigDecimal amount;
+
+    @Schema(description = "到货日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime arriveDate;
+
+    @Schema(description = "生产日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime produceDate;
+
+    @Schema(description = "失效日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime expireDate;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainBaseVO.java

@@ -1,20 +1,13 @@
 package com.win.module.wms.controller.inspectJob.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import javax.validation.constraints.*;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 /**
@@ -117,7 +110,7 @@ public class InspectJobMainBaseVO {
 
     @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "订单号不能为空")
-    private String poUmber;
+    private String poNumber;
 
     @Schema(description = "订单行", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "订单行不能为空")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainExcelVO.java

@@ -80,7 +80,7 @@ public class InspectJobMainExcelVO {
     private String remark;
 
     @ExcelProperty("订单号")
-    private String poUmber;
+    private String poNumber;
 
     @ExcelProperty("订单行")
     private String poLine;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainExportReqVO.java

@@ -1,13 +1,11 @@
 package com.win.module.wms.controller.inspectJob.vo;
 
-import lombok.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
-import com.win.framework.common.pojo.PageParam;
 import java.time.LocalDateTime;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
@@ -98,7 +96,7 @@ public class InspectJobMainExportReqVO {
     private String creator;
 
     @Schema(description = "订单号")
-    private String poUmber;
+    private String poNumber;
 
     @Schema(description = "订单行")
     private String poLine;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainPageReqVO.java

@@ -1,13 +1,15 @@
 package com.win.module.wms.controller.inspectJob.vo;
 
-import lombok.*;
-
-import java.math.BigDecimal;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.win.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
 
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
@@ -100,7 +102,7 @@ public class InspectJobMainPageReqVO extends PageParam {
     private String creator;
 
     @Schema(description = "订单号")
-    private String poUmber;
+    private String poNumber;
 
     @Schema(description = "订单行")
     private String poLine;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectJob/InspectJobMainDO.java

@@ -1,18 +1,13 @@
 package com.win.module.wms.dal.dataobject.inspectJob;
 
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.sun.xml.bind.v2.TODO;
+import com.win.framework.mybatis.core.dataobject.BaseDO;
 import lombok.*;
-import java.util.*;
+
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
 import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.*;
+import java.time.LocalDateTime;
-import com.win.framework.mybatis.core.dataobject.BaseDO;
 
 /**
  * 检验任务主 DO
@@ -164,7 +159,7 @@ public class InspectJobMainDO extends BaseDO {
     /**
      * 订单号
      */
-    private String poUmber;
+    private String poNumber;
     /**
      * 订单行
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectJob/InspectJobMainMapper.java

@@ -51,7 +51,7 @@ public interface InspectJobMainMapper extends BaseMapperX<InspectJobMainDO> {
                 .eqIfPresent(InspectJobMainDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(InspectJobMainDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(InspectJobMainDO::getCreator, reqVO.getCreator())
-                .eqIfPresent(InspectJobMainDO::getPoUmber, reqVO.getPoUmber())
+                .eqIfPresent(InspectJobMainDO::getPoNumber, reqVO.getPoNumber())
                 .eqIfPresent(InspectJobMainDO::getPoLine, reqVO.getPoLine())
                 .eqIfPresent(InspectJobMainDO::getBatch, reqVO.getBatch())
                 .eqIfPresent(InspectJobMainDO::getItemCode, reqVO.getItemCode())
@@ -112,7 +112,7 @@ public interface InspectJobMainMapper extends BaseMapperX<InspectJobMainDO> {
                 .eqIfPresent(InspectJobMainDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(InspectJobMainDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(InspectJobMainDO::getCreator, reqVO.getCreator())
-                .eqIfPresent(InspectJobMainDO::getPoUmber, reqVO.getPoUmber())
+                .eqIfPresent(InspectJobMainDO::getPoNumber, reqVO.getPoNumber())
                 .eqIfPresent(InspectJobMainDO::getPoLine, reqVO.getPoLine())
                 .eqIfPresent(InspectJobMainDO::getBatch, reqVO.getBatch())
                 .eqIfPresent(InspectJobMainDO::getItemCode, reqVO.getItemCode())
@@ -155,7 +155,7 @@ public interface InspectJobMainMapper extends BaseMapperX<InspectJobMainDO> {
                 .eqIfPresent(InspectJobMainDO::getBusinessType, reqVO.getBusinessType())
                 .eqIfPresent(InspectJobMainDO::getRemark, reqVO.getRemark())
                 .eqIfPresent(InspectJobMainDO::getCreator, reqVO.getCreator())
-                .eqIfPresent(InspectJobMainDO::getPoUmber, reqVO.getPoUmber())
+                .eqIfPresent(InspectJobMainDO::getPoNumber, reqVO.getPoNumber())
                 .eqIfPresent(InspectJobMainDO::getPoLine, reqVO.getPoLine())
                 .eqIfPresent(InspectJobMainDO::getBatch, reqVO.getBatch())
                 .eqIfPresent(InspectJobMainDO::getItemCode, reqVO.getItemCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java

@@ -186,7 +186,7 @@ public class InspectJobMainServiceImpl implements InspectJobMainService {
         //创建采购收货记录主表
         InspectRecordMainDO inspectRecordMainDO = new InspectRecordMainDO();
         BeanUtils.copyProperties(inspectJobMainDO, inspectRecordMainDO);
-        String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_RECEIPT_RECORD.getCode());
+        String number = serialNumberApi.generateCode(RuleCodeEnum.INSPECT_RECORD.getCode());
         inspectRecordMainDO.setNumber(number);
         inspectRecordMainDO.setJobNumber(inspectJobMainDO.getNumber());
         inspectRecordMainDO.setId(null);
@@ -223,13 +223,21 @@ public class InspectJobMainServiceImpl implements InspectJobMainService {
             TransactionCreateReqVO transactionCreateReqVOIn = new TransactionCreateReqVO();
             BeanUtils.copyProperties(inspectRecordDetailDO, transactionCreateReqVOIn);
             //增加业务入类型
-            BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InspectReceiptJob");
+            BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InspectJob");
             transactionCreateReqVOIn.setBusinessType(businesstypeDO.getCode());
             TransactiontypeDO transactiontypeDOIn = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType());
             transactionCreateReqVOIn.setInventoryAction(transactiontypeDOIn.getInventoryAction());
             transactionCreateReqVOIn.setTransactionType(transactiontypeDOIn.getCode());
             transactionCreateReqVOIn.setRecordNumber(number);
+            transactionCreateReqVOIn.setQty(inspectJobDetailUpdateReqVO.getGoodQty());
+            transactionCreateReqVOIn.setBatch(inspectRecordMainDO.getBatch());
+            transactionCreateReqVOIn.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId()));
             transactionCreateReqVOIn.setInventoryStatus(inspectJobDetailUpdateReqVO.getToInventoryStatus());
+            transactionCreateReqVOIn.setSinglePrice(inspectJobDetailUpdateReqVO.getSinglePrice());
+            transactionCreateReqVOIn.setAmount(inspectJobDetailUpdateReqVO.getAmount());
+            transactionCreateReqVOIn.setArriveDate(inspectJobDetailUpdateReqVO.getArriveDate());
+            transactionCreateReqVOIn.setProduceDate(inspectJobDetailUpdateReqVO.getProduceDate());
+            transactionCreateReqVOIn.setExpireDate(inspectJobDetailUpdateReqVO.getExpireDate());
             transactionCreateReqVOIn.setId(null);
             //待确定库存事务信息
             transactionCreateReqVOList.add(transactionCreateReqVOIn);
@@ -241,8 +249,16 @@ public class InspectJobMainServiceImpl implements InspectJobMainService {
             TransactiontypeDO transactiontypeDOOut = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getOutTransactionType());
             transactionCreateReqVOOut.setInventoryAction(transactiontypeDOOut.getInventoryAction());
             transactionCreateReqVOOut.setTransactionType(transactiontypeDOOut.getCode());
+            transactionCreateReqVOOut.setBatch(inspectRecordMainDO.getBatch());
+            transactionCreateReqVOOut.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId()));
             transactionCreateReqVOOut.setRecordNumber(number);
+            transactionCreateReqVOOut.setQty(inspectJobDetailUpdateReqVO.getGoodQty());
             transactionCreateReqVOOut.setInventoryStatus(inspectJobDetailUpdateReqVO.getInventoryStatus());
+            transactionCreateReqVOOut.setSinglePrice(inspectJobDetailUpdateReqVO.getSinglePrice());
+            transactionCreateReqVOOut.setAmount(inspectJobDetailUpdateReqVO.getAmount());
+            transactionCreateReqVOOut.setArriveDate(inspectJobDetailUpdateReqVO.getArriveDate());
+            transactionCreateReqVOOut.setProduceDate(inspectJobDetailUpdateReqVO.getProduceDate());
+            transactionCreateReqVOOut.setExpireDate(inspectJobDetailUpdateReqVO.getExpireDate());
             transactionCreateReqVOOut.setId(null);
             //待确定库存事务信息
             transactionCreateReqVOList.add(transactionCreateReqVOOut);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainService.java

@@ -6,7 +6,6 @@ import com.win.module.wms.controller.inspectRequest.vo.*;
 import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestMainDO;
 
 import javax.validation.Valid;
-import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 
@@ -96,14 +95,6 @@ public interface InspectRequestMainService {
      */
     HashMap<String, String> selectRule(String supplierCode, String itemCode);
 
-    /**
-     * 查询检验物品数量
-     * @param sampleQty
-     * @param ruleAll
-     * @return
-     */
-    BigDecimal selectInspectType(BigDecimal sampleQty, HashMap<String, String> ruleAll);
-
     /**
      * 关闭到货检验申请主
      *

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java

@@ -365,9 +365,12 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService
             }
             return;
         }
+        InspectRequestDetailDO inspectRequestDetailDOTmp = detailDOList.get(0);
         List<ExpectoutCreateReqVO> expectoutCreateReqVOList = new ArrayList<>();
         InspectJobMainDO inspectJobMainDO = InspectJobMainConvert.INSTANCE.convert(mainDO);
         inspectJobMainDO.setStatus(JobStatusEnum.PENDING.getCode());
+        inspectJobMainDO.setRequestNumber(mainDO.getNumber());
+        inspectJobMainDO.setWarehouseCode(mainDO.getFromWarehouseCode());
         String number = serialNumberApi.generateCode(RuleCodeEnum.INSPECT_JOB.getCode());
         inspectJobMainDO.setNumber(number);
         //增加业务类型
@@ -383,7 +386,9 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService
             //预计出
             ExpectoutCreateReqVO expectoutCreateReqVO = new ExpectoutCreateReqVO();
             BeanUtils.copyProperties(inspectJobDetailDO, expectoutCreateReqVO);
+            expectoutCreateReqVO.setId(null);
             expectoutCreateReqVO.setJobNumber(number);
+            expectoutCreateReqVO.setBatch(inspectJobMainDO.getBatch());
             expectoutCreateReqVO.setBusinessType(inspectJobMainDO.getBusinessType());
             expectoutCreateReqVO.setLocationCode(inspectJobDetailDO.getFromLocationCode());
             expectoutCreateReqVO.setOwnerCode(mainDO.getOwnerCode());
@@ -406,22 +411,23 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService
     }
 
     //查询检验类型
-    @Override
+    private BigDecimal selectInspectType(InspectRequestMainDO mainDO, BigDecimal sampleQty, HashMap<String, String> ruleAll) {
-    public BigDecimal selectInspectType(BigDecimal sampleQty, HashMap<String, String> ruleAll) {
         String inspectType = ruleAll.get("InspectType");
+        mainDO.setInspectType(inspectType);
         if ("FULL".equals(inspectType)) {
             return sampleQty;
         } else if ("SAMPLING".equals(inspectType)) {
-            return selectSampleMethod(ruleAll, sampleQty);
+            return selectSampleMethod(mainDO, ruleAll, sampleQty);
         } else {
             return BigDecimal.ZERO;
         }
     }
 
     //查询抽检方式  计算抽检数量并返回
-    private BigDecimal selectSampleMethod(HashMap<String, String> ruleAll, BigDecimal sampleQty) {
+    private BigDecimal selectSampleMethod(InspectRequestMainDO mainDO, HashMap<String, String> ruleAll, BigDecimal sampleQty) {
         String sampleMethod = ruleAll.get("SampleMethod");
-        JSONArray aplList = JSONUtil.parseArray(ruleAll.get("AplList"));
+        mainDO.setSampleMethod(sampleMethod);
+        JSONArray aplList = JSONUtil.parseArray(ruleAll.get("AqlList"));
         //获取最大校验规则范围
         BigDecimal maxFloorQty = BigDecimal.ZERO;
         BigDecimal maxCeilingQty = BigDecimal.ZERO;
@@ -471,17 +477,7 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService
         HashMap<String, String> mapRule = new HashMap<>();
         mapRule.put("InspectType", configuration.get("InspectType").toString());
         mapRule.put("SampleMethod", configuration.get("SampleMethod").toString());
-        mapRule.put("AqList", configuration.get("AqList").toString());
+        mapRule.put("AqlList", configuration.get("AqlList").toString());
-        String aqlList = mapRule.get("AqlList");
-        if (aqlList != null) {
-            JSONArray objects = JSONUtil.parseArray(aqlList);
-            for (int i = 0; i < objects.size(); i++) {
-                JSONObject entries = JSONUtil.parseObj(objects.getObj(i));
-                mapRule.put("FloorQty" + (i + 1), entries.get("FloorQty").toString());
-                mapRule.put("CeilingQty" + (i + 1), entries.get("CeilingQty").toString());
-                mapRule.put("SampleValue" + (i + 1), entries.get("SampleValue").toString());
-            }
-        }
         return mapRule;
     }
 
@@ -491,7 +487,7 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService
 
     private void validatorRule(InspectRequestMainDO mainDO) {
         HashMap<String, String> rule = selectRule(null, mainDO.getItemCode());
-        mainDO.setSampleQty(selectInspectType(mainDO.getReceiveQty(), rule));
+        mainDO.setSampleQty(selectInspectType(mainDO, mainDO.getReceiveQty(), rule));
     }
 
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java

@@ -386,7 +386,6 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
             purchasereceiptRequestMainMapper.updateById(purchasereceiptRequestMainDO);
         }
         //上架申请子
-        List<InspectRequestDetailCreateReqVO> inspectRequestDetailCreateReqVOList = new ArrayList<>();
         SwitchDO switchDO1 = switchService.selectSwitchExist("CreateInspectRequestAfterPurchaseReceiptRecordCreated");
         SwitchDO switchDO2 = switchService.selectSwitchExist("ExemptItemCreatePutawayRequestAfterPurchaseReceiptRecordCreated");
         //采购收货记录 生成后 创建 到货检验申请
@@ -395,12 +394,6 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
             Map<String, List<PurchasereceiptRecordDetailDO>> listMap = new HashMap<>();
             for(PurchasereceiptRecordDetailDO purchasereceiptRecordDetailDO : purchasereceiptRecordDetailDOList) {
                 //采购收货记录 生成后免检物品 创建 上架申请
-                if(switchDO2.getEffectiveSetValue().equals("TRUE")) {
-                    InspectRequestDetailCreateReqVO inspectRequestDetailCreateReqVO = new InspectRequestDetailCreateReqVO();
-                    BeanUtils.copyProperties(purchasereceiptRecordDetailDO, inspectRequestDetailCreateReqVO);
-                    inspectRequestDetailCreateReqVO.setId(null);
-                    inspectRequestDetailCreateReqVOList.add(inspectRequestDetailCreateReqVO);
-                }
                 String key = purchasereceiptRecordDetailDO.getItemCode() + "_" + purchasereceiptRecordDetailDO.getFromBatch();
                 List<PurchasereceiptRecordDetailDO> list = listMap.get(key);
                 if(list == null) {
@@ -409,6 +402,7 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
                 list.add(purchasereceiptRecordDetailDO);
                 listMap.put(key, list);
             }
+            List<InspectRequestDetailCreateReqVO> inspectRequestDetailCreateReqVOList = new ArrayList<>();
             //组装到货检验数据
             for(String mapKey : listMap.keySet()) {
                 List<PurchasereceiptRecordDetailDO> purchasereceiptRecordDetailDOList1 = listMap.get(mapKey);
@@ -425,15 +419,16 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
                 inspectRequestMainCreateReqVO.setPoLine(recordDetailDO.getPoLine());
                 inspectRequestMainCreateReqVO.setUom(recordDetailDO.getUom());
                 inspectRequestMainCreateReqVO.setReceiveQty(BigDecimal.ZERO);
+                inspectRequestMainCreateReqVO.setDepartmentCode(purchasereceiptRecordMainDO.getDepartmentCode());
                 inspectRequestMainCreateReqVO.setFromWarehouseCode(purchasereceiptRecordMainDO.getToWarehouseCode());
                 //创建子表信息
                 for(PurchasereceiptRecordDetailDO purchasereceiptRecordDetailDO : purchasereceiptRecordDetailDOList1) {
                     InspectRequestDetailCreateReqVO inspectRequestDetailCreateReqVO = new InspectRequestDetailCreateReqVO();
                     BeanUtils.copyProperties(purchasereceiptRecordDetailDO, inspectRequestDetailCreateReqVO);
-                    inspectRequestDetailCreateReqVO.setPackingNumber(purchasereceiptRecordDetailDO.getFromPackingNumber());
+                    inspectRequestDetailCreateReqVO.setPackingNumber(purchasereceiptRecordDetailDO.getToPackingNumber());
-                    inspectRequestDetailCreateReqVO.setContainerNumber(purchasereceiptRecordDetailDO.getFromContainerNumber());
+                    inspectRequestDetailCreateReqVO.setContainerNumber(purchasereceiptRecordDetailDO.getToContainerNumber());
                     inspectRequestDetailCreateReqVO.setInventoryStatus(purchasereceiptRecordDetailDO.getInventoryStatus());
-                    inspectRequestDetailCreateReqVO.setFromLocationCode(purchasereceiptRecordDetailDO.getFromLocationCode());
+                    inspectRequestDetailCreateReqVO.setFromLocationCode(purchasereceiptRecordDetailDO.getToLocationCode());
                     inspectRequestDetailCreateReqVO.setItemCode(purchasereceiptRecordDetailDO.getItemCode());
                     inspectRequestDetailCreateReqVO.setItemName(purchasereceiptRecordDetailDO.getItemName());
                     inspectRequestDetailCreateReqVO.setItemDesc1(purchasereceiptRecordDetailDO.getItemDesc1());

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

@@ -71,21 +71,22 @@ public class PurchasereceiptRecordMainServiceImpl implements PurchasereceiptReco
     }
 
     @Override
-    public PurchasereceiptRecordDetailDO selectPurchasereceiptExist(String ppoNumber,String psupplierCode,String pNumber,String ppoLine,String pitemCode){
+    public PurchasereceiptRecordDetailDO selectPurchasereceiptExist(String ppoNumber, String psupplierCode, String pNumber, String ppoLine, String pitemCode) {
         QueryWrapper<PurchasereceiptRecordMainDO> queryWrapperMain = new QueryWrapper<>();
-        queryWrapperMain.eq("number",pNumber);
+        queryWrapperMain.eq("number", pNumber);
-        if(psupplierCode != null && !psupplierCode.isEmpty()) {
+        if (psupplierCode != null && !psupplierCode.isEmpty()) {
             queryWrapperMain.eq("supplier_code", psupplierCode);
         }
-        queryWrapperMain.eq("available","TRUE");
+        queryWrapperMain.eq("available", "TRUE");
         PurchasereceiptRecordMainDO purchasereceiptRecordMainDO = purchasereceiptRecordMainMapper.selectOne(queryWrapperMain);
-        if(purchasereceiptRecordMainDO != null) {
+        if (purchasereceiptRecordMainDO != null) {
             QueryWrapper<PurchasereceiptRecordDetailDO> queryWrapperDetail = new QueryWrapper<>();
-            queryWrapperDetail.eq("po_number",ppoNumber);
+            queryWrapperDetail.eq("number", pNumber);
-            queryWrapperDetail.eq("po_line",ppoLine);
+            queryWrapperDetail.eq("po_number", ppoNumber);
-            queryWrapperDetail.eq("item_code",pitemCode);
+            queryWrapperDetail.eq("po_line", ppoLine);
+            queryWrapperDetail.eq("item_code", pitemCode);
             PurchasereceiptRecordDetailDO purchasereceiptRecordDetailDO = purchasereceiptRecordDetailMapper.selectOne(queryWrapperDetail);
-            if(purchasereceiptRecordDetailDO != null) {
+            if (purchasereceiptRecordDetailDO != null) {
                 return purchasereceiptRecordDetailDO;
             } else {
                 throw new UtilException("采购收货记录明细:订单号" + ppoNumber + "、订单行" + ppoLine + "物品代码、" + pitemCode + "无效");

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java

@@ -177,7 +177,7 @@ public class PutawayJobMainServiceImpl implements PutawayJobMainService {
         //创建采购收货记录主表
         PutawayRecordMainDO putawayRecordMainDO = new PutawayRecordMainDO();
         BeanUtils.copyProperties(putawayJobMainDO, putawayRecordMainDO);
-        String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_RECEIPT_RECORD.getCode());
+        String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_PUTAWAY_RECORD.getCode());
         putawayRecordMainDO.setNumber(number);
         putawayRecordMainDO.setJobNumber(putawayJobMainDO.getNumber());
         putawayRecordMainDO.setId(null);