From 8fd5735663cae51ca0f3226d0f084f7df2bd966d Mon Sep 17 00:00:00 2001 From: chenfang Date: Thu, 21 Dec 2023 10:39:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=80=80=E8=B4=A7=E7=94=9F?= =?UTF-8?q?=E6=88=90=E8=AE=B0=E5=BD=95=E6=97=B6=E5=8D=95=E6=8D=AE=E5=8F=B7?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymoveRecord/vo/InventorymoveRecordMainBaseVO.java | 2 -- .../customerreturnJob/CustomerreturnJobMainServiceImpl.java | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) 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();