From c6484779ea050de382a69ac08c73ae2d6a5cac2c Mon Sep 17 00:00:00 2001 From: zhou-hongcheng <1064771933@qq.com> Date: Sat, 28 Feb 2026 17:08:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=95=A3=E7=A7=9F=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/domain/dto/BusinessDataPushDTO.java | 3 +++ .../service/Lease/LeaseApplicationService.java | 5 ++--- .../basic/interfaces/facadeApi/lease/LeaseApi.java | 13 ++++++++++++- .../MaterialInventoryApplicationService.java | 14 +++++++------- 4 files changed, 24 insertions(+), 11 deletions(-) diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/BusinessDataPushDTO.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/BusinessDataPushDTO.java index 3865f5b1d..20ea7d902 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/BusinessDataPushDTO.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/BusinessDataPushDTO.java @@ -71,4 +71,7 @@ public class BusinessDataPushDTO{ @ApiModelProperty("费用类型code（服务项）") private String serviceItemsCode; + + @ApiModelProperty("数据来源（1-系统生成，2-手工录入）") + private Integer dataSources; } diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java index 2db4266f3..9d08d1ce5 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java @@ -459,6 +459,7 @@ public class LeaseApplicationService { businessDataPushDTO.setSettlementEntityId(leasePO.getShipperId()); businessDataPushDTO.setSecondSubjectCode("26WMS01"); businessDataPushDTO.setServiceItemsCode("26WMS费用"); + businessDataPushDTO.setDataSources(1); bmsServiceFeign.businessDocumentApiSave(businessDataPushDTO); } log.info("定时任务整租推送到bms触发--结束"); @@ -485,9 +486,6 @@ public class LeaseApplicationService { if (ajaxResult != null && "200".equals(String.valueOf(ajaxResult.get("code")))) { List batchDetailFeignPOList = JSON.parseArray( com.alibaba.fastjson2.JSONObject.toJSONString(ajaxResult.get("data")), MaterialInventoryPO.class); - if (batchDetailFeignPOList != null && batchDetailFeignPOList.size() > 0) { - continue;//没有货跳过 - } totalVolume = batchDetailFeignPOList.stream() .map(MaterialInventoryPO::getVolume) .filter(Objects::nonNull) @@ -507,6 +505,7 @@ public class LeaseApplicationService { businessDataPushDTO.setSettlementEntityId(leasePO.getShipperId()); businessDataPushDTO.setSecondSubjectCode("26WMS01"); businessDataPushDTO.setServiceItemsCode("26WMS费用"); + businessDataPushDTO.setDataSources(1); bmsServiceFeign.businessDocumentApiSave(businessDataPushDTO); } } diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facadeApi/lease/LeaseApi.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facadeApi/lease/LeaseApi.java index 818374ffe..fe8dc5b3f 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facadeApi/lease/LeaseApi.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facadeApi/lease/LeaseApi.java @@ -109,7 +109,7 @@ public class LeaseApi extends BaseController{ } /** - * 批量作废租赁 + * 整租同步到bms计费单据 */ @ApiOperation("整租同步到bms计费单据") @GetMapping("/wholeRentSynchronization") @@ -119,4 +119,15 @@ public class LeaseApi extends BaseController{ return AjaxResult.success(); } + /** + * 散租同步到bms计费单据 + */ + @ApiOperation("散租同步到bms计费单据") + @GetMapping("/scatteredRentalSynchronization") + public AjaxResult ScatteredRentalSynchronization() + { + leaseApplicationService.ScatteredRentalSynchronization(); + return AjaxResult.success(); + } + } diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/materialInventory/MaterialInventoryApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/materialInventory/MaterialInventoryApplicationService.java index f5704c71e..1051f5495 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/materialInventory/MaterialInventoryApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/materialInventory/MaterialInventoryApplicationService.java @@ -99,13 +99,13 @@ public class MaterialInventoryApplicationService { } } // 前端有传warehouseId则优先使用传参；未传时才使用"用户关联仓库"作为默认值 - if (materialInventoryDO.getWarehouseId() == null) { - AssociationWarehouseCacheDO associationWarehouseCacheDO = - SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid()); - if (associationWarehouseCacheDO != null) { - materialInventoryDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId()); - } - } +// if (materialInventoryDO.getWarehouseId() == null) { +// AssociationWarehouseCacheDO associationWarehouseCacheDO = +// SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid()); +// if (associationWarehouseCacheDO != null) { +// materialInventoryDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId()); +// } +// } } return materialInventoryDomainService.queryList(materialInventoryDO); } From b5285d9ebb00370bac363f7cae871c8473a023ba Mon Sep 17 00:00:00 2001 From: zhou-hongcheng <1064771933@qq.com> Date: Sat, 28 Feb 2026 17:16:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E4=BA=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../businessDocument/BusinessDocumentApplicationService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mhd_bms/src/main/java/com/mhd/bms/application/server/businessDocument/BusinessDocumentApplicationService.java b/mhd_bms/src/main/java/com/mhd/bms/application/server/businessDocument/BusinessDocumentApplicationService.java index fc7824eff..383f0ccb6 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/application/server/businessDocument/BusinessDocumentApplicationService.java +++ b/mhd_bms/src/main/java/com/mhd/bms/application/server/businessDocument/BusinessDocumentApplicationService.java @@ -813,7 +813,9 @@ public class BusinessDocumentApplicationService { checkDoucumentType(businessDocumentDO); //处理数据 handleDate(businessDocumentDO); - businessDocumentDO.setDataSources(2); + businessDocumentDO.setDataSources(1); + businessDocumentDO.setCreateTime(new Date()); + businessDocumentDO.setCreateByName("system"); businessDocumentDO.setBusinessFlow(OrderSequence.getOrderCode("LS")); businessDocumentDO.setTopOrganizationId(businessDocumentDO.getTopOrganizationId()); businessDocumentDO.setOrganizationId(businessDocumentDO.getOrganizationId());