chengsc
2025-01-18 76b08b437e41cb6a3118c87636bc1777a110185a
Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -2251,8 +2251,8 @@
                var outLine = "";
                if (userId == 0)
                {
                    TtaskNo = taskNo.Substring(0, taskNo.Length - 4);
                    outLine = taskNo.Substring(taskNo.Length - 4, 3);
                    TtaskNo = taskNo.Substring(0, taskNo.Length - 3);
                    outLine = taskNo.Substring(taskNo.Length - 3, 3);
                }
                //当前任务信息
                var task = Db.Queryable<LogTask>().First(m => m.TaskNo == TtaskNo && m.IsDel == "0");
@@ -2414,6 +2414,11 @@
                                positionEnd = locateno.First(m => m.LocatNo.Substring(4, 2) == "04" && m.LocatNo.Substring(4, 2) == "05" && m.LocatNo.Substring(4, 2) == "06" &&
                                m.Status == "0" && m.Flag == "0").LocatNo; //东侧房间库位
                            }
                            else  //1楼空托盘出库不调用AGV
                            {
                                Db.CommitTran();
                                return;
                            }
                        }
                        if (type1.Type == "1" && (type1.Type == "5" || (positionStart == "440" && positionStart == "440")))  //3楼领料出库 /3L中间品出库
@@ -2465,7 +2470,10 @@
                        };
                        AgvSchedulingTask agvTask = new AgvSchedulingTask();
                        agvTask.ReqCode = TtaskNo;         //agv请求编号,需要随机生成  (最大32位)
                        Random r = new Random();
                        long ran = DateTime.Now.Ticks;
                        agvTask.ReqCode = ran.ToString();
                        //agvTask.ReqCode = TtaskNo;         //agv请求编号,需要随机生成  (最大32位)
                        agvTask.TaskCode = TtaskNo;         //任务号
                        agvTask.TaskTyp = type;           //搬运类型
                        agvTask.PositionCodePath = position;      //起始和目的位集合
@@ -2478,7 +2486,7 @@
                        agvTaskList.Add(agvTask);
                        string str = "";
                        var list2 = agvTaskList.Select(m => m.ReqCode).ToList();
                        var list2 = agvTaskList.Select(m => m.TaskCode).ToList();
                        var jsonData = JsonConvert.SerializeObject(agvTaskList);
                        jsonData = jsonData.Substring(1, jsonData.Length - 1);
                        jsonData = jsonData.Substring(0, jsonData.Length - 1);
@@ -2879,7 +2887,15 @@
                    // 出库总表  状态改为部分分配
                    var noticeModel = Db.Queryable<BllExportNotice>().First(m => m.SONo == noticeDetailModel.SONo && m.IsDel == "0");
                    noticeModel.Status = "1";
                    if (noticeDetailModel.AllotQty<=0)
                    {
                        noticeModel.Status = "0";
                    }
                    else
                    {
                        noticeModel.Status = "1";
                    }
                    Db.Updateable(noticeModel).ExecuteCommand();
                    // 库存明细表 状态修改为异常锁定 锁定数量修改为托盘上数量
@@ -2893,7 +2909,7 @@
                    // 库存总表 锁定数量=当前锁定数量 +  (库存明细托盘上数量-库存明细托盘上已锁定的数量)
                    var stockModel = Db.Queryable<DataStock>().First(m => m.LotNo == stockDetailModel.LotNo && m.SkuNo == stockDetailModel.SkuNo && m.IsDel == "0");
                    stockModel.LockQty = stockModel.LockQty + (int)(stockDetailModel.Qty - lockQty);
                    stockModel.LockQty = stockModel.LockQty + (decimal)(stockDetailModel.Qty - lockQty);
                    Db.Updateable(stockModel).ExecuteCommand();
                    // 拣货明细表 删除
@@ -3578,7 +3594,7 @@
                    foreach (var item in detailList)
                    {
                        totalQty += item.Qty;
                        totalAllotQty += Convert.ToInt32(item.AllotQty);
                        totalAllotQty += Convert.ToDecimal(item.AllotQty);
                    }
                    if (totalAllotQty >= totalQty)
@@ -3801,10 +3817,10 @@
        }
        /// <summary>
        /// 获取拆垛分拣主扫箱码出库
        /// 拆垛分拣主扫箱码出库
        /// </summary>
        /// <param name="model">拆垛托盘号和WCS任务号</param>
        /// <returns>拆垛托盘信息</returns>
        /// <param name="model">箱号</param>
        /// <returns>出库分拣口</returns>
        public string BoxInfoExportWcs(string boxno)
        {
            try
@@ -3987,7 +4003,7 @@
                //修改出库单信息
                Db.Updateable(notice).ExecuteCommand();
                
                return "";
                return allot.LoadingAddre;
            }
            catch (Exception e)
            {