From 4c306bda9b99051aec51329227d0096f622b6d9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=86=E6=99=94?= <luy@valueics.com>
Date: Mon, 16 Oct 2023 18:17:07 +0800
Subject: [PATCH] =?UTF-8?q?PDA=E8=B0=83=E6=8B=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ICSSoft.DataProject/ICSSubmitService.cs   | 27 +++++++++++++++----
 WMS-BS/NFine.Web/Configs/database.config      |  4 +--
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs
index aabf784..b37af3c 100644
--- a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs
+++ b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs
@@ -5546,12 +5546,29 @@ namespace ICSSoft.DataProject
                             DBHelper.ExecuteNonQuery(sql, cmd);
 
                             BusinessCode = TransTypeEnum.OneStepTransferDocIn.GetDescription<DBValue>();
-                            //更新源头单据信息
-                            ICSWareHouseService.OneStepTransferDocIn(item.TransCode, item.TransSequence, item.WorkPoint, itemInfo.CurrentQuantity, cmd, language);
+                            #region 根据占料获取源头单据行信息
+                            string docsql = @"select TransSequence,Quantity from ICSWareHouseLotInfoLog
+                                  where TransType='15' AND TransCode='{0}' AND LotNo='{1}'
+                                  AND WorkPoint='{2}'";
+                            docsql = string.Format(docsql, item.TransCode, itemInfo.LotNo, item.WorkPoint);
+                            DataTable docdt = DBHelper.SQlReturnData(docsql, cmd);
+                            if (docdt.Rows.Count == 0)
+                            {
+                                throw new Exception("扫描条码:" + itemInfo.LotNo + "未查询到占料信息！");
+                            }
+                            #endregion
+                            else
+                            {
+                                foreach (DataRow dr in docdt.Rows)
+                                {
+                                    //更新源头单据信息
+                                    ICSWareHouseService.OneStepTransferDocIn(item.TransCode, dr["TransSequence"].ToString(), item.WorkPoint, dr["Quantity"].ToString(), cmd, language);
 
-                            //更新条码信息
-                            printTable = ICSWareHouseLotInfoService.WareHouseLotInfoTransfer(Identification, item.TransCode, item.TransSequence, itemInfo.WarehouseCode, itemInfo.LocationCode,
-                                itemInfo.LotNo, itemInfo.CurrentQuantity, item.User, item.WorkPoint, item.TransType, TransTypeEnum.OneStepTransferDocIn.GetDescription<DBValue>(), cmd, language, MergeID);
+                                    //更新条码信息
+                                    printTable = ICSWareHouseLotInfoService.WareHouseLotInfoTransfer(Identification, item.TransCode, dr["TransSequence"].ToString(), itemInfo.WarehouseCode, itemInfo.LocationCode,
+                                        itemInfo.LotNo, dr["Quantity"].ToString(), item.User, item.WorkPoint, item.TransType, TransTypeEnum.OneStepTransferDocIn.GetDescription<DBValue>(), cmd, language, MergeID);
+                                }
+                            }
                         }
                     }
                     //上传ERP
diff --git a/WMS-BS/NFine.Web/Configs/database.config b/WMS-BS/NFine.Web/Configs/database.config
index d48eb9a..85bc1dc 100644
--- a/WMS-BS/NFine.Web/Configs/database.config
+++ b/WMS-BS/NFine.Web/Configs/database.config
@@ -3,12 +3,12 @@
   <!--218-->
   <!--<add name="connstr" connectionString="QY3xOGKaqLDAWHboKsGgYkeMX7+IwpdqnP0JCXzIDJKlO3CmS40Eu1hSp7qSHtWUOvWQfS7mO1eq67j/rrKE9zqbXvLhsjwllmCT5VESOfU=" providerName="System.Data.SqlClient" />-->
   <!--108-->
-  <add name="connstr" connectionString="JZjXxiMt8L2hkBlLUD8PBo2VxWR5j1mbj0xyJuwPqY46ywhO56rsfUcuYrySELpMcIISP9ZsoeoRM35Azqruwa16sHbPpvUnLjcXO9dQBsCb0fkixsVZhA==" providerName="System.Data.SqlClient" />
+  <!--<add name="connstr" connectionString="JZjXxiMt8L2hkBlLUD8PBo2VxWR5j1mbj0xyJuwPqY46ywhO56rsfUcuYrySELpMcIISP9ZsoeoRM35Azqruwa16sHbPpvUnLjcXO9dQBsCb0fkixsVZhA==" providerName="System.Data.SqlClient" />-->
   <!--本地-->
   <!--<add name="connstr" connectionString="terx6nSzhBu3PkkAnpCSyozL3WzAB9fHjBxO0NVXmpe6eOA9kowv/TJOuTy7IT8nOsne+r4F4sCVTYdtU25qsA==" providerName="System.Data.SqlClient" />-->
   <!--<add name="connstr" connectionString="rtGBmI26Iovnlhi1pmCU283HlJT7oPnYCzpoKCGyI+c3h86ku+Ux2F7djfwb8dhNZ9BY1kXXzWEL3Ggv1Ma0FLtNl8NdZVmT" providerName="System.Data.SqlClient" />-->
   <!--正式-->
-  <!--<add name="connstr" connectionString="rtGBmI26IovLyEon0NvnkIdIGtERsck4MvG2wvfMHc6XnoqSx8xp4zCTtW6J8SL4+zTBRPXBbFQ4AEnn281E5TY7A1IZOMIr" providerName="System.Data.SqlClient" />-->
+  <add name="connstr" connectionString="rtGBmI26IovLyEon0NvnkIdIGtERsck4MvG2wvfMHc6XnoqSx8xp4zCTtW6J8SL4+zTBRPXBbFQ4AEnn281E5TY7A1IZOMIr" providerName="System.Data.SqlClient" />
   <add name="ERPconnstr" connectionString="Server=192.168.1.218;Initial Catalog=ICS_WMS_NW;User ID=sa;Password=aA123456" providerName="System.Data.SqlClient" />
   <add name="ATVERPconnstr" connectionString="Server=10.29.2.71;Initial Catalog=ATW-0717;User ID=sa;Password=atw.erp" providerName="System.Data.SqlClient" />
   <add name="MailOpen" connectionString="true" />