mnnnn

czw

2025-06-17 a0677de5d70cdd3e0deb7fca02819495b5d6622c

 HH.WCS.QingXiNongfu/core/Monitor.cs

@@ -1394,11 +1394,12 @@
                    YwlPETK_CreInwork(TKlocsFirst, "YWLTKMKQ", "收缩膜叉运", 1); // PE入库 --提扣
                    //YwlPETKtkOrder("YWLZSXBKQ", "YWLTKMKQ", "收缩膜叉运");
                    //YwlPETKOutOrder("YWLTKMKQ", "YWLZSXBKQ", "收缩膜叉运");// PE中出库

                    var tklist = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "T2提升机-收缩膜" && x.WorkType == 1 && x.SQL_State == "执行中");
                    if (tklist.Count() > 0)
                    {
                        LogHelper.Info("-收缩膜  退库！");
                        var tk = tklist.FirstOrDefault();


                        var loc = LocationHelper.GetLoc(plc.location[0]);
                        if (loc.N_CURRENT_NUM > 0 && loc.S_LOCK_STATE == "无")
@@ -1477,8 +1478,13 @@
                    else
                    //YwlPETKOutOrder("YWLTKMKQ", "", "PE叉运");// PE小出库
                    {
                        LogHelper.Info("-收缩膜  出库！");
                        var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "T2提升机-收缩膜" && 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()) return;
                        if (!yuworders.Any())
                        {
                            LogHelper.Info("-收缩膜  出库！没有出库单。");
                            return;
                        }
                        var ploc = plc.location[0];
                    retuse:
                        var order = yuworders.FirstOrDefault();
@@ -1510,6 +1516,7 @@
                                LogHelper.CErrorLog("小水出库：" + (order.SQL_WorkNo) + "没有【指定物料；");
                                goto retuse;
                            }
                            LogHelper.Info("-收缩膜  出库！" + oic + oin);

                            string v = "YWLTKMKQ";
                            int ord = -1;
@@ -1536,9 +1543,9 @@
                                    var cirs = ContainerHelper.GetCntrItemRel(CNTR.FirstOrDefault().S_CNTR_CODE);
                                    if (!cirs.Any()) continue;
                                    cir = cirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
                                    LogHelper.Info($"收缩膜 出库！{item.Key}排 [{cir.S_ITEM_CODE}-{order.SQL_ItemCode}]   [{cir.S_ITEM_NAME}-{order.SQL_ItemName}]  [{cir.S_CJ_NAME}-{order.S_CJ_NAME}]  {(cir.S_ITEM_CODE == order.SQL_ItemCode && cir.S_ITEM_NAME == order.SQL_ItemName && cir.S_CJ_NAME == order.S_CJ_NAME)}");
                                    if (cir.S_ITEM_CODE == order.SQL_ItemCode && cir.S_ITEM_NAME == order.SQL_ItemName && cir.S_CJ_NAME == order.S_CJ_NAME)
                                    {

                                        //plg 2025年6月13日 09:08:10 
                                        Temp = new locCntItem
                                        {
@@ -1570,14 +1577,13 @@
                            if (StartBit != null)
                            {
                                var tagLoc = StartBit;
                                if (tagLoc.N_LAYER == 1 || tagLoc.N_CURRENT_NUM == 1)
                                {
                                    // 直接出提升机位
                                    //var pc = Settings.GetDeviceInfoList().Where(a => a.deviceName == "水线标签提升机").FirstOrDefault();

                                LogHelper.Info(order.SQL_PLineNo + $"-收缩膜出库！终点{ploc}-{DeviceProcess.doorStatus[ploc]?.info}");
                                    if (!string.IsNullOrEmpty(ploc) && plc != null && DeviceProcess.doorStatus[ploc]?.info == "1")
                                    {
                                        var loc = LocationHelper.GetLoc(ploc);
                                    LogHelper.Info(order.SQL_PLineNo + $"-收缩膜出库！终点{loc.N_CURRENT_NUM}-{loc.S_LOCK_STATE}");
                                        if (loc.N_CURRENT_NUM == 0 && loc.S_LOCK_STATE == "无")
                                        {
                                            var re = TaskProcess.CreateTransport("", tagLoc.S_LOC_CODE.Trim(), loc.S_LOC_CODE, "收缩膜叉运-货架出提升机", new List<string> { tagLoc.S_CNTR_CODE }, StartBit.N_CURRENT_NUM, 1, 1, 62);
@@ -1594,6 +1600,9 @@
                                        }
                                    }
                                }
                            else
                            {
                                LogHelper.Info(order.SQL_PLineNo + "-收缩膜  出库！ 没有可用物料");
                            }

                            var set1 = new HashSet<string>(oto);