双钱，空托自动上线优先空托货架区

18256738414

6 天以前 071a7efe34469cbfc0f5401291c6e3ba21f31b19

 core/Monitor.cs

@@ -380,11 +380,10 @@
                && o.N_LOCK_STATE == 0
                && o.S_LOCK_STATE == "无"
                && o.C_ENABLE == "Y"
                && o.N_CURRENT_NUM > 0
                && o.N_CURRENT_NUM == o.N_CAPACITY
                && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == o.S_CODE).Any()
                ).ToList().//空托堆叠库区
                OrderByDescending(o => o.N_CURRENT_NUM).
                First();
                FirstOrDefault();

                if (startLoc == null)
                {
@@ -393,16 +392,15 @@
                    && o.N_LOCK_STATE == 0
                    && o.S_LOCK_STATE == "无"
                    && o.C_ENABLE == "Y"
                    && o.N_CURRENT_NUM > 0
                    && o.N_CURRENT_NUM == o.N_CAPACITY
                    && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == o.S_CODE).Any()
                    ).ToList().//空托货架库区
                    OrderByDescending(o => o.N_CURRENT_NUM).
                    First();
                    FirstOrDefault();
                }

                if (startLoc == null)
                {
                    LogHelper.Info($"起点没有找到合适的空托货位，要求有货");
                    LogHelper.Info($"检测原材料产线下线附近是否有空位,起点没有找到合适的空托货位，要求有货");
                    return;
                }

@@ -410,7 +408,7 @@

                if (cntrList.Count < 1)
                {
                    LogHelper.Info($"起点{startLoc.S_CODE}未找到货位容器关系信息");
                    LogHelper.Info($"检测原材料产线下线附近是否有空位,起点{startLoc.S_CODE}未找到货位容器关系信息");
                    return;
                }

@@ -432,16 +430,16 @@
                    LocationHelper.LockLoc(startLoc.S_CODE, 2);//起点出库锁，
                    LocationHelper.LockLoc(endLoc.S_CODE, 1);//终点入库锁

                    LogHelper.Info($"生成空托自动上线任务成功，容器：{cntrString}，起点：{startLoc.S_CODE}");
                    LogHelper.Info($"检测原材料产线下线附近是否有空位,生成空托自动上线任务成功，容器：{cntrString}，起点：{startLoc.S_CODE}");
                }
                else
                {
                    LogHelper.Info($"生成空托自动上线任务失败，容器：{cntrString}，起点：{startLoc.S_CODE}");
                    LogHelper.Info($"检测原材料产线下线附近是否有空位,生成空托自动上线任务失败，容器：{cntrString}，起点：{startLoc.S_CODE}");
                }
            }
            catch (Exception ex)
            {

                LogHelper.Error(ex.Message, ex);
            }
        }

@@ -803,14 +801,14 @@
                            }
                            else
                            {
                                LogHelper.Info("重量相等，同步TN_DayProDetail跳过");
                                //LogHelper.Info("重量相等，同步TN_DayProDetail跳过");
                            }
                        }
                    }
                }
                else
                {
                    LogHelper.Info("当天的货品规格列表为0，同步TN_DayProDetail跳过");
                    //LogHelper.Info("当天的货品规格列表为0，同步TN_DayProDetail跳过");
                }

                // 同步 TN_WeekProSpcDetail
@@ -841,14 +839,14 @@
                            }
                            else
                            {
                                LogHelper.Info("重量相等，同步TN_WeekProSpcDetail跳过");
                                //LogHelper.Info("重量相等，同步TN_WeekProSpcDetail跳过");
                            }
                        }
                    }
                }
                else
                {
                    LogHelper.Info("当周的货品规格列表为0，同步TN_WeekProSpcDetail跳过");
                    //LogHelper.Info("当周的货品规格列表为0，同步TN_WeekProSpcDetail跳过");
                }

                // 同步 TN_MonthProSpcDetail
@@ -879,14 +877,14 @@
                            }
                            else
                            {
                                LogHelper.Info("重量相等，同步TN_MonthProSpcDetail跳过");
                                //LogHelper.Info("重量相等，同步TN_MonthProSpcDetail跳过");
                            }
                        }
                    }
                }
                else
                {
                    LogHelper.Info("当月的货品规格列表为0，同步TN_MonthProSpcDetail跳过");
                    //LogHelper.Info("当月的货品规格列表为0，同步TN_MonthProSpcDetail跳过");
                }

                // 同步 TN_YearProSpcDetail
@@ -918,14 +916,14 @@
                            }
                            else
                            {
                                LogHelper.Info("重量相等，同步TN_YearProSpcDetail跳过");
                                //LogHelper.Info("重量相等，同步TN_YearProSpcDetail跳过");
                            }
                        }
                    }
                }
                else
                {
                    LogHelper.Info("当年的货品规格列表为0，同步TN_YearProSpcDetail跳过");
                    //LogHelper.Info("当年的货品规格列表为0，同步TN_YearProSpcDetail跳过");
                }
            }
            catch (Exception ex)