11
cjs
2025-05-30 41388b3fc48589a26ba7e79fc60ffc0facd21be7
HH.WCS.Mobox3.NongFuLinZhi/wms/WMSHelper.cs
@@ -630,7 +630,7 @@
            }
        }
        public static bool CreateOpTask(string startLoc, string endLoc, string sType, string taskType, string trayCode,string note = "")
        public static bool CreateOpTask(string startLoc, string endLoc, string sType, string taskType, string trayCode, string note = "", string trayType = "", string workNo = "", string itemCode = "")
        {
            bool result = false;
            int nType = sType == "入库" ? 1 : 2;
@@ -644,7 +644,10 @@
                S_TYPE = sType,
                S_OP_DEF_CODE = "",
                S_OP_DEF_NAME = taskType,
                S_NOTE = note
                S_NOTE = note,
                S_TRAY_TYPE = trayType,
                S_WORK_NO = workNo,
                S_ITEM_CODE = itemCode,
            };
            result = WMSHelper.CreateWmsTask(wmsTask);
            if (result)
@@ -694,26 +697,26 @@
                if (a.N_TYPE == 2)
                {
                    LogHelper.Info($"作业终点不为接驳位 查找库区{a.S_END_AREA} 可用货位");
                    //其他库区
                    var endlist = db.Queryable<Location>()
                    .Where(it => it.S_AREA_CODE == a.S_END_AREA && it.N_CURRENT_NUM < it.N_CAPACITY)
                    .OrderBy(it => it.N_COL)
                    .PartitionBy(it => it.N_ROW)
                    .Take(1)
                    .ToList();
                    LogHelper.Info($"符合条件的数量{endlist.Count}");
                    foreach (var item in endlist)
                    {
                        var lockinfo = db.Queryable<Location>().Where(it => it.N_LOCK_STATE != 0 && it.S_AREA_CODE == item.S_AREA_CODE && it.N_ROW == item.N_ROW).First();
                        if (lockinfo == null)
                        {
                            result = item;
                            a.S_END_LOC = item.S_CODE;
                            break;
                        }
                        else LogHelper.Info($"货位{lockinfo.S_CODE} 有锁 当前排不可使用");
                    }
                    //var endlist = db.Queryable<Location>()
                    //.Where(it => it.S_AREA_CODE == a.S_END_AREA && it.N_CURRENT_NUM < it.N_CAPACITY)
                    //.OrderBy(it => it.N_COL)
                    //.PartitionBy(it => it.N_ROW)
                    //.Take(1)
                    //.ToList();
                    //LogHelper.Info($"符合条件的数量{endlist.Count}");
                    //foreach (var item in endlist)
                    //{
                    //    var lockinfo = db.Queryable<Location>().Where(it => it.N_LOCK_STATE != 0 && it.S_AREA_CODE == item.S_AREA_CODE && it.N_ROW == item.N_ROW).First();
                    //    if (lockinfo == null)
                    //    {
                    //        result = item;
                    //        a.S_END_LOC = item.S_CODE;
                    //        break;
                    //    }
                    //    else LogHelper.Info($"货位{lockinfo.S_CODE} 有锁 当前排不可使用");
                    //}
                }
                else
                {
@@ -741,13 +744,13 @@
                                result = TaskProcess.BCPFullOut(db, a.S_OP_DEF_NAME, itemInfo.S_ITEM_CODE);
                            }
                        }
                    }
                    if (a.S_OP_DEF_NAME.Contains("空托下线"))
                    {
                        result = TaskProcess.BCPEmptyOut(db,a.S_OP_DEF_NAME);
                        result = TaskProcess.BCPEmptyOut(db, a.S_OP_DEF_NAME);
                    }
                    //其他库区
                    //var endlist = db.Queryable<Location>()
                    //.Where(it => it.S_AREA_CODE == a.S_END_AREA && it.N_CURRENT_NUM < it.N_CAPACITY)