调整pc端打印物料标签

bklLiudl

3 天以前 0fb06f822b3574c3e8ba40331cba15ce1693ce07

 Wms/WMS.BLL/HttpServer.cs

@@ -50,7 +50,7 @@
                    throw new Exception("起始位置不能为空");
                }
                //获取储位信息
                var locateInfo = Db.Queryable<SysStorageLocat>().First(m => m.IsDel == "0" && m.WareHouseNo == houseNo && m.LocatNo == Strlocate);
                var locateInfo = Db.Queryable<SysStorageLocat>().First(m => m.IsDel == "0" && m.WareHouseNo == "W04" && m.LocatNo == Strlocate);
                if (locateInfo == null)
                {
                    throw new Exception("未查询到空储位");
@@ -103,7 +103,7 @@
                    PalletNo = palletNo,
                    Qty = palletNum,
                    FullQty = pNum,
                    Status = "3", //上架完成
                    Status = "2", //上架完成
                    Type = "1", //0 物料托 1 空托
                    LotNo = "",
                    LotText = "",
@@ -170,10 +170,10 @@
                    InspectQty = 0,
                    ASNNo = modelpb.ASNNo,
                    ASNDetailNo = modelpb.ASNDetailNo,
                    WareHouseNo = locate.WareHouseNo,
                    RoadwayNo = locate.RoadwayNo,
                    AreaNo = locate.AreaNo,
                    LocatNo = locate.LocatNo,
                    //WareHouseNo = locate.WareHouseNo,
                    //RoadwayNo = locate.RoadwayNo,
                    //AreaNo = locate.AreaNo,
                    //LocatNo = locate.LocatNo,
                    PalletNo = modelpb.PalletNo,
                    PalletNo2 = modelpb.PalletNo2,
                    PalletNo3 = modelpb.PalletNo3,
@@ -257,8 +257,8 @@
                    BackDate = DateTime.Now,  //返回时间
                    StartRoadway = "",            // 起始巷道
                    StartLocat = Strlocate,//起始位置
                    EndLocat = locateInfo.LocatNo,//目标位置
                    EndRoadway = locateInfo.RoadwayNo,  // 目标巷道
                    EndLocat = locate.LocatNo,//目标位置
                    EndRoadway = locate.RoadwayNo,  // 目标巷道
                    PalletNo = palletNo,//托盘码
                    IsSend = 1,//是否可再次下发
                    IsCancel = 1,//是否可取消
@@ -307,6 +307,7 @@
                    StartLocate = inTask.StartLocat, // 起始位置
                    EndLocate = inTask.EndLocat, // 目标位置 
                    EndRoadway = inTask.EndRoadway,   // 目标巷道
                    Qty = int.Parse(modelpb.Qty.ToString()),

                    Order = 999,
                    Type = PLCTypeEnum.AGV
@@ -319,7 +320,7 @@

                #endregion

                return null;
                return comDto;
            }
            catch (Exception e)
            {
@@ -719,18 +720,18 @@
                //托盘库存信息
                var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == palletNo).ToList();
                //验证物料是否有成品
                foreach (var item in stockDetail)
                {
                    var skuItem = skuList.First(m => m.SkuNo == item.SkuNo);
                    if (skuItem.SkuNo == "100099")
                    {
                        continue;
                    }
                    if (skuItem.Type != "2")
                    {
                        throw new Exception("托盘上有不是成品的物料");
                    }
                }
                //foreach (var item in stockDetail)
                //{
                //    var skuItem = skuList.First(m => m.SkuNo == item.SkuNo);
                //    if (skuItem.SkuNo == "100099")
                //    {
                //        continue;
                //    }
                //    if (skuItem.Type != "2")
                //    {
                //        throw new Exception("托盘上有不是成品的物料");
                //    }
                //}
                var upShelfOld = Db.Queryable<BllPalletUpShelf>().First(m => m.IsDel == "0" && m.PalletNo == palletNo && (m.Status == "0" || m.Status == "1"));

                if (upShelfOld != null) //正常入库
@@ -1026,18 +1027,18 @@
                var oldTaskNo = "";  //旧任务号
                var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == palletNo).ToList();
                //验证物料是否有成品
                foreach (var item in stockDetail)
                {
                    var skuItem = skuList.First(m => m.SkuNo == item.SkuNo);
                    if (skuItem.SkuNo == "100099")
                    {
                        continue;
                    }
                    if (skuItem.Type != "2")
                    {
                        throw new Exception("托盘上有不是成品的物料");
                    }
                }
                //foreach (var item in stockDetail)
                //{
                //    var skuItem = skuList.First(m => m.SkuNo == item.SkuNo);
                //    if (skuItem.SkuNo == "100099")
                //    {
                //        continue;
                //    }
                //    if (skuItem.Type != "2")
                //    {
                //        throw new Exception("托盘上有不是成品的物料");
                //    }
                //}
                
                var upShelfOld = Db.Queryable<BllPalletUpShelf>().First(m => m.IsDel == "0" && m.PalletNo == palletNo && (m.Status == "0" || m.Status == "1"));