From c174ea8742ed2a6b262b4601e45c87f1ba2c999f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com> Date: Tue, 1 Sep 2026 15:15:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E5=8F=B7=E7=BC=96=E8=BE=91=E5=8F=98?= =?UTF-8?q?=E5=8C=96=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BB=A5=E5=8F=8A=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessDocumentOrderApplicationService.java | 8 ++++++-- .../service/BusinessDocumentOrderDomainService.java | 6 +++--- mhd_oms/src/main/resources/bootstrap.yml | 8 ++++---- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java index 776b4b2b1..ac7afbe76 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java @@ -103,10 +103,14 @@ public class BusinessDocumentOrderApplicationService { public List queryList(BusinessDocumentOrderDO businessDocumentOrderDO) { LoginUser loginUser = SecurityUtils.getLoginUser(); - if (loginUser != null){ + if (loginUser != null && loginUser.getUserPo() != null){ + // 前端未传组织ID时，查询当前登录组织的数据 + if (businessDocumentOrderDO.getOrganizationId() == null){ + businessDocumentOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId()); + } Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId(); if (topOrganizationId != null && topOrganizationId != 1){ - businessDocumentOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId()); + businessDocumentOrderDO.setTopOrganizationId(topOrganizationId); } } return businessDocumentOrderDomainService.queryList(businessDocumentOrderDO); diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java index 385e3c3f9..13e523077 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java @@ -737,9 +737,9 @@ public class BusinessDocumentOrderDomainService { // boolean istrue=businessDocumentOrderService.update(businessDocumentOrderDO); - //生成货源单号（yyMMdd + 当日顺序号，每日重置） 原更新操作会将 电脑更细为当日的日期。默认和之前的逻辑一样保持不变 - String orderCode = goodsNumberGenerator.generateUniqueGoodsNumber(tmsOrder.getDocumentDate()); - tmsOrder.setGoodsNumber(orderCode); + //更新操作保留原业务单号，不做重新生成（单号随单据日期与当日顺序生成，编辑时不应变化） + //恢复原单号，避免 BeanUtils.copyProperties 时被前端传入值覆盖 + tmsOrder.setGoodsNumber(businessDocumentOrderService.getById(businessDocumentOrderDO.getId()).getGoodsNumber()); ReservationStockOutOrder reservationStockOutOrder = reservationStockOutOrderMapper.selectOne(new LambdaQueryWrapper() .eq(ReservationStockOutOrder::getOutOrderNumber, inOrderNumber) diff --git a/mhd_oms/src/main/resources/bootstrap.yml b/mhd_oms/src/main/resources/bootstrap.yml index 542b6bce7..8751e75da 100644 --- a/mhd_oms/src/main/resources/bootstrap.yml +++ b/mhd_oms/src/main/resources/bootstrap.yml @@ -18,15 +18,15 @@ spring: discovery: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 -# server-addr: 10.33.0.129:6010 - server-addr: 10.102.192.31:6848 + server-addr: 10.33.0.129:6010 +# server-addr: 10.102.192.31:6848 username: nacos password: manhuoda@2023 config: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 -# server-addr: 10.33.0.129:6010 - server-addr: 10.102.192.31:6848 + server-addr: 10.33.0.129:6010 +# server-addr: 10.102.192.31:6848 username: nacos password: manhuoda@2023 #线上正式环境