diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordMainBaseVO.java index b06b1bd5..40daa23a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordMainBaseVO.java @@ -33,11 +33,9 @@ public class InventorymoveRecordMainBaseVO { private String useOnTheWayLocation; @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) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java index 5502e03e..7a991de7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java @@ -254,11 +254,11 @@ public class CustomerreturnJobMainServiceImpl implements CustomerreturnJobMainSe //创建客户收货记录主表 CustomerreturnRecordMainDO customerreturnRecordMainDO = new CustomerreturnRecordMainDO(); BeanUtils.copyProperties(customerreturnJobMainDO, customerreturnRecordMainDO); - String number = serialNumberApi.generateCode(RuleCodeEnum.CUSTOMER_REJECT_JOB.getCode()); + String number = serialNumberApi.generateCode(RuleCodeEnum.CUSTOMER_REJECT_RECORD.getCode()); customerreturnRecordMainDO.setNumber(number); customerreturnRecordMainDO.setJobNumber(customerreturnJobMainDO.getNumber()); customerreturnRecordMainDO.setId(null); - BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CustomerRejectJob"); + BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CustomerRejectRecord"); customerreturnRecordMainDO.setBusinessType(businesstypeDO.getCode()); customerreturnRecordMainMapper.insert(customerreturnRecordMainDO); List customerreturnJobDetailUpdateReqVOList = customerreturnJobMainUpdateReqVO.getSubList();