From ae36a483fee87acb0cfc95b1331216ba632f8068 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Wed, 3 Apr 2024 14:05:26 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/api/service/inv/InvCountOrderService.java    | 3 +++
 src/main/resources/application-dev.yml                         | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/service/inv/InvCountOrderService.java b/src/main/java/com/glxp/api/service/inv/InvCountOrderService.java
index b52ee8651..8293e4a0d 100644
--- a/src/main/java/com/glxp/api/service/inv/InvCountOrderService.java
+++ b/src/main/java/com/glxp/api/service/inv/InvCountOrderService.java
@@ -517,6 +517,7 @@ public class InvCountOrderService extends ServiceImpl<InvCountOrderMapper, InvCo
         //生成盘亏出库单
         if (CollUtil.isNotEmpty(lossCodesList)) {
             IoOrderEntity order = createOrder(invCountSettingEntity, invCountOrder, ConstantType.TYPE_OUT);
+            invCountOrder.setOutOrderIds(order.getBillNo());
             lossCodesList.forEach(warehouseEntity -> {
                 warehouseEntity.setOrderId(order.getBillNo());
                 warehouseEntity.setAction(order.getAction());
@@ -535,6 +536,7 @@ public class InvCountOrderService extends ServiceImpl<InvCountOrderMapper, InvCo
         //生成盘盈入库单
         if (CollUtil.isNotEmpty(profitCodesList)) {
             IoOrderEntity order = createOrder(invCountSettingEntity, invCountOrder, ConstantType.TYPE_PUT);
+            invCountOrder.setInOrderIds(order.getBillNo());
             profitCodesList.forEach(warehouseEntity -> {
                 warehouseEntity.setOrderId(order.getBillNo());
                 warehouseEntity.setAction(order.getAction());
@@ -680,6 +682,7 @@ public class InvCountOrderService extends ServiceImpl<InvCountOrderMapper, InvCo
         orderEntity.setAction(bussinessTypeEntity.getAction());
         orderEntity.setCreateTime(new Date());
         orderEntity.setInvCode(invCountOrder.getInvStorageCode());
+        orderEntity.setDeptCode(invCountOrder.getDeptCode());
         if (unitMaintainEntity != null) {
             orderEntity.setFromCorp(unitMaintainEntity.getErpId());
         }
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 1b940c383..b18222f52 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -4,7 +4,7 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://192.168.0.166:3306/udi_wms_ct?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://192.168.0.166:3306/udi_wms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: 123456
     hikari: