1

czw

2025-06-20 a72fe8b0ad01c6586293340115655c080d005853

1

 HH.WCS.QingXiNongfu/core/Monitor.cs

@@ -1009,9 +1009,7 @@
        static bool InworkLock = false;
        /// <summary>
        /// 原材料 检测各流转位置。  写入托盘货位s_type 中 下一个目的地。就开始中转。
        /// 2025.4.8
        /// 1.清溪原材料测试与成品拆分
        /// 2.进出口单据与CS异常处理
        /// 原物料纸箱，入库堆叠区转运
        /// </summary>
        internal static void BottTask()
        {
@@ -1019,6 +1017,9 @@
            var usingSpace = new List<string> { "入库接驳区", "库内接驳区", "出库接驳区", "提升机退料口" };
            //usingSpace = new List<string> { "YWLRGDD", "YWLWJJB", "YWLYLTKQ", "YWLTKKTQ", "YWLKTDDQ", "YWLT1TSJ", "YWLT1TSJCD", "YWLT2TSJ", "YWLT2TSJCD" };
            usingSpace = new List<string> { "YWLYLTKQ", "YWLTKKTQ", "YWLWJJB", "YWLRGDD", "YWLT1TSJ", "YWLT2TSJ" };
            ///----------------------------退余料中间库区，退空中间库区，
            ///   /*托盘货位表的 S_TYPE。  库区1,库区,*/

            foreach (var area in usingSpace)
            {
                try
@@ -1259,6 +1260,9 @@
            public static string RK_BQCDQ = "SXBQDDKQ";

        }
        /// <summary>
        ///  提扣 。
        /// </summary>
        internal static void YwlTKPEBQ_Auto()
        {
            LogHelper.CoCo(DateTime.Now + "标签-提扣-PE膜->>>>>>>>>>>> ", ConsoleColor.Cyan);
@@ -1736,7 +1740,7 @@
            var db = new SqlHelper<object>().GetInstance();
            var v = db.Queryable<Location>().
                LeftJoin<LocCntrRel>((l, c) => l.S_LOC_CODE == c.S_LOC_CODE)
                .Where((l, c) => (l.S_AREA_CODE == WJ_BQ.RK_XBKQ || l.S_AREA_CODE == WJ_BQ.RK_BQJBQ) && c.S_TYPE == BQ_PRA.B)
                .Where((l, c) => (l.S_AREA_CODE == WJ_BQ.RK_XBKQ /*|| l.S_AREA_CODE == WJ_BQ.RK_BQJBQ*/) && c.S_TYPE == BQ_PRA.B)
                .ToList();
            if (v.Any())
            {
@@ -1759,45 +1763,46 @@
                            {
                                var s_type = ContainerHelper.GetCntrItemRel(CNTR.FirstOrDefault().S_CNTR_CODE).FirstOrDefault()?.N_BQ_TRAY_TYPE ?? 0;
                                Location Endbit = null;
                                if (area == WJ_BQ.RK_BQJBQ)
                                if (area == area/* WJ_BQ.RK_BQJBQ*/)
                                {
                                    var hjs = LocationHelper.GetAreaNormalLocList(WJ_BQ.RK_BBHJQ, true, false);
                                    Endbit = hjs.FindAll(x => x.N_CURRENT_NUM == 0 && x.N_LAYER == (s_type == .5 ? 1 : (s_type == .75 ? 2 : 3))).OrderBy(x => x.N_ROW).ThenBy(x => x.N_COL).FirstOrDefault();
                                    if (Endbit != null)
                                    {
                                        var re = TaskProcess.CreateTransport("", lastfull.S_LOC_CODE.Trim(), Endbit.S_LOC_CODE, "标签叉运-接驳标签退库", CNTR.Select(x => x.S_CNTR_CODE).ToList(), 1, 1, 1, 62);
                                        var re = TaskProcess.CreateTransport("", lastfull.S_LOC_CODE.Trim(), Endbit.S_LOC_CODE, "标签叉运-线边标签退库", CNTR.Select(x => x.S_CNTR_CODE).ToList(), 1, 1, 1, 62);
                                        LogHelper.CSucessLog($"from {lastfull.S_LOC_CODE} to {Endbit.S_LOC_CODE} 标签叉运-接驳标签退库 ，创建{re}");
                                    }
                                }
                                else
                                {
                                    var jbqs = LocationHelper.GetAreaNormalLocList(WJ_BQ.RK_BQJBQ);
                                    foreach (var rowloc in jbqs.GroupBy(x => x.N_ROW))
                                    {
                                        var y2 = rowloc.OrderBy(x => x.N_COL).ToList();
                                        var l2 = y2.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
                                        if (l2 != null && l2.N_CURRENT_NUM > 0)
                                        {
                                            var c = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == l2.S_LOC_CODE);
                                            if (c.FirstOrDefault()?.S_TYPE != BQ_PRA.B)
                                            {
                                                continue;
                                            }
                                            var xcirs = ContainerHelper.GetCntrItemRel(c.FirstOrDefault().S_CNTR_CODE);
                                            if (!xcirs.Any()) continue;
                                            var xcir = xcirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
                                            if (cir.S_ITEM_CODE != xcir.S_ITEM_CODE || cir.S_ITEM_NAME != xcir.S_ITEM_NAME)
                                                continue;
                                        }
                                        var e = y2.Find(x => x.N_COL > (l2?.N_COL ?? 0) && x.N_CURRENT_NUM == 0);
                                        if (e != null)
                                        {
                                            var re = TaskProcess.CreateTransport("", lastfull.S_LOC_CODE.Trim(), e.S_LOC_CODE, "标签叉运-线边标签退库", new List<string> { CNTR.FirstOrDefault().S_CNTR_CODE }, 1, 1, 1, 62, BQ_PRA.B);
                                            LogHelper.Info($"from {lastfull.S_LOC_CODE} to {e.S_LOC_CODE} 标签叉运-线边标签退库 ，创建{re} ");
                                            break;
                                        }
                                    }
                                }

                                //else
                                //{
                                //    var jbqs = LocationHelper.GetAreaNormalLocList(WJ_BQ.RK_BQJBQ);
                                //    foreach (var rowloc in jbqs.GroupBy(x => x.N_ROW))
                                //    {
                                //        var y2 = rowloc.OrderBy(x => x.N_COL).ToList();
                                //        var l2 = y2.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
                                //        if (l2 != null && l2.N_CURRENT_NUM > 0)
                                //        {
                                //            var c = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == l2.S_LOC_CODE);
                                //            if (c.FirstOrDefault()?.S_TYPE != BQ_PRA.B)
                                //            {
                                //                continue;
                                //            }
                                //            var xcirs = ContainerHelper.GetCntrItemRel(c.FirstOrDefault().S_CNTR_CODE);
                                //            if (!xcirs.Any()) continue;
                                //            var xcir = xcirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
                                //            if (cir.S_ITEM_CODE != xcir.S_ITEM_CODE || cir.S_ITEM_NAME != xcir.S_ITEM_NAME)
                                //                continue;
                                //        }
                                //        var e = y2.Find(x => x.N_COL > (l2?.N_COL ?? 0) && x.N_CURRENT_NUM == 0);
                                //        if (e != null)
                                //        {
                                //            var re = TaskProcess.CreateTransport("", lastfull.S_LOC_CODE.Trim(), e.S_LOC_CODE, "标签叉运-线边标签退库", new List<string> { CNTR.FirstOrDefault().S_CNTR_CODE }, 1, 1, 1, 62, BQ_PRA.B);
                                //            LogHelper.Info($"from {lastfull.S_LOC_CODE} to {e.S_LOC_CODE} 标签叉运-线边标签退库 ，创建{re} ");
                                //            break;
                                //        }
                                //    }
                                //}
                            }
                        }
                    }
