From aa76e07cdc2f265270928c68a78e25667c575eac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 24 Feb 2026 15:21:32 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=9D=A2=E7=A7=AF=E4=BD=93=E7=A7=AF=E7=AD=89?= =?UTF-8?q?=E4=BF=A1=E6=81=AF;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../facade/IPickingMaterialDetailService.java | 5 ++++- .../mapper/PickingMaterialDetailMapper.java | 5 ++++- .../persistence/PickingMaterialDetailImpl.java | 6 ++++++ .../service/StockOutOrderDomainService.java | 11 +++++++++++ .../PickingMaterialDetailMapper.xml | 11 +++++++++++ 5 files changed, 36 insertions(+), 2 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/facade/IPickingMaterialDetailService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/facade/IPickingMaterialDetailService.java index 88d9c733d..c2153d9a2 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/facade/IPickingMaterialDetailService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/facade/IPickingMaterialDetailService.java @@ -7,6 +7,7 @@ import com.mhd.wms.domain.pickingMaterialDetail.repository.todo.PickingMaterialD import com.mhd.wms.domain.pickingMaterialDetail.repository.todo.PickingMaterialDetailDOByUpdate; import com.mhd.wms.domain.pickingOrder.repository.po.PickingOrderPO; import com.mhd.wms.domain.pickingOrder.repository.todo.PickingOrderDO; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -23,6 +24,8 @@ public interface IPickingMaterialDetailService extends IService queryList(PickingMaterialDetailDO pickingMaterialDetailDO); + public PickingMaterialDetailPO queryTotalsByOutNumberAndBaseId(String orderNumber, Long materialBaseInfoId); + /** * 新增拣货单物料明细 */ @@ -72,4 +75,4 @@ public interface IPickingMaterialDetailService extends IService queryList(PickingMaterialDetailDO pickingMaterialDetailDO); + public PickingMaterialDetailPO queryTotalsByOutNumberAndBaseId( @Param("orderNumber") String orderNumber, @Param("materialBaseInfoId") Long materialBaseInfoId); + /** * @description 根据拣货单增加拣货数量 * @author ZhouGY @@ -30,4 +33,4 @@ public interface PickingMaterialDetailMapper extends BaseMapper().lambda() .eq(StockOutOrder::getDelFlag, 1) .eq(StockOutOrder::getOutOrderNumber, stockOutOrderDO.getOutOrderNumber())); @@ -692,6 +697,12 @@ public class StockOutOrderDomainService { for (OutMaterialDetailPO outMaterialDetailPO : outMaterialDetailPOList) { outMaterialDetailPO.setMaterialCode(outMaterialDetailPO.getMaterialNo()); outMaterialDetailPO.setMaterialName(outMaterialDetailPO.getCommodityName()); + Long materialBaseInfoId = outMaterialDetailPO.getMaterialBaseInfoId(); + PickingMaterialDetailPO pickingMaterialDetailPO = pickingMaterialDetailService.queryTotalsByOutNumberAndBaseId(outOrderNumber, materialBaseInfoId); + outMaterialDetailPO.setTotalArea(pickingMaterialDetailPO.getTotalArea()); + outMaterialDetailPO.setTotalVolume(pickingMaterialDetailPO.getTotalVolume()); + outMaterialDetailPO.setTotalNetWeight(pickingMaterialDetailPO.getTotalNetWeight()); + outMaterialDetailPO.setTotalGrossWeight(pickingMaterialDetailPO.getTotalGrossWeight()); } stockOutOrderPO.setMaterialDetailList(outMaterialDetailPOList); BigDecimal weightLimit = BigDecimal.ZERO; diff --git a/mhd_wms/src/main/resources/mapper/pickingMaterialDetail/PickingMaterialDetailMapper.xml b/mhd_wms/src/main/resources/mapper/pickingMaterialDetail/PickingMaterialDetailMapper.xml index 6fbd85fe6..0a9148fad 100644 --- a/mhd_wms/src/main/resources/mapper/pickingMaterialDetail/PickingMaterialDetailMapper.xml +++ b/mhd_wms/src/main/resources/mapper/pickingMaterialDetail/PickingMaterialDetailMapper.xml @@ -182,6 +182,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + UPDATE picking_material_detail From 90a453757117d514f0c477dc0434b2cde4acbcd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 24 Feb 2026 15:28:24 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=9D=A2=E7=A7=AF=E4=BD=93=E7=A7=AF=E7=AD=89?= =?UTF-8?q?=E4=BF=A1=E6=81=AF;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pickingMaterialDetail/PickingMaterialDetailMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mhd_wms/src/main/resources/mapper/pickingMaterialDetail/PickingMaterialDetailMapper.xml b/mhd_wms/src/main/resources/mapper/pickingMaterialDetail/PickingMaterialDetailMapper.xml index 0a9148fad..78a13aa09 100644 --- a/mhd_wms/src/main/resources/mapper/pickingMaterialDetail/PickingMaterialDetailMapper.xml +++ b/mhd_wms/src/main/resources/mapper/pickingMaterialDetail/PickingMaterialDetailMapper.xml @@ -183,7 +183,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT b.TOTAL_AREA,b.TOTAL_VOLUME,b.TOTAL_NET_WEIGHT,b.TOTAL_GROSS_WEIGHT FROM From e5288c92a99e7bd0d618df72d650d2d4658e4f00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 24 Feb 2026 15:40:18 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=88=A4=E7=A9=BA;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/StockOutOrderDomainService.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java index e5133e62e..617c96e00 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java @@ -63,6 +63,7 @@ import com.mhd.wms.domain.stockOutOrder.repository.po.StockOutOrderPO; import com.mhd.wms.domain.stockOutOrder.repository.todo.StockOutOrderDO; import com.mhd.wms.domain.waveOrder.factorys.WaveOrderServiceFactory; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -699,10 +700,12 @@ public class StockOutOrderDomainService { outMaterialDetailPO.setMaterialName(outMaterialDetailPO.getCommodityName()); Long materialBaseInfoId = outMaterialDetailPO.getMaterialBaseInfoId(); PickingMaterialDetailPO pickingMaterialDetailPO = pickingMaterialDetailService.queryTotalsByOutNumberAndBaseId(outOrderNumber, materialBaseInfoId); - outMaterialDetailPO.setTotalArea(pickingMaterialDetailPO.getTotalArea()); - outMaterialDetailPO.setTotalVolume(pickingMaterialDetailPO.getTotalVolume()); - outMaterialDetailPO.setTotalNetWeight(pickingMaterialDetailPO.getTotalNetWeight()); - outMaterialDetailPO.setTotalGrossWeight(pickingMaterialDetailPO.getTotalGrossWeight()); + if (ObjectUtils.isNotEmpty(pickingMaterialDetailPO)) { + outMaterialDetailPO.setTotalArea(pickingMaterialDetailPO.getTotalArea()); + outMaterialDetailPO.setTotalVolume(pickingMaterialDetailPO.getTotalVolume()); + outMaterialDetailPO.setTotalNetWeight(pickingMaterialDetailPO.getTotalNetWeight()); + outMaterialDetailPO.setTotalGrossWeight(pickingMaterialDetailPO.getTotalGrossWeight()); + } } stockOutOrderPO.setMaterialDetailList(outMaterialDetailPOList); BigDecimal weightLimit = BigDecimal.ZERO; From fda82412df0306a936c839a1529182c6e732a8ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 24 Feb 2026 15:46:11 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=9D=A2=E7=A7=AF=E4=BD=93=E7=A7=AF=E7=AD=89?= =?UTF-8?q?=E4=BF=A1=E6=81=AF;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stockOutOrder/service/StockOutOrderDomainService.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java index 617c96e00..5f1172265 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java @@ -705,6 +705,10 @@ public class StockOutOrderDomainService { outMaterialDetailPO.setTotalVolume(pickingMaterialDetailPO.getTotalVolume()); outMaterialDetailPO.setTotalNetWeight(pickingMaterialDetailPO.getTotalNetWeight()); outMaterialDetailPO.setTotalGrossWeight(pickingMaterialDetailPO.getTotalGrossWeight()); + outMaterialDetailPO.setCheckArea(pickingMaterialDetailPO.getTotalArea()); + outMaterialDetailPO.setCheckVolume(pickingMaterialDetailPO.getTotalVolume()); + outMaterialDetailPO.setCheckNetWeight(pickingMaterialDetailPO.getTotalNetWeight()); + outMaterialDetailPO.setCheckGrossWeight(pickingMaterialDetailPO.getTotalGrossWeight()); } } stockOutOrderPO.setMaterialDetailList(outMaterialDetailPOList); From f20bab8de3b704e348eeb553aa4924322d97ef10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 24 Feb 2026 15:55:44 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E4=B8=AD=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=A4=8D=E6=A0=B8=E5=8F=AF=E6=9F=A5=E8=AF=A2;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stockOutOrder/service/StockOutOrderDomainService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java index 5f1172265..9bf5e6612 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java @@ -687,8 +687,8 @@ public class StockOutOrderDomainService { if (stockOutOrder.getReview() != 1){ throw new ServiceException("出库单【" + stockOutOrderDO.getOutOrderNumber() + "】不需要复核"); } - if (stockOutOrder.getStatus() != 7){ - throw new ServiceException("出库单【" + stockOutOrderDO.getOutOrderNumber() + "】状态不是拣货完成"); + if (stockOutOrder.getStatus() != 7 && stockOutOrder.getStatus() != 8){ + throw new ServiceException("出库单【" + stockOutOrderDO.getOutOrderNumber() + "】状态不是拣货完成或复核中"); } StockOutOrderPO stockOutOrderPO = new StockOutOrderPO(); BeanUtils.copyProperties(stockOutOrder, stockOutOrderPO); From 7f5f1615ae1e5861a5adf2b9de3f326a006338f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 24 Feb 2026 16:03:23 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BD=93=E7=A7=AF=E7=AD=89=E4=BF=A1=E6=81=AF=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/facade/IPickingMaterialDetailService.java | 2 +- .../repository/mapper/PickingMaterialDetailMapper.java | 2 +- .../repository/persistence/PickingMaterialDetailImpl.java | 4 ++-- .../stockOutOrder/service/StockOutOrderDomainService.java | 3 ++- .../pickingMaterialDetail/PickingMaterialDetailMapper.xml | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/facade/IPickingMaterialDetailService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/facade/IPickingMaterialDetailService.java index c2153d9a2..6bec7acd7 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/facade/IPickingMaterialDetailService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/facade/IPickingMaterialDetailService.java @@ -24,7 +24,7 @@ public interface IPickingMaterialDetailService extends IService queryList(PickingMaterialDetailDO pickingMaterialDetailDO); - public PickingMaterialDetailPO queryTotalsByOutNumberAndBaseId(String orderNumber, Long materialBaseInfoId); + public PickingMaterialDetailPO queryTotalsByOutNumberAndBaseId(String orderNumber, Long materialBaseInfoId, Long materialInventoryId); /** * 新增拣货单物料明细 diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/mapper/PickingMaterialDetailMapper.java b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/mapper/PickingMaterialDetailMapper.java index 7c6d87b66..6f1583503 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/mapper/PickingMaterialDetailMapper.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/mapper/PickingMaterialDetailMapper.java @@ -22,7 +22,7 @@ public interface PickingMaterialDetailMapper extends BaseMapper queryList(PickingMaterialDetailDO pickingMaterialDetailDO); - public PickingMaterialDetailPO queryTotalsByOutNumberAndBaseId( @Param("orderNumber") String orderNumber, @Param("materialBaseInfoId") Long materialBaseInfoId); + public PickingMaterialDetailPO queryTotalsByOutNumberAndBaseId(@Param("orderNumber") String orderNumber, @Param("materialBaseInfoId") Long materialBaseInfoId, @Param("materialInventoryId") Long materialInventoryId); /** * @description 根据拣货单增加拣货数量 diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/persistence/PickingMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/persistence/PickingMaterialDetailImpl.java index 11599e643..5e05d9f35 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/persistence/PickingMaterialDetailImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/persistence/PickingMaterialDetailImpl.java @@ -62,9 +62,9 @@ public class PickingMaterialDetailImpl extends ServiceImpl