From f908cf621faa5d2bb168c45d0cc4d85f47565204 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 13 三月 2024 11:15:15 +0800
Subject: [PATCH] PDA平库入库增加维护货主信息;入库完成增加维护供应商信息;

---
 Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index 1d8d751..8d0d9c4 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -2224,7 +2224,7 @@
                     #endregion
 
                     #region 绠辩爜淇℃伅
-                    var boxInfoList = Db.Queryable<BllBoxInfo>().Where(w => w.IsDel == "0" && w.ASNNo == model.ASNNo).ToList();
+                    var boxInfoList = Db.Queryable<BllBoxInfo>().Where(w => w.IsDel == "0" && w.ASNNo == model.ASNNo && w.PalletNo == model.PalletNo).ToList();
                     // type 0:鎴愬搧鍏ュ簱 1:閲囪喘鍏ュ簱 2:涓棿鍝佸叆搴� 3:閫�璐у叆搴� 4:杞﹂棿浣欐枡閫�鍥炲叆搴� 5:鍏跺畠鍏ュ簱 6:浠e偍鍏ュ簱 7:瀵勫瓨鍏ュ簱
                     if (notice.Type == "2" || notice.Type == "6" || notice.Type == "7")
                     {
@@ -2298,6 +2298,12 @@
                             CreateUser = (int)model.CreateUser,
                             CreateTime = serverTime
                         };
+                        //缁存姢搴撳瓨璐т富淇℃伅
+                        if (notice.Type == "0" || notice.Type == "2" || notice.Type == "4" || notice.Type == "6" || notice.Type == "7")//0:鎴愬搧鍏ュ簱锛�2:涓棿鍝佸叆搴�,4:杞﹂棿浣欐枡鍏ュ簱,6:浠e偍鍏ュ簱,7:瀵勫瓨鍏ュ簱
+                        {
+                            stockModel.OwnerNo = notice.CustomerNo;//璐т富缂栫爜
+                            stockModel.OwnerName = notice.CustomerName;//璐т富鍚嶇О
+                        }
                         //鏂板搴撳瓨鎬讳俊鎭�
                         Db.Insertable<DataStock>(stockModel).ExecuteCommand();
                     }
@@ -2350,9 +2356,21 @@
                             PackagNo = sku.PackagNo,
                             IsBale = bindInfo.IsBale,
                             IsBelt = bindInfo.IsBelt,
+
                             CreateUser = (int)model.CreateUser,
                             CreateTime = serverTime
                         };
+                        //缁存姢搴撳瓨鏄庣粏璐т富/渚涘簲鍟嗕俊鎭�
+                        if (notice.Type == "0" || notice.Type == "2" || notice.Type == "4" || notice.Type == "6" || notice.Type == "7")//0:鎴愬搧鍏ュ簱锛�2:涓棿鍝佸叆搴�,4:杞﹂棿浣欐枡鍏ュ簱,6:浠e偍鍏ュ簱,7:瀵勫瓨鍏ュ簱
+                        {
+                            detailModel.OwnerNo = notice.CustomerNo;//璐т富缂栫爜
+                            detailModel.OwnerName = notice.CustomerName;//璐т富鍚嶇О
+                        }
+                        else if (notice.Type == "1" || notice.Type == "5")//1:閲囪喘鍏ュ簱,2:鍏跺畠鍏ュ簱
+                        {
+                            detailModel.SupplierNo = notice.CustomerNo;//渚涘簲鍟嗙紪鐮�
+                            detailModel.SupplierName = notice.CustomerName;//渚涘簲鍟嗗悕绉�
+                        }
                         stId = Db.Insertable<DataStockDetail>(detailModel).ExecuteReturnIdentity();
 
                     }

--
Gitblit v1.8.0