@@ -2476,6 +2481,9 @@
            LogHelper.Info($" 无菌出库  开始");
            //1.检查是否有退库
            var db = new SqlHelper<object>().GetInstance();

            if (false)
            {
            ///第三段：接驳区 转 线边
            var JQBS = LocationHelper.GetAreaNormalLocList(WJ_BQ.RK_BQJBQ);
            foreach (var jbr in JQBS.GroupBy(x => x.N_ROW))
@@ -2541,8 +2549,6 @@
            }
            LogHelper.Info($" 无菌出库 到线边 结束");
            ///拆垛区取消。
            if (false)
            {
                ///第二段：拆垛区。拆去接驳。 或者回库。
                var v = LocationHelper.GetAreaNormalLocList(WJ_BQ.RK_BQCDQ);
                ///拆垛的出库。 单层的回库  单层不入拆垛区
@@ -2597,6 +2603,7 @@
                    }
                }
            }

            ///第一段：出库 -到拆垛或者 接驳。
            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();

@@ -2660,7 +2667,7 @@
                        if (tagLoc.N_LAYER == 1 || tagLoc.N_CURRENT_NUM == 1)
                        {
                            // 直接出接驳位
                            var jbqs = LocationHelper.GetAreaNormalLocList(WJ_BQ.RK_BQJBQ);
                            var jbqs = LocationHelper.GetAreaNormalLocList(WJ_BQ.RK_XBKQ);
                            foreach (var rowloc in jbqs.GroupBy(x => x.N_ROW))
                            {
                                var y2 = rowloc.OrderBy(x => x.N_COL).ToList();
@@ -2672,16 +2679,16 @@
                                    {
                                        continue;
                                    }
                                    var cirs = ContainerHelper.GetCntrItemRel(c.FirstOrDefault().S_CNTR_CODE);
                                    if (!cirs.Any()) continue;
                                    var cir = cirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
                                    if (cir.S_ITEM_CODE != tagLoc.S_ITEM_CODE || cir.S_ITEM_NAME != tagLoc.S_ITEM_NAME)
                                        continue;
                                    //var cirs = ContainerHelper.GetCntrItemRel(c.FirstOrDefault().S_CNTR_CODE);
                                    //if (!cirs.Any()) continue;
                                    //var cir = cirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
                                    //if (cir.S_ITEM_CODE != tagLoc.S_ITEM_CODE || cir.S_ITEM_NAME != tagLoc.S_ITEM_NAME)
                                    //    continue;
                                }
                                var e = y2.FindAll(x => x.N_COL > (l2?.N_COL ?? 0) && x.N_CURRENT_NUM == 0).FirstOrDefault();
                                if (e != null)
                                {
                                    var re = TaskProcess.CreateTransport("", tagLoc.S_LOC_CODE.Trim(), e.S_LOC_CODE, "标签叉运-货架出接驳", new List<string> { tagLoc.S_CNTR_CODE }, 1, 1, 1, 62);
                                    var re = TaskProcess.CreateTransport("", tagLoc.S_LOC_CODE.Trim(), e.S_LOC_CODE, "标签叉运-货架出线边", new List<string> { tagLoc.S_CNTR_CODE }, 1, 1, 1, 62);
                                    LogHelper.Info($"from {tagLoc.S_LOC_CODE} to {e.S_LOC_CODE} 标签叉运-货架出接驳 ，创建{re} ");
                                    if (re)
                                        oto.Add(item);
@@ -3309,6 +3316,7 @@
                                LogHelper.Info($"备货单：{outOer.S_Work_NO} 最后移库库区{ea} - 排{er} 怎么他妈是空的！！！诡了个异的");
                            }
                        }

                    eaaa:
                        if (string.IsNullOrEmpty(end_area))
                        {
@@ -3389,7 +3397,6 @@
                                //}
                            }
                        }


                        if (string.IsNullOrEmpty(start_area)
                            || string.IsNullOrEmpty(start_row)
@@ -3667,7 +3674,10 @@
                                        break;
                                }
                                if (StartBit == null)
                                {
                                    LogHelper.Info($"{od.SQL_PLineNo} 出库 {Lart.area}区域没有物料可用起点");
                                    continue;
                                }
                                Location Endbit = null;

                                var loc = LocationHelper.GetLoc(PLC.location[0]);
