1

yuyou_x

2024-02-04 c0ed9488d0c19ae59cf6fe175d3f31681e357d02

 Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs

@@ -543,7 +543,7 @@
                if (!string.IsNullOrWhiteSpace(bind.LocatNo))
                {
                    isNullLocat = 1;
                    locat = Db.Queryable<SysStorageLocat>().First(a=>a.IsDel == "0" && a.WareHouseNo == bind.WareHouseNo && a.RoadwayNo == bind.RoadwayNo && a.LocatNo == bind.LocatNo);
                    locat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == bind.WareHouseNo && a.RoadwayNo == bind.RoadwayNo && a.LocatNo == bind.LocatNo);
                    //判断储位地址是否为正在入库
                    if (locat.Status != "2")
                    {
@@ -1089,9 +1089,9 @@
                    #endregion

                    #endregion
                }                
                }
                storageLocat.Status = "1";
                storageLocat.UpdateTime= serverTime; //修改时间
                storageLocat.UpdateTime = serverTime; //修改时间
                storageLocat.UpdateUser = model.CreateUser; //修改人
                //修改储位状态                                           
                Db.Updateable(storageLocat).ExecuteCommand();
@@ -1693,7 +1693,7 @@

                            noticeList.Add(entry);
                        }
                    }                   
                    }
                }
                return noticeList;
            }
@@ -1715,10 +1715,15 @@
            {
                #region 判断

                //0：成品入库 1：采购入库 2：中间品入库 3：退货入库 4：车间余料入库 5：其它入库 6：代储入库 7：寄存入库
                var TypeLot = "1, 2, 5, 6, 7";

                if (string.IsNullOrEmpty(model.AsnNo))
                {
                    throw new Exception("-1:单据号不可为空!");
                }
                //根据单据号获取入库单总单
                var notice = Db.Queryable<BllArrivalNotice>().First(a => a.IsDel == "0" && a.ASNNo == model.AsnNo);
                if (model.AsnDetailId == null || model.AsnDetailId == 0)
                {
                    throw new Exception("-1:物料不可为空!");
@@ -1729,7 +1734,12 @@
                }
                if (string.IsNullOrEmpty(model.LotNo))
                {
                    throw new Exception("-1:物料批次不可为空!");
                    //判断是否为不限制批次单据
                    if (!TypeLot.Contains(notice.Type))
                    {
                        throw new Exception("-1:物料批次不可为空!");
                    }

                }
                else
                {