双钱-新增PDA线边空托到原材料产线上线口

杨张扬

3 天以前 8dab1bc23de4987cb7a145c606c7af7be14332df

 core/Monitor.cs

@@ -137,7 +137,7 @@
                                                                           && c.N_LOCK_STATE == 0 && c.N_CURRENT_NUM == 0
                                                                           && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == c.S_CODE).NotAny()//不能有货
                                                                           && c.C_ENABLE == "Y").
                                                                           OrderBy(o => o.T_MODIFY, OrderByType.Asc).First();//查询合适的终点货位，直接判断当前数量为0即可
                                                                           OrderBy(o => o.N_LAYER, OrderByType.Asc).First();//查询合适的终点货位，直接判断当前数量为0即可

                                                if (endLoc != null)
                                                {
@@ -350,6 +350,22 @@
        }

        /// <summary>
        /// 线边满托货位自动解绑
        /// </summary>
        internal static void XBChekcFull()
        {
            var db = new SqlHelper<object>().GetInstance();
            try
            {
                
            }
            catch (Exception ex)
            {

            }
        }

        /// <summary>
        /// 在复检区检测物品合格，合格的物品自动回库
        /// </summary>
        internal static void CGOkCheck()
@@ -370,7 +386,9 @@
                    return;
                }

                var endLoc = db.Queryable<TN_Location>().First(a => a.S_AREA_CODE == Settings.Areas[1]
                var endLoc = db.Queryable<TN_Location>()
                     .OrderBy(a => a.N_LAYER, OrderByType.Asc)
                    .First(a => a.S_AREA_CODE == Settings.Areas[1]
                && a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无"
                && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == a.S_CODE).NotAny()//不能有货
                );
@@ -460,11 +478,6 @@
                            LocationHelper.LockLoc(startLoc_1.S_CODE, 2);//起点出库锁，
                            LocationHelper.LockLoc(endLoc_1.S_CODE, 1);//终点入库锁
                            LogHelper.Info($"生成满托过期出库任务成功，容器号{outTimeCg.S_CNTR_CODE}，起点{startLoc_1.S_CODE}，终点{endLoc_1.S_CODE}");

                            Task task27 = Task.Run(() =>
                            {
                                SpecHelper.DeleteInventoryM(outTimeCg.S_ID);
                            });
                        }
                    }
                }
@@ -483,7 +496,8 @@
                    var endLoc_2 = db.Queryable<TN_Location>()
                     .Where(o => o.S_AREA_CODE == Settings.Areas[2]
                      && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == o.S_CODE).NotAny()//不能有货
                     && o.N_CURRENT_NUM == 0 && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "无").First();
                     && o.N_CURRENT_NUM == 0 && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "无")
                     .First();

                    if (endLoc_2 != null)
                    {
@@ -940,11 +954,6 @@
                    LocationHelper.LockLoc(endLoc.S_CODE, 1);//终点入库锁

                    LogHelper.Info($"生成满托出库复检任务成功，容器：{cntId.S_CNTR_CODE}，起点：{startLoc.S_CODE}，终点：{endLoc.S_CODE}");

                    Task task27 = Task.Run(() =>
                    {
                         SpecHelper.DeleteInventoryM(cgInfo.S_ID);
                    });
                }
                else
                {