@@ -3731,6 +3741,11 @@
                                        db.Updateable(od).UpdateColumns(it => new { it.TagOverTime }).ExecuteCommand();
                                        //break;
                                    }
                                }
                                else
                                {
                                    LogHelper.Info($"{od.SQL_PLineNo} 出库起点{StartBit.S_LOC_CODE}-{StartBit.N_CURRENT_NUM},没有可用终点");
                                    continue;
                                }
                            }
                    }
@@ -3841,6 +3856,7 @@
                    list.AddRange(item.MidArea.Split('$'));
                }
            }

            foreach (var item in list.Distinct())
            {
                var locs = LocationHelper.GetList<Location>(x => x.S_AREA_CODE == item && x.N_CURRENT_NUM > 0 && x.S_LOCK_STATE == "无");
@@ -3930,7 +3946,8 @@
                                    else InworkLock = true;
                                }
                                else InworkLock = false;
                                var zzlocs = LocationHelper.GetAreaNormalLocList(od.S_ZZ_AREA);
                                string nextarea = !string.IsNullOrEmpty(od.S_ZZ_AREA) ? od.S_ZZ_AREA : od.S_END_AREA;
                                var zzlocs = LocationHelper.GetAreaNormalLocList(nextarea);
                                Location Endbit = null;
                                foreach (var zzrs in zzlocs.GroupBy(x => x.N_ROW).OrderBy(x => x.Key))
                                {
@@ -3959,7 +3976,7 @@
                                if (Endbit != null)
                                {
                                    //生成接驳区任务，标记为终点库区。
                                    var b = TaskProcess.CreateTransport(od.S_ID, lastful.S_LOC_CODE, Endbit.S_LOC_CODE, "原物料搬运-纸箱", crs.Select(x => x.S_CNTR_CODE).ToList(), 1, 1, crs.Count, 50, od.S_END_AREA);
                                    var b = TaskProcess.CreateTransport(od.S_ID, lastful.S_LOC_CODE, Endbit.S_LOC_CODE, "原物料搬运-纸箱", crs.Select(x => x.S_CNTR_CODE).ToList(), 1, 1, crs.Count, 50, nextarea == od.S_END_AREA ? "" : od.S_END_AREA);
                                    if (od.S_ZZ_AREA == "YWLWJJB") InworkLock = false;
                                    break;
                                }

 HH.WCS.QingXiNongfu/core/TaskCore.cs

@@ -3,6 +3,7 @@
using HH.WCS.QingXigongchang.process;
using HH.WCS.QingXigongchang.util;
using HH.WCS.QingXigongchang.wms;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -386,12 +387,14 @@
                    var totalRows = 0;
                    var list = new List<KuRong>();
                    var areas = db.Queryable<Location>().Select(x => x.S_AREA_CODE).ToList().FindAll(x => x != null && System.Text.RegularExpressions.Regex.IsMatch(x, @"QX-\d+_[A-Z]+")).Select(x => x.Split('_')[0]).Distinct().ToList(); //GetAreas();
                    LogHelper.Info($"KurRongCalc List {JsonConvert.SerializeObject(areas)}");
                    areas.ForEach(area =>
                    {
                        totalX += db.Queryable<Location>().Count(b => b.S_AREA_CODE.StartsWith(area) && b.S_AREA_CODE.Contains("_X"));
                        totalRows += db.Queryable<Location>().Where(b => b.S_AREA_CODE.StartsWith(area) && b.S_AREA_CODE.Contains("_X")).Select(b => b.N_ROW).Distinct().Count();
                        var aresList = db.Queryable<Location>().Where(b => b.S_AREA_CODE.StartsWith(area) && b.S_AREA_CODE.Contains("_")).Select(b => b.S_AREA_CODE).Distinct().ToList();
                        aresList = aresList.Select(a => a.Split('_')[0]).Distinct().ToList();
                        LogHelper.Info($"KurRongCalc aresList {JsonConvert.SerializeObject(aresList)}");
                        aresList.ForEach(a =>
                        {
                            //b => b.S_AREA_CODE == a + "_X"
@@ -406,26 +409,53 @@
                                    var kr = new KuRong() { StorageLoc = a.Split('-')[1] + "-" + b, T_MODIFY = DateTime.Now };
                                    Console.WriteLine(kr.StorageLoc);
                                    //每一排要查一下有没有托盘
                                    var listLoc = db.Queryable<Location>().Where(c => c.S_AREA_CODE.Contains(c.S_AREA_CODE) && c.N_ROW == b && c.N_CURRENT_NUM > 0).ToList();
                                    if (!listLoc.Any())
                                    var listLoc = db.Queryable<Location>().Where(c => c.S_AREA_CODE.Contains(a) && c.N_ROW == b).ToList();//&& c.N_CURRENT_NUM > 0

                                    //如果有正常物料排，就用， 没有或者 空排 ，就用小板
                                    var norAreacode = "";
                                    foreach (var arl in listLoc.GroupBy(x => x.S_AREA_CODE))
                                    {
                                        if (arl.ToList().Find(x => x.S_LOCK_STATE.Contains("空间锁")) == null)
                                        {
                                            if (arl.ToList().Find(x => x.N_CURRENT_NUM > 0) != null)
                                            {
                                                norAreacode = arl.Key;
                                                break;
                                            }
                                        }
                                    }
                                    LogHelper.Info($"KurRongCalc [{a}]-{b} 统计是否正常{norAreacode}");
                                    if (string.IsNullOrEmpty(norAreacode))
                                    {
                                        norAreacode = a + "_X";
                                        //没托盘，默认最大容量是小板的数量
                                        var count = db.Queryable<Location>().Count(c => c.S_AREA_CODE == a + "_X" && c.N_ROW == b) * 2 * 2;//2层2托
                                        var count = db.Queryable<Location>().Count(c => c.S_AREA_CODE == norAreacode && c.N_ROW == b) * 2 * 2;//2层2托
                                        kr.MaxCapacity = count;
                                        kr.AvailableCapacity = count;
                                        kr.ProductItem = "";
                                    }
                                    else
                                    {
                                        var locode = listLoc.Find(x => x.S_AREA_CODE == norAreacode && x.N_CURRENT_NUM > 0);
                                        //有托盘 判断是叠2层还是3层，要获取物料信息
                                        var lcr = db.Queryable<LocCntrRel>().Includes(it => it.CntrItemRel).Where(l => l.S_LOC_CODE == listLoc[0].S_LOC_CODE).First();
                                        var lcr = db.Queryable<LocCntrRel>().Includes(it => it.CntrItemRel).Where(l => l.S_LOC_CODE == locode.S_LOC_CODE).First();
                                        LogHelper.Info($"KurRongCalc {norAreacode}-{locode.S_LOC_CODE}-获取到托盘物料信息？：{lcr != null}");
                                        if (lcr != null && lcr.CntrItemRel != null)
                                        {
                                            var maxLayer = ContainerHelper.GetItem(ass => ass.S_ITEM_NAME == lcr.CntrItemRel.S_ITEM_NAME && ass.S_ITEM_CODE == lcr.CntrItemRel.S_ITEM_CODE)?.MaxLayer ?? listLoc[0].N_CAPACITY;
                                            var total = db.Queryable<Location>().Count(c => c.S_AREA_CODE == listLoc[0].S_AREA_CODE && c.N_ROW == b) * maxLayer * 2;
                                            var count = db.Queryable<Location>().Where(c => c.S_AREA_CODE == listLoc[0].S_AREA_CODE && c.N_ROW == b && c.N_CURRENT_NUM > 0).Sum(c => c.N_CURRENT_NUM) * 2;  // 指定统计字段
                                            var maxLayer = ContainerHelper.GetItem(ass => ass.S_ITEM_NAME == lcr.CntrItemRel.S_ITEM_NAME && ass.S_ITEM_CODE == lcr.CntrItemRel.S_ITEM_CODE)?.MaxLayer ?? 0;

                                            //LogHelper.Info($"KurRongCalc {norAreacode}-{lcr.CntrItemRel.S_ITEM_NAME}-{lcr.CntrItemRel.S_ITEM_CODE}-maxlayer:{maxLayer}-{locode.S_LOC_CODE}-{locode.N_CAPACITY}");
                                            if (maxLayer <= 0)
                                            {
                                                maxLayer = locode.N_CAPACITY;
                                            }
                                            var total = db.Queryable<Location>().Count(c => c.S_AREA_CODE == norAreacode && c.N_ROW == b) * maxLayer * 2;
                                            //LogHelper.Info($"KurRongCalc {norAreacode}-{locode.S_LOC_CODE}");
                                            var count = db.Queryable<Location>().Where(c => c.S_AREA_CODE == norAreacode && c.N_ROW == b && c.N_CURRENT_NUM > 0).Sum(c => c.N_CURRENT_NUM) * 2;  // 指定统计字段

                                            kr.ProductItem = lcr.CntrItemRel.S_ITEM_CODE;
                                            if(!string.IsNullOrEmpty(lcr.CntrItemRel.S_ITEM_NAME))
                                                kr.ProductItem = lcr.CntrItemRel.S_ITEM_NAME;
                                            kr.MaxCapacity = total;
                                            kr.FilledCapacity = count;
                                            kr.AvailableCapacity = total - count;

 HH.WCS.QingXiNongfu/process/DeviceProcess.cs

@@ -286,6 +286,7 @@
                        if (!string.IsNullOrEmpty(od.S_ROW))
                            list.Add(od.S_ROW);
                        ma = string.Join(",", list);

                        List<LocCntrRel> lcrl = new List<LocCntrRel>
                        {
                            new LocCntrRel