From 07d53c1274ce62109daf41ab144f238c90f7a4d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com> Date: Sat, 28 Feb 2026 17:45:49 +0800 Subject: [PATCH 1/6] =?UTF-8?q?BMS=E5=90=88=E5=90=8C=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=87=BA=E8=B4=A6=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/contractManage/repository/po/ContractManagePO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManage/repository/po/ContractManagePO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManage/repository/po/ContractManagePO.java index e9b2ac85c..81e148952 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManage/repository/po/ContractManagePO.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManage/repository/po/ContractManagePO.java @@ -166,7 +166,7 @@ public class ContractManagePO extends BaseVOEntity{ private Integer automaticFlag; @ApiModelProperty("出账日期") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "d", timezone = "GMT+8") private Date paymentDate; @ApiModelProperty(name = "主体类型(1-货主，2-客户，3-承运商)") From 962839b8ae9eec24cff0978d80c48b52f49c365d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Sat, 28 Feb 2026 17:49:23 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E6=8A=A5=E9=94=99;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/persistence/OutMaterialDetailImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java index 7979f059b..af9dd69da 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java @@ -981,7 +981,7 @@ public class OutMaterialDetailImpl extends ServiceImpl outMaterialDetailDbList = outMaterialDetailMapper.selectList(new QueryWrapper().lambda() .eq(OutMaterialDetail::getOutOrderNumber, stockOutOrderDO.getOutOrderNumber()) - .eq(OutMaterialDetail::getLevel, 1) + //.eq(OutMaterialDetail::getLevel, 1) .eq(OutMaterialDetail::getDelFlag, 1)); Map materialDetailMap = outMaterialDetailDbList.stream().collect(Collectors.toMap(OutMaterialDetail::getMaterialDetailId, Function.identity())); //批量新增或修改物料信息 From bf79be6d81aad2ce9e53a9753dbfb5c10e85f7f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Sat, 28 Feb 2026 18:01:36 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E6=8A=A5=E9=94=99;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/StockOutOrderDomainService.java | 20 +++++++++++++++++++ 1 file changed, 20 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 f8e400583..5f9a01fc6 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 @@ -751,6 +751,26 @@ public class StockOutOrderDomainService { outMaterialDetailPO.setCheckGrossWeight(pickingMaterialDetailPO.getTotalGrossWeight()); outMaterialDetailPO.setWaitCheckQuantity(outMaterialDetailPO.getPickingQuantity()); } + List children = outMaterialDetailPO.getChildren(); + if (!CollectionUtils.isEmpty(children)) { + for (OutMaterialDetailPO outMaterialDetailPOChild : children) { + outMaterialDetailPOChild.setMaterialCode(outMaterialDetailPOChild.getMaterialNo()); + outMaterialDetailPOChild.setMaterialName(outMaterialDetailPOChild.getCommodityName()); + Long uniqueIdChild = outMaterialDetailPOChild.getUniqueId(); + PickingMaterialDetailPO pickingMaterialDetailPO1 = pickingMaterialDetailService.queryTotalsByOutNumberAndBaseId(uniqueIdChild); + if (ObjectUtils.isNotEmpty(pickingMaterialDetailPO1)) { + outMaterialDetailPOChild.setTotalArea(pickingMaterialDetailPO1.getTotalArea()); + outMaterialDetailPOChild.setTotalVolume(pickingMaterialDetailPO1.getTotalVolume()); + outMaterialDetailPOChild.setTotalNetWeight(pickingMaterialDetailPO1.getTotalNetWeight()); + outMaterialDetailPOChild.setTotalGrossWeight(pickingMaterialDetailPO1.getTotalGrossWeight()); + outMaterialDetailPOChild.setCheckArea(pickingMaterialDetailPO1.getTotalArea()); + outMaterialDetailPOChild.setCheckVolume(pickingMaterialDetailPO1.getTotalVolume()); + outMaterialDetailPOChild.setCheckNetWeight(pickingMaterialDetailPO1.getTotalNetWeight()); + outMaterialDetailPOChild.setCheckGrossWeight(pickingMaterialDetailPO1.getTotalGrossWeight()); + outMaterialDetailPOChild.setWaitCheckQuantity(pickingMaterialDetailPO1.getPickingQuantity()); + } + } + } } stockOutOrderPO.setMaterialDetailList(outMaterialDetailPOList); BigDecimal weightLimit = BigDecimal.ZERO; From f32c2a69d5d4e1dd855603b81139e91b00786780 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Sat, 28 Feb 2026 18:05:57 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E6=8A=A5=E9=94=99;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stockOutOrder/service/StockOutOrderDomainService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 5f9a01fc6..780931ffb 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 @@ -767,7 +767,7 @@ public class StockOutOrderDomainService { outMaterialDetailPOChild.setCheckVolume(pickingMaterialDetailPO1.getTotalVolume()); outMaterialDetailPOChild.setCheckNetWeight(pickingMaterialDetailPO1.getTotalNetWeight()); outMaterialDetailPOChild.setCheckGrossWeight(pickingMaterialDetailPO1.getTotalGrossWeight()); - outMaterialDetailPOChild.setWaitCheckQuantity(pickingMaterialDetailPO1.getPickingQuantity()); + outMaterialDetailPOChild.setWaitCheckQuantity(outMaterialDetailPOChild.getPickingQuantity()); } } } From 1abe3346f1096a6b1768dcdb43d0e009ce636920 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Sat, 28 Feb 2026 18:37:20 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E6=8A=A5=E9=94=99;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/persistence/OutMaterialDetailImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java index af9dd69da..42b245703 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java @@ -997,7 +997,9 @@ public class OutMaterialDetailImpl extends ServiceImpl Date: Sat, 28 Feb 2026 18:40:25 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E6=8A=A5=E9=94=99;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/persistence/OutMaterialDetailImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java index 42b245703..77780d9ae 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java @@ -1013,7 +1013,8 @@ public class OutMaterialDetailImpl extends ServiceImpl