From 1729653ce4898d3a6cb887f586ee2fb2ff012a06 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Thu, 28 Dec 2023 10:57:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=99=A8=E5=85=B7=E6=96=B0=E5=A2=9E=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/container/ContainerDetailServiceImpl.java | 11 +++++++---- .../service/container/ContainerMainServiceImpl.java | 2 ++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/container/ContainerDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/container/ContainerDetailServiceImpl.java index a6550e9c..57ae328e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/container/ContainerDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/container/ContainerDetailServiceImpl.java @@ -67,10 +67,13 @@ public class ContainerDetailServiceImpl implements ContainerDetailService { public Long createContainerDetail(ContainerDetailCreateReqVO createReqVO) { // 插入 ContainerDetailDO containerDetail = ContainerDetailConvert.INSTANCE.convert(createReqVO); - containerDetailMapper.insert(containerDetail); - // 添加器具绑定记录 - createContainerBindRecord(containerDetail); - // 返回 + ContainerDetailDO containerDetailDO = containerDetailMapper.queryByMasterIdAndContentNumber(containerDetail.getMasterId(),containerDetail.getContentNumber()); + if(containerDetailDO == null){ + containerDetailMapper.insert(containerDetail); + // 添加器具绑定记录 + createContainerBindRecord(containerDetail); + // 返回 + } return containerDetail.getId(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/container/ContainerMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/container/ContainerMainServiceImpl.java index 3b7efdb1..bbfba50c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/container/ContainerMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/container/ContainerMainServiceImpl.java @@ -88,6 +88,7 @@ public class ContainerMainServiceImpl implements ContainerMainService { String number = serialNumberApi.generateCode(RuleCodeEnum.CONTAINER_INIT_RECORD.getCode()); containerInitRecordMainDO.setNumber(number); containerInitRecordMainDO.setDepartmentCode(userApi.getUser(getLoginUserId()).getDeptId().toString()); + containerInitRecordMainDO.setCreateTime(LocalDateTime.now()); containerInitRecordMainMapper.insert(containerInitRecordMainDO); // 器具初始化子表 ContainerInitRecordDetailDO containerInitRecordDetailDO = new ContainerInitRecordDetailDO(); @@ -181,6 +182,7 @@ public class ContainerMainServiceImpl implements ContainerMainService { List detailCreateReqVOList = createReqVO.subList; if(detailCreateReqVOList != null && detailCreateReqVOList.size() > 0){ for(ContainerDetailCreateReqVO containerDetailCreateReqVO:detailCreateReqVOList){ + containerDetailCreateReqVO.setMasterId(containerMainDO.getId()); containerDetailService.createContainerDetail(containerDetailCreateReqVO); } }