完善完成采购收货任务执行功能

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchasereceiptRecordDetailBaseVO.java

@@ -1,20 +1,12 @@
 package com.win.module.wms.controller.purchasereceiptRecord.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import javax.validation.constraints.*;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
@@ -80,10 +72,10 @@ public class PurchasereceiptRecordDetailBaseVO {
     private String toLocationGroupCode;
 
     @Schema(description = "从库区代码")
-    private String fromAreaCodes;
+    private String fromAreaCode;
 
     @Schema(description = "到库区代码")
-    private String toAreaCodes;
+    private String toAreaCode;
 
     @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "订单号不能为空")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchasereceiptRecordDetailExcelVO.java

@@ -1,22 +1,12 @@
 package com.win.module.wms.controller.purchasereceiptRecord.vo;
 
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.win.framework.excel.core.annotations.DictFormat;
 import com.win.framework.excel.core.convert.DictConvert;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 
 
 /**
@@ -70,10 +60,10 @@ public class PurchasereceiptRecordDetailExcelVO {
     private String toLocationGroupCode;
 
     @ExcelProperty("从库区代码")
-    private String fromAreaCodes;
+    private String fromAreaCode;
 
     @ExcelProperty("到库区代码")
-    private String toAreaCodes;
+    private String toAreaCode;
 
     @ExcelProperty("订单号")
     private String poNumber;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchasereceiptRecordDetailExportReqVO.java

@@ -62,10 +62,10 @@ public class PurchasereceiptRecordDetailExportReqVO {
     private String toLocationGroupCode;
 
     @Schema(description = "从库区代码")
-    private String fromAreaCodes;
+    private String fromAreaCode;
 
     @Schema(description = "到库区代码")
-    private String toAreaCodes;
+    private String toAreaCode;
 
     @Schema(description = "订单号")
     private String poNumber;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchasereceiptRecordDetailPageReqVO.java

@@ -67,10 +67,10 @@ public class PurchasereceiptRecordDetailPageReqVO extends PageParam {
     private String toLocationGroupCode;
 
     @Schema(description = "从库区代码")
-    private String fromAreaCodes;
+    private String fromAreaCode;
 
     @Schema(description = "到库区代码")
-    private String toAreaCodes;
+    private String toAreaCode;
 
     @Schema(description = "订单号")
     private String poNumber;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptRecord/PurchasereceiptRecordDetailDO.java

@@ -1,19 +1,13 @@
 package com.win.module.wms.dal.dataobject.purchasereceiptRecord;
 
+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.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
+
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
-import com.win.framework.mybatis.core.dataobject.BaseDO;
 
 /**
  * 采购收货记录子 DO
@@ -93,11 +87,11 @@ public class PurchasereceiptRecordDetailDO extends BaseDO {
     /**
      * 从库区代码
      */
-    private String fromAreaCodes;
+    private String fromAreaCode;
     /**
      * 到库区代码
      */
-    private String toAreaCodes;
+    private String toAreaCode;
     /**
      * 订单号
      */

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

@@ -312,6 +312,7 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
         if(switchDO.getEffectiveSetValue().equals("TRUE")) {
             RuleRespVO ruleRespVO = ruleService.inspect(purchasereceiptRecordMainDO.getSupplierCode(), null);
             JSONObject jsonObject = JSONUtil.parseObj(ruleRespVO.getConfiguration());
+            //生成到货检验申请
             if(!"EXAMPT".equals(String.valueOf(jsonObject.get("InspectType")))) {
                 //按零件号和批次分组
                 Map<String, List<PurchasereceiptRecordDetailDO>> listMap = new HashMap<>();
@@ -362,6 +363,8 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
                     inspectRequestMainCreateReqVO.setSubList(inspectRequestDetailCreateReqVOList);
                     inspectRequestMainService.createInspectRequestMain(inspectRequestMainCreateReqVO);
                 }
+            } else {//免检，生成上架申请
+
             }
         }
         //增加库存事务