发料任务修改

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;
+
 }

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<IssueJobDetailDO> {
 
     default PageResult<IssueJobDetailDO> selectPage(IssueJobDetailPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<IssueJobDetailDO>()
+                .eq(IssueJobDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(IssueJobDetailDO::getProductionLineCode, reqVO.getProductionLineCode())
                 .eqIfPresent(IssueJobDetailDO::getWorkStationCode, reqVO.getWorkStationCode())
                 .eqIfPresent(IssueJobDetailDO::getInventoryStatus, reqVO.getInventoryStatus())

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();