From 825493f5658e52003f92a781d4337d97c62342a0 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Thu, 1 Dec 2022 16:01:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E9=87=8F=E8=A1=A5=E5=8D=95=E5=BE=80?=
 =?UTF-8?q?=E6=9D=A5=E5=8D=95=E4=BD=8D=E5=87=BA=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/sale/admin/thread/InvProductsTrService.java | 9 +++++++--
 api-admin/src/main/resources/application-dev.properties  | 2 +-
 api-admin/src/main/resources/application.properties      | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java
index e81cb4b..2696c5d 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java
@@ -261,9 +261,14 @@ public class InvProductsTrService {
                 }
             } else {
                 if (locWarehouseEntity.getLevel() > 1) {
+
+                    InvSubWarehouseEntity subWarehouseEntity = invSubWarehouseService.findByInvSubByCode(bussinessChangeTypeEntity.getDefaultSubInv());
+
+
                     for (WarehouseEntity tempEntity : warehouseEntities) {
-                        tempEntity.setFromCorp(bussinessChangeTypeEntity.getDefaultInv());
-                        tempEntity.setFromCorpId(bussinessChangeTypeEntity.getDefaultSubInv());
+                        tempEntity.setFromCorp(subWarehouseEntity.getName());
+                        tempEntity.setFromCorpId(subWarehouseEntity.getParentId());
+                        tempEntity.setFromSubInvCode(subWarehouseEntity.getCode());
                         inList.add(tempEntity);
                     }
                 } else {
diff --git a/api-admin/src/main/resources/application-dev.properties b/api-admin/src/main/resources/application-dev.properties
index ab1febc..d56cca5 100644
--- a/api-admin/src/main/resources/application-dev.properties
+++ b/api-admin/src/main/resources/application-dev.properties
@@ -1,7 +1,7 @@
 # \u751F\u4EA7\u73AF\u5883
 server.port=9906
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms_za?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms_wmd?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
 spring.datasource.username=root
 spring.datasource.password=123456
 spring.datasource.hikari.connection-timeout=60000
diff --git a/api-admin/src/main/resources/application.properties b/api-admin/src/main/resources/application.properties
index 0f5d7b4..e487e91 100644
--- a/api-admin/src/main/resources/application.properties
+++ b/api-admin/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-spring.profiles.active=pro
+spring.profiles.active=dev
 
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver