Merge branch 'master' of https://gitee.com/liudongl/jc24-wms

yuyou_x

2024-03-13 cabcb499a03de83b62eb8c01a734a1f4049f1dcf

 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:代储入库,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:代储入库,7:寄存入库
                                {
                                    stock.OwnerNo = notice.CustomerNo;//货主编码
                                    stock.OwnerName = notice.CustomerName;//货主名称
                                }
                                Db.Insertable(stock).ExecuteCommand();
                            }
                            #endregion