qx

czw

2025-06-17 2c1dee31661172d73830cb6d7cf86ed503e5805e

qx

 HH.WCS.QingXiNongfu/core/Monitor.cs

@@ -1018,7 +1018,7 @@
            //InworkLock = false;
            var usingSpace = new List<string> { "入库接驳区", "库内接驳区", "出库接驳区", "提升机退料口" };
            //usingSpace = new List<string> { "YWLRGDD", "YWLWJJB", "YWLYLTKQ", "YWLTKKTQ", "YWLKTDDQ", "YWLT1TSJ", "YWLT1TSJCD", "YWLT2TSJ", "YWLT2TSJCD" };
            usingSpace = new List<string> {  "YWLWJJB", "YWLYLTKQ", "YWLTKKTQ", "YWLRGDD", "YWLT1TSJ", "YWLT2TSJ" };
            usingSpace = new List<string> { "YWLWJJB", "YWLYLTKQ", "YWLTKKTQ", "YWLRGDD", "YWLT1TSJ", "YWLT2TSJ" };
            foreach (var area in usingSpace)
            {
                try
@@ -1435,6 +1435,15 @@
                                    {
                                        var srloclist = rs.OrderBy(x => x.N_COL).ToList();
                                        var lastfull = srloclist.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
                                        if (lastfull != null)
                                        {
                                            var c = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == lastfull.S_LOC_CODE);
                                            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 || xcir.S_CJ_NAME != cir.S_CJ_NAME)
                                                continue;
                                        }
                                        EndBit = srloclist.Find(x => x.S_LOCK_STATE == "无" && x.N_CURRENT_NUM < Math.Min(x.N_CAPACITY, 3) && x.S_LOCK_STATE != "报废" && x.N_COL >= (lastfull?.N_COL ?? 0));
                                        if (EndBit != null)
                                            break;
@@ -3669,7 +3678,7 @@
                                }
                                else
                                {
                                    Endbit = LocationHelper.GetAreaNormalLocList(PLC.areaPriy[0]).Find(x =>x.S_LOCK_STATE=="无" && x.N_CURRENT_NUM == 0);
                                    Endbit = LocationHelper.GetAreaNormalLocList(PLC.areaPriy[0]).Find(x => x.S_LOCK_STATE == "无" && x.N_CURRENT_NUM == 0);
                                }

                                if (StartBit != null && Endbit != null)

 HH.WCS.QingXiNongfu/process/DeviceProcess.cs

@@ -274,6 +274,7 @@
                                S_CNTR_CODE=Settings.GetTimeStamp(),
                                S_ITEM_CODE=od.SQL_ItemCode,
                                S_ITEM_NAME=od.SQL_ItemName,
                                S_CJ_NAME = od.S_CJ_NAME,
                                N_BQ_TRAY_TYPE=v1
                            }
                        };