1

czw

2025-06-20 19598c8162599f635fb340cf6981bf21f11745ae

1

 HH.WCS.QingXiNongfu/core/Monitor.cs

@@ -1044,6 +1044,7 @@
                            if (!cntritems.Any())
                                continue;
                            var cir1 = cntritems.First();
                            //只筛选纸箱物料的库区数据。
                            if (!string.IsNullOrEmpty(cir1.S_ITEM_NAME) && cir1.S_ITEM_NAME.Contains("纸箱-"))
                                if (dsll.TryGetValue(cir1.S_ITEM_CODE, out List<Location> ll))
                                {
@@ -1261,7 +1262,7 @@

        }
        /// <summary>
        ///  提扣 。
        ///  提扣 。标签。PE膜出库
        /// </summary>
        internal static void YwlTKPEBQ_Auto()
        {
@@ -1289,7 +1290,8 @@
                                           S_CNTR_CODE = cir.S_CNTR_CODE
                                       })
                                       .ToList();

            /// 人工堆叠区纸箱 和 标签 是按标识+物料筛选进行入库转运。 
            /// 物料名称包含对应种类进行入库。
            var locsFirst = locsFirstA.FindAll(x => x.S_NOTE.Contains("标签-") && x.S_TYPE == WJ_BQ.RK_BBHJQ);
            var SlocsFirst = locsFirstA.FindAll(x => x.S_NOTE.Contains("标签-") && x.S_TYPE == SX_BQ.RK_BBHJQ);
            var TKlocsFirst = locsFirstA.FindAll(x => x.S_NOTE.Contains("提扣-"));
@@ -1306,7 +1308,7 @@
            {
                try
                {
                    var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "无菌标签出库" && x.WorkType == 6 && x.SQL_State == "执行中").FindAll(x => DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => !string.IsNullOrEmpty(x.TagOver) ? 1 : 2).ThenBy(x => x.TagOverTime).ToList();
                    var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "无菌标签出库" && x.WorkType == 6 && x.SQL_State == "执行中").FindAll(x => x.OutNum > 0 && DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => !string.IsNullOrEmpty(x.TagOver) ? 1 : 2).ThenBy(x => x.TagOverTime).ToList();
                    if (!yuworders.Any())
                    {
                        YwlBQ_CreInwork(locsFirst, WJ_BQ.RK_BQDDQ, WJ_BQ.RK_BBHJQ);
@@ -1314,8 +1316,11 @@
                    else
                    {
                        LogHelper.Info($" 无菌出库  工单开启中");
                       // 标签出库。货架直接出到线边
                        YwlBQ_CreWJOutOrder();
                    }

                    // 标签无菌退库。 
                    YwlBQ_CreWJTK();
                }
                catch (Exception ex)
@@ -1734,7 +1739,7 @@
                Console.WriteLine($"{v.FirstOrDefault()?.S_LOC_CODE} 需要退库-- 自动退库-未实现");
            }
        }

        //标签退库。 线边转到 货架。
        private static void YwlBQ_CreWJTK()
        {
            var db = new SqlHelper<object>().GetInstance();
@@ -2267,7 +2272,7 @@
        }

        /// <summary>
        /// 
        /// 标签入库。 从人工绑定区  到 货架区。
        /// </summary>
        /// <param name="locsFirst"></param>
        internal static void YwlBQ_CreInwork(List<locCntItem> locsFirst, string RK_BQDDQ, string RK_BBHJQ)