Merge branch 'master' of http://121.37.118.194:8000/r/WMSPrjInstance/HH-001...

czw

2025-07-06 f317e966ce0872e04d1455305845c3e19fb4a532

 HH.WCS.QingXiNongfu/core/Monitor.cs

@@ -1752,8 +1752,8 @@
                                        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)
                                        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)}");
                                        if (cir.S_ITEM_CODE == order.SQL_ItemCode && cir.S_ITEM_NAME == order.SQL_ItemName)
                                        {
                                            //plg 2025年6月13日 09:08:10 
                                            Temp = new locCntItem
@@ -1797,15 +1797,15 @@
                                        {
                                            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);
                                            LogHelper.CSucessLog($"from {tagLoc.S_LOC_CODE} to {loc.S_LOC_CODE} 收缩膜叉运-货架出提升机 ，创建{re} ");
                                            if (re)
                                            {
                                                oto.Add(oic);
                                                if (outlock == null)
                                                {
                                                    var r = new RowLock { S_LOCK_SRC = (StartBit.S_NOTE /*+ StartBit.HalfOrFull*/), T_LOCK_TIME = DateTime.Now, S_LOCK_STATE = "出库锁", S_AREA_CODE = StartBit.S_AREA_CODE, N_ROW = StartBit.N_ROW };
                                                    db.Insertable(r).ExecuteCommand();
                                                }
                                            }
                                            //if (re)
                                            //{
                                            //    oto.Add(oic);
                                            //    if (outlock == null)
                                            //    {
                                            //        var r = new RowLock { S_LOCK_SRC = (StartBit.S_NOTE /*+ StartBit.HalfOrFull*/), T_LOCK_TIME = DateTime.Now, S_LOCK_STATE = "出库锁", S_AREA_CODE = StartBit.S_AREA_CODE, N_ROW = StartBit.N_ROW };
                                            //        db.Insertable(r).ExecuteCommand();
                                            //    }
                                            //}
                                        }
                                    }
                                }