From 5669261f8a4f9a370350713718474d8129dcab56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Thu, 23 Nov 2023 18:52:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E6=96=99=E4=BB=BB=E5=8A=A1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../issueJob/vo/IssueJobDetailPageReqVO.java | 3 +++ .../wms/dal/mysql/issueJob/IssueJobDetailMapper.java | 2 ++ .../service/issueJob/IssueJobMainServiceImpl.java | 12 ++++++++++++ 3 files changed, 17 insertions(+) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobDetailPageReqVO.java index a1a7ba6a..2cca6d38 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobDetailPageReqVO.java @@ -96,4 +96,7 @@ public class IssueJobDetailPageReqVO extends PageParam { @Schema(description = "到货主代码") private String toOwnerCode; + @Schema(description = "主表ID") + private String masterId; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueJob/IssueJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueJob/IssueJobDetailMapper.java index e07ce88e..b6da9b33 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueJob/IssueJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueJob/IssueJobDetailMapper.java @@ -10,6 +10,7 @@ import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.issueJob.vo.IssueJobDetailExportReqVO; import com.win.module.wms.controller.issueJob.vo.IssueJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.issueJob.IssueJobDetailDO; +import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobDetailDO; import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestDetailDO; import org.apache.ibatis.annotations.Mapper; @@ -23,6 +24,7 @@ public interface IssueJobDetailMapper extends BaseMapperX { default PageResult selectPage(IssueJobDetailPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() + .eq(IssueJobDetailDO::getMasterId, reqVO.getMasterId()) .eqIfPresent(IssueJobDetailDO::getProductionLineCode, reqVO.getProductionLineCode()) .eqIfPresent(IssueJobDetailDO::getWorkStationCode, reqVO.getWorkStationCode()) .eqIfPresent(IssueJobDetailDO::getInventoryStatus, reqVO.getInventoryStatus()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java index 9076af04..ca2ab15b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java @@ -18,6 +18,7 @@ import com.win.module.wms.dal.dataobject.issueJob.IssueJobDetailDO; import com.win.module.wms.dal.dataobject.issueRecord.IssueRecordDetailDO; import com.win.module.wms.dal.dataobject.issueRecord.IssueRecordMainDO; import com.win.module.wms.dal.dataobject.jobsetting.JobsettingDO; +import com.win.module.wms.dal.dataobject.location.LocationDO; import com.win.module.wms.dal.dataobject.onlinesettlementRecord.OnlinesettlementRecordDetailDO; import com.win.module.wms.dal.dataobject.onlinesettlementRecord.OnlinesettlementRecordMainDO; import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobDetailDO; @@ -40,6 +41,7 @@ import com.win.module.wms.service.documentSwitch.SwitchService; import com.win.module.wms.service.expectin.ExpectinService; import com.win.module.wms.service.expectout.ExpectoutService; import com.win.module.wms.service.jobsetting.JobsettingService; +import com.win.module.wms.service.location.LocationService; import com.win.module.wms.service.transaction.TransactionService; import com.win.module.wms.util.JobUtils; import org.springframework.beans.BeanUtils; @@ -72,6 +74,8 @@ import static com.win.module.wms.enums.ErrorCodeConstants.*; @Validated public class IssueJobMainServiceImpl implements IssueJobMainService { + @Resource + private LocationService locationService; @Resource private OnlinesettlementRecordDetailMapper onlinesettlementRecordDetailMapper; @Resource @@ -280,6 +284,14 @@ public class IssueJobMainServiceImpl implements IssueJobMainService { issueRecordDetailDO.setToLocationCode(recordLstItem.get("toLocationCode").toString()); issueRecordDetailDO.setInventoryStatus(recordLstItem.get("toInventoryStatus").toString()); issueRecordDetailDO.setSupplierCode(recordLstItem.get("supplierCode").toString()); + // 根据 to库位 查询 库位组 库区 + LocationDO locationDO = locationService.selectLocation(recordLstItem.get("toLocationCode").toString()); + issueRecordDetailDO.setToLocationGroupCode(locationDO.getLocationGroupCode()); + issueRecordDetailDO.setToAreaCode(locationDO.getAreaCode()); + // 根据 from库位 查询 库位组 库区 + LocationDO locationDOFrom = locationService.selectLocation(subListItem.getFromLocationCode()); + issueRecordDetailDO.setFromLocationGroupCode(locationDOFrom.getLocationGroupCode()); + issueRecordDetailDO.setFromAreaCode(locationDOFrom.getAreaCode()); issueRecordDetailDOList.add(issueRecordDetailDO); //添加库存事务list TransactionCreateReqVO transactionCreateReqVO = new TransactionCreateReqVO();