From cabcb499a03de83b62eb8c01a734a1f4049f1dcf Mon Sep 17 00:00:00 2001 From: yuyou_x <2336760928@qq.com> Date: 星期三, 13 三月 2024 11:49:30 +0800 Subject: [PATCH] Merge branch 'master' of https://gitee.com/liudongl/jc24-wms --- Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs index c1debd7..4e5e8b7 100644 --- a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs +++ b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs @@ -1639,13 +1639,21 @@ IsBelt = item.IsBelt, Demo = item.Demo, - OwnerNo = ownerNo, - OwnerName = ownerName, - IsDel = "0", CreateUser = 0, CreateTime = comTime }; + //缁存姢搴撳瓨鏄庣粏璐т富/渚涘簲鍟嗕俊鎭� + if (notice.Type == "0" || notice.Type == "2" || notice.Type == "4" || notice.Type == "6" || notice.Type == "7")//0:鎴愬搧鍏ュ簱锛�2:涓棿鍝佸叆搴�,4:杞﹂棿浣欐枡鍏ュ簱,6:浠e偍鍏ュ簱,7:瀵勫瓨鍏ュ簱 + { + sd.OwnerNo = notice.CustomerNo;//璐т富缂栫爜 + sd.OwnerName = notice.CustomerName;//璐т富鍚嶇О + } + else if (notice.Type == "1" || notice.Type == "5")//1:閲囪喘鍏ュ簱,2:鍏跺畠鍏ュ簱 + { + sd.SupplierNo= notice.CustomerNo;//渚涘簲鍟嗙紪鐮� + sd.SupplierName = notice.CustomerName;//渚涘簲鍟嗗悕绉� + } //if (quality.Count() > 0) //{ @@ -1730,13 +1738,16 @@ LockQty = 0, FrozenQty = 0, - OwnerNo = ownerNo, - OwnerName = ownerName, - IsDel = "0", CreateUser = userId, CreateTime = comTime }; + //缁存姢搴撳瓨璐т富淇℃伅 + if (notice.Type == "0" || notice.Type == "2" || notice.Type == "4" || notice.Type == "6" || notice.Type == "7")//0:鎴愬搧鍏ュ簱锛�2:涓棿鍝佸叆搴�,4:杞﹂棿浣欐枡鍏ュ簱,6:浠e偍鍏ュ簱,7:瀵勫瓨鍏ュ簱 + { + stock.OwnerNo = notice.CustomerNo;//璐т富缂栫爜 + stock.OwnerName = notice.CustomerName;//璐т富鍚嶇О + } Db.Insertable(stock).ExecuteCommand(); } #endregion -- Gitblit v1.8.0