diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java index df7ab77b1..de8416772 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java @@ -671,7 +671,8 @@ public class ReservationStockInOrderDomainService { MaterialWarehouseControlPO materialWarehouseControlPO = reservationStockInOrderMapper.getInfoByMaterialBaseInfoIds(materialBaseInfoPO.getMaterialBaseInfoId()); //MaterialWarehouseControlPO materialWarehouseControlPO = materialWarehouseControlService.getInfoByMaterialBaseInfoIds(materialBaseInfoPO.getMaterialBaseInfoId()); if (materialWarehouseControlPO == null){ - throw new ServiceException("物料仓库控制信息不存在"); +// throw new ServiceException("物料仓库控制信息不存在"); + materialWarehouseControlPO = new MaterialWarehouseControlPO(); } inMaterialDetailDO.setMaterialWarehouseControlId(materialWarehouseControlPO.getMaterialWarehouseControlId()); inMaterialDetailDO.setSerialNumberManage(materialWarehouseControlPO.getSerialNumberManage()); @@ -686,7 +687,8 @@ public class ReservationStockInOrderDomainService { MaterialGoodsRulePO materialGoodsRulePO = reservationStockInOrderMapper.getGoodsInfoByMaterialBaseInfoIds(inMaterialDetailDO.getMaterialBaseInfoId()); //MaterialGoodsRulePO materialGoodsRulePO = materialGoodsRuleService.getInfoByMaterialBaseInfoIds(materialBaseInfoPO.getMaterialBaseInfoId()); if (materialGoodsRulePO == null){ - throw new ServiceException("物料商品规则信息不存在"); +// throw new ServiceException("物料商品规则信息不存在"); + materialGoodsRulePO =new MaterialGoodsRulePO(); } inMaterialDetailDO.setDistributeRuleId(materialGoodsRulePO.getMaterialGoodsRuleId()); inMaterialDetailDO.setDistributeRuleCode(materialGoodsRulePO.getRuleCode()); diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/reviewOrder/ReviewOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/reviewOrder/ReviewOrderApplicationService.java index 650c77a30..21b575e07 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/reviewOrder/ReviewOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/reviewOrder/ReviewOrderApplicationService.java @@ -584,9 +584,9 @@ public class ReviewOrderApplicationService { taskOrderDO.setWarehouseId(reviewOrderPO.getWarehouseId()); taskOrderDO.setWarehouseCode(reviewOrderPO.getWarehouseCode()); taskOrderDO.setWarehouseName(reviewOrderPO.getWarehouseName()); - // 货主与复核单客户一致（出库单货主可能与复核客户口径不同） - taskOrderDO.setShipperId(reviewOrderPO.getCustomerId()); - taskOrderDO.setShipperName(reviewOrderPO.getCustomerName()); + // 货主与出库单/复核单主表货主一致（非客户） + taskOrderDO.setShipperId(reviewOrderPO.getShipperId()); + taskOrderDO.setShipperName(reviewOrderPO.getShipperName()); taskOrderDO.setOrderNumber(reviewOrderPO.getOutOrderNumber()); taskOrderDO.setPickingOrderNumber(reviewOrderPO.getReviewOrderNumber()); taskOrderDO.setSerialNumber(OrderSequence.getOrderCode("FHZYLS")); diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java index 8d4cdc70b..e579e0584 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java @@ -3564,7 +3564,8 @@ public class StockReceiptOrderApplicationService { //获取仓库控制信息 MaterialWarehouseControlPO materialWarehouseControlPO = materialWarehouseControlService.getInfoByMaterialBaseInfoIds(materialBaseInfoPO.getMaterialBaseInfoId()); if (materialWarehouseControlPO == null){ - throw new ServiceException("物料仓库控制信息不存在"); +// throw new ServiceException("物料仓库控制信息不存在"); + materialWarehouseControlPO = new MaterialWarehouseControlPO(); } receiptMaterialDetailDO.setMaterialWarehouseControlId(materialWarehouseControlPO.getMaterialWarehouseControlId()); receiptMaterialDetailDO.setSerialNumberManage(materialWarehouseControlPO.getSerialNumberManage()); @@ -3578,7 +3579,8 @@ public class StockReceiptOrderApplicationService { //获取商品规则信息 MaterialGoodsRulePO materialGoodsRulePO = materialGoodsRuleService.getInfoByMaterialBaseInfoIds(materialBaseInfoPO.getMaterialBaseInfoId()); if (materialGoodsRulePO == null){ - throw new ServiceException("物料商品规则信息不存在"); +// throw new ServiceException("物料商品规则信息不存在"); + materialGoodsRulePO =new MaterialGoodsRulePO(); } receiptMaterialDetailDO.setDistributeRuleId(materialGoodsRulePO.getMaterialGoodsRuleId()); receiptMaterialDetailDO.setDistributeRuleCode(materialGoodsRulePO.getRuleCode()); diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/mobilizeManage/service/MobilizeManageDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/mobilizeManage/service/MobilizeManageDomainService.java index 35f2d2a48..b27a446b9 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/mobilizeManage/service/MobilizeManageDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/mobilizeManage/service/MobilizeManageDomainService.java @@ -359,7 +359,8 @@ public class MobilizeManageDomainService { //获取仓库控制信息 MaterialWarehouseControlPO materialWarehouseControlPO = materialWarehouseControlService.getInfoByMaterialBaseInfoIds(materialBaseInfoPO.getMaterialBaseInfoId()); if (materialWarehouseControlPO == null){ - throw new ServiceException("物料仓库控制信息不存在"); +// throw new ServiceException("物料仓库控制信息不存在"); + materialWarehouseControlPO = new MaterialWarehouseControlPO(); } mobilizeManageDetailDO.setMaterialWarehouseControlId(materialWarehouseControlPO.getMaterialWarehouseControlId()); mobilizeManageDetailDO.setSerialNumberManage(materialWarehouseControlPO.getSerialNumberManage()); diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/noticeMaterialDetail/repository/persistence/NoticeMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/noticeMaterialDetail/repository/persistence/NoticeMaterialDetailImpl.java index 307a313c7..b6fd406ab 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/noticeMaterialDetail/repository/persistence/NoticeMaterialDetailImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/noticeMaterialDetail/repository/persistence/NoticeMaterialDetailImpl.java @@ -174,7 +174,8 @@ public class NoticeMaterialDetailImpl extends ServiceImpl0 的行 outOrderNumber={}", outOrderNumber); return; } - // 复核也生成作业单（同拣货作业单表结构），用于作业任务跟踪 - genStockOutTaskOrderForReview(header, loginUser, now); + // 复核也生成作业单（同拣货作业单表结构），用于作业任务跟踪；货主须来自出库单，不能误用客户字段 + genStockOutTaskOrderForReview(header, stockOutOrder, loginUser, now); StockOutOrder statusUpdate = new StockOutOrder(); statusUpdate.setStatus(8); @@ -313,7 +316,7 @@ public class ReviewOrderDomainService { /** * 复核单生成后，同步生成一张作业单到 stock_out_task_order（结构与拣货作业单一致）。 */ - private void genStockOutTaskOrderForReview(ReviewOrder header, LoginUser loginUser, Date now) { + private void genStockOutTaskOrderForReview(ReviewOrder header, StockOutOrder stockOutOrder, LoginUser loginUser, Date now) { if (header == null || header.getReviewOrderNumber() == null) { return; } @@ -338,8 +341,8 @@ public class ReviewOrderDomainService { taskDO.setWarehouseId(header.getWarehouseId()); taskDO.setWarehouseCode(header.getWarehouseCode()); taskDO.setWarehouseName(header.getWarehouseName()); - taskDO.setShipperId(header.getCustomerId()); - taskDO.setShipperName(header.getCustomerName()); + taskDO.setShipperId(stockOutOrder != null ? stockOutOrder.getShipperId() : null); + taskDO.setShipperName(stockOutOrder != null ? stockOutOrder.getShipperName() : null); taskDO.setOrderNumber(header.getOutOrderNumber()); taskDO.setPickingOrderNumber(header.getReviewOrderNumber()); taskDO.setSerialNumber(OrderSequence.getOrderCode("FHZYLS")); diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/reviewOrder/entity/ReviewOrder.java b/mhd_wms/src/main/java/com/mhd/wms/domain/reviewOrder/entity/ReviewOrder.java index c1de19f4f..70e507384 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/reviewOrder/entity/ReviewOrder.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/reviewOrder/entity/ReviewOrder.java @@ -50,6 +50,11 @@ public class ReviewOrder extends BaseVOEntity { private String customerName; + /** 货主（与出库单 stock_out_order 一致；id 通常为用户中心 userId） */ + private Long shipperId; + private String shipperCode; + private String shipperName; + private Date receiveTime; private String remark; diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/reviewOrder/repository/po/ReviewOrderPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/reviewOrder/repository/po/ReviewOrderPO.java index 5cc84a142..b463a38d9 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/reviewOrder/repository/po/ReviewOrderPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/reviewOrder/repository/po/ReviewOrderPO.java @@ -67,6 +67,15 @@ public class ReviewOrderPO extends BaseVOEntity { @ApiModelProperty("客户名称") private String customerName; + @ApiModelProperty("货主ID") + private Long shipperId; + + @ApiModelProperty("货主编码") + private String shipperCode; + + @ApiModelProperty("货主名称") + private String shipperName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("下发确认时间（PDA 点击确定/接收的时间）") diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/repository/persistence/ShiftManageImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/repository/persistence/ShiftManageImpl.java index 3dd7c6647..00184e218 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/repository/persistence/ShiftManageImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/repository/persistence/ShiftManageImpl.java @@ -243,13 +243,13 @@ public class ShiftManageImpl extends ServiceImpl shiftMaterialDetailDO.setUnitName(packDetailFeignPO.getName()); shiftMaterialDetailDO.setUnitNumber(packDetailFeignPO.getNumber()); - //获取仓库控制信息 - MaterialWarehouseControlPO materialWarehouseControlPO = materialWarehouseControlService.getInfoByMaterialBaseInfoIds(materialBaseInfoPO.getMaterialBaseInfoId()); - if (materialWarehouseControlPO == null){ - throw new ServiceException("物料仓库控制信息不存在"); - } - shiftMaterialDetailDO.setMaterialWarehouseControlId(materialWarehouseControlPO.getMaterialWarehouseControlId()); - shiftMaterialDetailDO.setSerialNumberManage(materialWarehouseControlPO.getSerialNumberManage()); +// //获取仓库控制信息 +// MaterialWarehouseControlPO materialWarehouseControlPO = materialWarehouseControlService.getInfoByMaterialBaseInfoIds(materialBaseInfoPO.getMaterialBaseInfoId()); +// if (materialWarehouseControlPO == null){ +// throw new ServiceException("物料仓库控制信息不存在"); +// } +// shiftMaterialDetailDO.setMaterialWarehouseControlId(materialWarehouseControlPO.getMaterialWarehouseControlId()); +// shiftMaterialDetailDO.setSerialNumberManage(materialWarehouseControlPO.getSerialNumberManage()); } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java index 04940b8c3..950f5d3d0 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java @@ -605,7 +605,8 @@ public class StockInOrderDomainService { //获取商品规则信息 MaterialGoodsRulePO materialGoodsRulePO = materialGoodsRuleService.getInfoByMaterialBaseInfoIds(materialBaseInfoPO.getMaterialBaseInfoId()); if (materialGoodsRulePO == null){ - throw new ServiceException("物料商品规则信息不存在"); +// throw new ServiceException("物料商品规则信息不存在"); + materialGoodsRulePO =new MaterialGoodsRulePO(); } inMaterialDetailDO.setDistributeRuleId(materialGoodsRulePO.getMaterialGoodsRuleId()); inMaterialDetailDO.setDistributeRuleCode(materialGoodsRulePO.getRuleCode()); diff --git a/mhd_wms/src/main/resources/mapper/reviewOrder/ReviewOrderMapper.xml b/mhd_wms/src/main/resources/mapper/reviewOrder/ReviewOrderMapper.xml index 45e447da6..258829902 100644 --- a/mhd_wms/src/main/resources/mapper/reviewOrder/ReviewOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/reviewOrder/ReviewOrderMapper.xml @@ -20,6 +20,9 @@ + + + @@ -92,6 +95,9 @@ a.customer_id, a.customer_code, a.customer_name, + a.shipper_id, + a.shipper_code, + a.shipper_name, a.receive_time, a.remark, a.create_by,