制品返修修改

win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/DictTypeConstants.java

@@ -83,4 +83,5 @@ public interface DictTypeConstants {
     String JOB_STATUS = "job_status";//任务状态
     String JOB_STAGE_STATUS = "job_stage_status";//任务阶段状态
     String COUNT_STAGE = "count_stage"; //阶段
+    String BIND_TYPE = "bind_type"; // 器具绑定类型
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/vo/TransferissueRecordMainBaseVO.java

@@ -24,7 +24,6 @@ public class TransferissueRecordMainBaseVO {
     private Long id;
 
     @Schema(description = "申请单号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "申请单号不能为空")
     private String requestNumber;
 
     @Schema(description = "任务单号")
@@ -40,35 +39,28 @@ public class TransferissueRecordMainBaseVO {
     private String vehiclePlateNumber;
 
     @Schema(description = "从仓库代码", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "从仓库代码不能为空")
     private String fromWarehouseCode;
 
     @Schema(description = "到仓库代码", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "到仓库代码不能为空")
     private String toWarehouseCode;
 
     @Schema(description = "代码", requiredMode = Schema.RequiredMode.REQUIRED)
     private String code;
 
     @Schema(description = "接口类型", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "接口类型不能为空")
     private String interfaceType;
 
     @Schema(description = "出库事务类型", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "出库事务类型不能为空")
     private String outTransactionType;
 
     @Schema(description = "入库事务类型", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "入库事务类型不能为空")
     private String inTransactionType;
 
     @Schema(description = "执行时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "执行时间不能为空")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime executeTime;
 
     @Schema(description = "生效日期", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "生效日期不能为空")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime activeDate;
 
@@ -81,27 +73,22 @@ public class TransferissueRecordMainBaseVO {
     private LocalDateTime dueTime;
 
     @Schema(description = "部门", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "部门不能为空")
     private String departmentCode;
 
     @Schema(description = "单据号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "单据号不能为空")
     private String number;
 
     @Schema(description = "业务类型", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "业务类型不能为空")
     private String businessType;
 
     @Schema(description = "备注")
     private String remark;
 
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "创建时间不能为空")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime createTime;
 
     @Schema(description = "创建者Id", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "创建者Id不能为空")
     private String creator;
 
     @Schema(description = "从月台代码")
@@ -120,7 +107,6 @@ public class TransferissueRecordMainBaseVO {
     private String toAreaCodes;
 
     @Schema(description = "是否可用", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "是否可用不能为空")
     private String available;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordMainServiceImpl.java

@@ -26,6 +26,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -81,6 +82,8 @@ public class TransferissueRecordMainServiceImpl implements TransferissueRecordMa
         transferissueRecordMainDO.setId(null);
         transferissueRecordMainDO.setCreator(null);
         transferissueRecordMainDO.setCreateTime(LocalDateTime.now());
+        transferissueRecordMainDO.setFromAreaCodes(businesstypeDO.getOutAreaCodes());
+        transferissueRecordMainDO.setToAreaCodes(businesstypeDO.getInAreaCodes());
         transferissueRecordMainMapper.insert(transferissueRecordMainDO);
         //库存事务
         List<TransactionCreateReqVO> transactionCreateReqVOList = new ArrayList<>();
@@ -109,6 +112,7 @@ public class TransferissueRecordMainServiceImpl implements TransferissueRecordMa
             transactionCreateReqVO.setWarehouseCode(transferissueRecordMainDO.getToWarehouseCode());
             transactionCreateReqVO.setRecordNumber(number);
             transactionCreateReqVO.setId(null);
+            transactionCreateReqVO.setAmount(BigDecimal.ZERO);
             transactionCreateReqVOList.add(transactionCreateReqVO);
         }
         //增加库存事务