From e37ea67a56edeb7a39ef7bf37b98296a527dac22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E9=B9=8F?= <jp18752920760@163.com>
Date: Wed, 1 Nov 2023 14:48:44 +0800
Subject: [PATCH] 1

---
 .../ICSSoft.DataProject/ICSWareHouseLotInfoService.cs |  1 +
 ICSSoft.WMS.WebAPI/ICSSoft.WMS.WebAPI/Web.config      | 11 ++++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseLotInfoService.cs b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseLotInfoService.cs
index 0a77fca..e5e92f8 100644
--- a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseLotInfoService.cs
+++ b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseLotInfoService.cs
@@ -1506,6 +1506,7 @@ namespace ICSSoft.DataProject
                             ICSInventoryLot where LotNo='{3}' AND WorkPoint='{1}')) WHERE LotNo='{0}' AND WorkPoint='{1}'
                             ";
                 sql = string.Format(sql, LotNo, WorkPoint, Quantity, CurrentLotNo);
+                log.Debug("条码合并SQL：" + sql);
 
                 if (!DBHelper.ExecuteNonQuery(sql, cmd))
                 {
diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.WMS.WebAPI/Web.config b/ICSSoft.WMS.WebAPI/ICSSoft.WMS.WebAPI/Web.config
index 7433846..e1d8417 100644
--- a/ICSSoft.WMS.WebAPI/ICSSoft.WMS.WebAPI/Web.config
+++ b/ICSSoft.WMS.WebAPI/ICSSoft.WMS.WebAPI/Web.config
@@ -10,10 +10,15 @@
     <add key="ConnStr" value="Data Source=192.168.1.71;Database=ICSWMS_Base_SK;Uid=sa;Password=p@ssw0rd;"/>
     <add key="ERPUrl" value="http://192.168.1.71:6655/api/"/>-->
     <!--正式环境-->
-    <add key="ERPDB" value="UFDATA_004_2022"/>
+    <!--<add key="ERPDB" value="UFDATA_004_2022"/>
     <add key="ConnStr" value="Data Source=10.100.3.14;Database=ICSWMS_Base_SK_SD;Uid=sa;Password=p@ssw0rd;"/>
-    <add key="ERPUrl" value="http://192.168.1.71:6677/api/"/>
-    <add key="UploadERP" value="true"/>
+    <add key="ERPUrl" value="http://192.168.1.71:6677/api/"/>-->
+    <!--公司测试-->
+    <add key="ERPDB" value="UFDATA_999_2019"/>
+    <add key="ConnStr" value="Data Source=192.168.1.88;Database=ICSWMS_Base;Uid=sa;Password=aA123456;"/>
+    <add key="ERPUrl" value="http://192.168.1.88:3004/api/"/>
+    
+    <add key="UploadERP" value="false"/>
     <add key="webpages:Version" value="3.0.0.0"/>
     <add key="webpages:Enabled" value="false"/>
     <add key="ClientValidationEnabled" value="true"/>