From dc07d2299b5814362474fc76aef9dd83110fe620 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Fri, 25 Nov 2022 11:01:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=BA=E9=87=8F=E8=A1=A5=E5=8D=95=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/sale/admin/thread/InvProductsTrService.java    | 6 +++---
 api-admin/src/main/resources/application-dev.properties     | 4 ++--
 2 files changed, 5 insertions(+), 5 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 af1d5dd..88771c9 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
@@ -355,7 +355,7 @@ public class InvProductsTrService {
                                 preiInList.add(warehouseEntity);
                             } else if (warehouseEntity.getSerialNo() == null) { //无序列号（多级包装无序列号的已在上一步被排除），补齐数量
                                 int lea = count - invCount;
-                                warehouseEntity.setCount(lea / (warehouseEntity.getCount()));  //
+                                warehouseEntity.setCount(lea / (actCount));  //
                                 preiInList.add(warehouseEntity);
                             }
                         }
@@ -400,7 +400,7 @@ public class InvProductsTrService {
                                 inList.add(warehouseEntity);
                             } else if (warehouseEntity.getSerialNo() == null) { //无序列号（多级包装无序列号的已在上一步被排除），补齐数量
                                 int lea = count - invCount;
-                                warehouseEntity.setCount(lea / (warehouseEntity.getCount()));  //
+                                warehouseEntity.setCount(lea / (actCount));  //
                                 inList.add(warehouseEntity);
                             }
                         }
@@ -470,7 +470,7 @@ public class InvProductsTrService {
                             prePutList.add(warehouseEntity);
                         } else if (warehouseEntity.getSerialNo() == null) { //无序列号（多级包装无序列号的已在上一步被排除），补齐数量
                             int lea = count - invCount;
-                            warehouseEntity.setCount(lea / (warehouseEntity.getCount()));  //
+                            warehouseEntity.setCount(lea / (actCount));  //
                             prePutList.add(warehouseEntity);
                         }
                     }
diff --git a/api-admin/src/main/resources/application-dev.properties b/api-admin/src/main/resources/application-dev.properties
index 62b651c..2b6e3bb 100644
--- a/api-admin/src/main/resources/application-dev.properties
+++ b/api-admin/src/main/resources/application-dev.properties
@@ -1,9 +1,9 @@
 # \u751F\u4EA7\u73AF\u5883
 server.port=9906
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.jdbc-url=jdbc:mysql://192.168.0.55:3306/spms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+spring.datasource.jdbc-url=jdbc:mysql://192.168.0.62:3306/spms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
 spring.datasource.username=root
-spring.datasource.password=123456
+spring.datasource.password=Glxp@6066
 spring.datasource.hikari.connection-timeout=60000
 spring.datasource.hikari.maximum-pool-size=60
 spring.datasource.hikari.minimum-idle=10