一大波签入来了

Rodney Chen

2024-11-27 3f364634b79a0f97a550c54f67313dfc0cfd4cb5

一大波签入来了

 Tiger.Business.MES/Transaction/CollectNode.cs

@@ -43,7 +43,7 @@
                //工步列表为空或者工序节点工步有未完成时，优先完成工序节点工步
                if (Steps.IsNullOrEmpty() || !IsFinishNodeSteps)
                {
                    var wosns = Biz.Db.Queryable<BIZ_MES_WO_BATCH, BIZ_MES_WO_SN>((q, s) => new JoinQueryInfos(JoinType.Inner, q.ORDER_NO == s.WORK_ORDER && q.BATCH_NO == s.BATCH_NO))
                    var wosns = MainDB.Queryable<BIZ_MES_WO_BATCH, BIZ_MES_WO_SN>((q, s) => new JoinQueryInfos(JoinType.Inner, q.ORDER_NO == s.WORK_ORDER && q.BATCH_NO == s.BATCH_NO))
                                .ByAuth(input.AuthOption)//.Where((q, s) => s.STATUS < BIZ_MES_WO_SN.STATUSs.Finished.GetValue())
                                .Where((q, s) => s.SN == input.SN || s.FLOW_SN == input.SN || s.TRAY_SN == input.SN).Select((q, s) => new { Batch = q, SN = s }).ToList();
                    //先判断当前工单不为空且当前岗位在当前工单是不是首站，如果是则不允许变更当前工单，尝试把条码绑定到当前工单
@@ -105,7 +105,7 @@
                                        action.Data.OperInfo = new();
                                        action.IsSuccessed = result.IsSuccessed;
                                        action.LocaleMsg = result.LocaleMsg;
                                        return action;
                                        return SetOutPutMqttMsg(action, input.Locale);
                                    }
                                }
                                //更新CurBatch
@@ -224,7 +224,7 @@
                //action.CatchExceptionWithLog(ex, $"采集工序：提交操作数据异常");
                action.CatchExceptionWithLog(ex, Biz.L("MES.Transaction.CollectNode.SubmitException"));
            }
            return action;
            return SetOutPutMqttMsg(action, input.Locale);
        }

        /// <summary>
@@ -262,7 +262,7 @@
                        return woStatus;
                    }

                    var wipSNs = Biz.Db.Queryable<MES_WIP_DATA>().IncludesAllFirstLayer().Where(q => q.SN == input.SN || q.FLOW_SN == input.SN || q.TRAY_SN == input.SN).Where(q => q.FINISHED_FLAG != "Y").ToList();
                    var wipSNs = MainDB.Queryable<MES_WIP_DATA>().IncludesAllFirstLayer().Where(q => q.SN == input.SN || q.FLOW_SN == input.SN || q.TRAY_SN == input.SN).Where(q => q.FINISHED_FLAG != "Y").ToList();
                    if (wipSNs.IsNullOrEmpty())
                    {
                        var wipSN = new MES_WIP_DATA()

 Tiger.Business.MES/Transaction/PackingNode.cs

@@ -66,7 +66,7 @@
                    if (Steps.IsNullOrEmpty() || !IsFinishNodeSteps)
                    {

                        var wosns = Biz.Db.Queryable<BIZ_MES_WO_BATCH, BIZ_MES_WO_SN>((q, s) => new JoinQueryInfos(JoinType.Inner, q.ORDER_NO == s.WORK_ORDER && q.BATCH_NO == s.BATCH_NO))
                        var wosns = MainDB.Queryable<BIZ_MES_WO_BATCH, BIZ_MES_WO_SN>((q, s) => new JoinQueryInfos(JoinType.Inner, q.ORDER_NO == s.WORK_ORDER && q.BATCH_NO == s.BATCH_NO))
                                            .ByAuth(input.AuthOption)//.Where((q, s) => s.STATUS < BIZ_MES_WO_SN.STATUSs.Finished.GetValue())
                                            .Where((q, s) => s.SN == input.SN || s.FLOW_SN == input.SN || s.TRAY_SN == input.SN).Select((q, s) => new { Batch = q, SN = s }).ToList();

@@ -116,7 +116,7 @@
                                    action.IsSuccessed = false;
                                    //action.LocaleMsg = new($"条码[{0}]是载具条码，请扫描载具中的产品条码继续包装操作");
                                    action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.OnlyMinPackage", input.SN);
                                    return action;
                                    return SetOutPutMqttMsg(action, input.Locale);
                                }
                                var curPkg = Context.ContainsKey("CurPackage") ? Context["CurPackage"] as WipPkg : null;
                                if (!curPkg.IsNullOrEmpty() && !curPkg.IsFinished && curPkg.WorkBatch != curSNs.First().Batch.BATCH_NO)
@@ -126,7 +126,7 @@
                                    action.IsSuccessed = false;
                                    //action.LocaleMsg = new($"正在包装工单批次[{0}]的产品，请先完成当前包装后再扫描其他批次[{1}]的产品[{2}]");
                                    action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.BatchError", curPkg.WorkBatch, curSNs.First().Batch.BATCH_NO, input.SN);
                                    return action;
                                    return SetOutPutMqttMsg(action, input.Locale);
                                }
                                if (curSNs.First().Batch.ACT_LINE != CurLine.LINE_CODE)
                                {
@@ -148,7 +148,7 @@
                                            action.Data.OperInfo = new();
                                            action.IsSuccessed = result.IsSuccessed;
                                            action.LocaleMsg = result.LocaleMsg;
                                            return action;
                                            return SetOutPutMqttMsg(action, input.Locale);
                                        }
                                    }
                                    //更新CurBatch
@@ -267,7 +267,7 @@
                //action.CatchExceptionWithLog(ex, $"包装工序：提交操作数据异常");
                action.CatchExceptionWithLog(ex, Biz.L("MES.Transaction.PackingNode.SubmitException"));
            }
            return action;
            return SetOutPutMqttMsg(action, input.Locale);
        }

        /// <summary>
@@ -304,7 +304,7 @@
                        return woStatus;
                    }

                    var wipSNs = Biz.Db.Queryable<MES_WIP_DATA>().IncludesAllFirstLayer().Where(q => q.SN == input.SN || q.FLOW_SN == input.SN || q.TRAY_SN == input.SN).Where(q => q.FINISHED_FLAG != "Y").ToList();
                    var wipSNs = MainDB.Queryable<MES_WIP_DATA>().IncludesAllFirstLayer().Where(q => q.SN == input.SN || q.FLOW_SN == input.SN || q.TRAY_SN == input.SN).Where(q => q.FINISHED_FLAG != "Y").ToList();
                    if (wipSNs.IsNullOrEmpty())
                    {
                        var wipSN = new MES_WIP_DATA()

 Tiger.Business.MES/Transaction/Position.cs

@@ -30,22 +30,23 @@
            UserCode = userCode;
            ApiHost = apiHost;
            PostCode = postCode;
            _MainDB = Biz.Db;

            CurPosition = Biz.Db.Queryable<MES_POSITION>().Where(q => q.POST_CODE == postCode).First();
            CurPosition = MainDB.Queryable<MES_POSITION>().Where(q => q.POST_CODE == postCode).First();
            //if (CurPosition.IsNullOrEmpty()) throw new InvalidDataException($"MES.Transaction.Position.PositionNotExistsException", new Exception($"{postCode}|"));
            if (CurPosition.IsNullOrEmpty()) throw new InvalidDataException($"岗位[{postCode}]不存在，请提交正确的岗位代码", new Exception($"{postCode}|"));
            CurLine = Biz.Db.Queryable<MES_LINE>().Where(q => q.LINE_CODE == CurPosition.LINE_CODE).First();
            CurLine = MainDB.Queryable<MES_LINE>().Where(q => q.LINE_CODE == CurPosition.LINE_CODE).First();
            //if (CurLine.IsNullOrEmpty()) throw new InvalidDataException($"MES.Transaction.Position.LineNotExistsException", new Exception($"{postCode}|{CurPosition.LINE_CODE}"));
            if (CurLine.IsNullOrEmpty()) throw new InvalidDataException($"岗位[{postCode}]所属的产线[{CurPosition.LINE_CODE}]不存在，请先设置所属产线", new Exception($"{postCode}|{CurPosition.LINE_CODE}"));
            CurWorkshop = Biz.Db.Queryable<MES_WORKSHOP>().Where(q => q.WS_CODE == CurLine.WS_CODE).First();
            CurWorkshop = MainDB.Queryable<MES_WORKSHOP>().Where(q => q.WS_CODE == CurLine.WS_CODE).First();
            //if (CurWorkshop.IsNullOrEmpty()) throw new InvalidDataException($"MES.Transaction.Position.WorkshopNotExistsException", new Exception($"{postCode}|{CurLine.WS_CODE}"));
            if (CurWorkshop.IsNullOrEmpty()) throw new InvalidDataException($"岗位[{postCode}]所属的车间[{CurLine.WS_CODE}]不存在，请先设置所属车间", new Exception($"{postCode}|{CurLine.WS_CODE}"));
            CurFactory = Biz.Db.Queryable<MES_FACTORY>().Where(q => q.FTY_CODE == CurWorkshop.FTY_CODE).First();
            CurFactory = MainDB.Queryable<MES_FACTORY>().Where(q => q.FTY_CODE == CurWorkshop.FTY_CODE).First();
            //if (CurFactory.IsNullOrEmpty()) throw new InvalidDataException($"MES.Transaction.Position.FactoryNotExistsException", new Exception($"{postCode}|{CurWorkshop.FTY_CODE}"));
            if (CurFactory.IsNullOrEmpty()) throw new InvalidDataException($"岗位[{postCode}]所属的工厂[{CurWorkshop.FTY_CODE}]不存在，请先设置所属工厂", new Exception($"{postCode}|{CurWorkshop.FTY_CODE}"));

            //加载当前产线的班制
            CurShiftSys = Biz.Db.Queryable<MES_SHIFT_SYS>().Where(q => q.SFTS_CODE == CurLine.SFTS_CODE).IncludesAllFirstLayer().IncludesAllSecondLayer(q => q.Shifts).First();
            CurShiftSys = MainDB.Queryable<MES_SHIFT_SYS>().Where(q => q.SFTS_CODE == CurLine.SFTS_CODE).IncludesAllFirstLayer().IncludesAllSecondLayer(q => q.Shifts).First();

            return this;
        }
@@ -75,6 +76,8 @@
        public bool IsFinishNodeSteps => !Steps.Any(q => q.NodeType == IWorkStep.NodeTypes.Node && !q.IsFinished);
        public bool IsFinishAllSteps => Steps.Any() && !Steps.Any(q => !q.IsFinished);
        //public int CurStep => Steps.Where(q => !q.IsFinished).OrderBy(q => q.Sequence).FirstOrDefault()?.Sequence ?? 0;
        private DbClient _MainDB;
        public DbClient MainDB => _MainDB;
        private DbClient CommitDB;
        /// <summary>
        /// æ˜¯å¦éœ€è¦ä¸´æ—¶å­˜å‚¨æ•°æ®åº“提交操作，待需要的时候再提交
@@ -107,7 +110,7 @@
            {
                if (!WoContext.ExistsBatch(input.OrderNo, CurLine.LINE_CODE, batchNo, true))
                {
                    var wo = await Biz.Db.Queryable<BIZ_MES_WO>().ByAuth(input.AuthOption).Where(q => q.ORDER_NO == input.OrderNo).FirstAsync();
                    var wo = await MainDB.Queryable<BIZ_MES_WO>().ByAuth(input.AuthOption).Where(q => q.ORDER_NO == input.OrderNo).FirstAsync();
                    //验证明细是否正确
                    if (wo.IsNullOrEmpty())
                    {
@@ -123,7 +126,7 @@
                        action.LocaleMsg = new("MES.Transaction.Position.SelectOrder.StatusException", input.OrderNo, wo.STATUS.GetEnumDesc<BIZ_MES_WO.STATUSs>());
                        return action;
                    }
                    var batch = await Biz.Db.Queryable<BIZ_MES_WO_BATCH>().ByAuth(input.AuthOption)
                    var batch = await MainDB.Queryable<BIZ_MES_WO_BATCH>().ByAuth(input.AuthOption)
                        .Where(q => q.ORDER_NO == input.OrderNo && q.ACT_LINE == CurLine.LINE_CODE)
                        .WhereIF(!batchNo.IsNullOrEmpty(), q => q.BATCH_NO == batchNo)
                        .OrderBy(q => q.STATUS).FirstAsync();
@@ -242,6 +245,55 @@
                info.NextNode = "   â€”   ";
            }
            return info;
        }

        /// <summary>
        /// è®¾ç½®å½“前条码的工序信息
        /// </summary>
        public ApiAction<SubmitOutput> SetOutPutMqttMsg(ApiAction<SubmitOutput> action, string locale = null)
        {
            MQTT.Message msg = new()
            {
                IsSuccessed = action.IsSuccessed,
                Content = Biz.T(action.LocaleMsg, locale),
            };
            switch (action.Status)
            {
                case ApiAction.StatusCodes.Success:
                    if (action.Data.IsFinished)
                    {
                        msg.Voice = MQTT.Voice.Pass;
                        msg.Color = "#FF228B22";
                    }
                    else
                    {
                        msg.Voice = MQTT.Voice.Success;
                        msg.Color = "#FF1E90FF";
                    }
                    break;
                case ApiAction.StatusCodes.Warning:
                    msg.Voice = MQTT.Voice.Warning;
                    msg.Color = "#FFB8860B";
                    break;
                case ApiAction.StatusCodes.Error:
                case ApiAction.StatusCodes.Failed:
                    msg.Voice = MQTT.Voice.Fail;
                    msg.Color = "#FFFF0000";
                    break;
                case ApiAction.StatusCodes.Exception:
                    msg.Voice = MQTT.Voice.Fail;
                    msg.Color = "#FF8B0000";
                    break;
                case ApiAction.StatusCodes.Normal:
                case ApiAction.StatusCodes.NeedConfrim:
                case ApiAction.StatusCodes.Confrimed:
                default:
                    msg.Voice = MQTT.Voice.Silent;
                    msg.Color = "#FF000000";
                    break;
            }
            action.Data.MqttMsg = msg;
            return action;
        }

        /// <summary>
@@ -663,7 +715,7 @@
                                            {
                                                snList.Add(_orderAction.CurPkg.CustSN?.FLOW_SN);
                                            }
                                            _lotnos = string.Join(",", Biz.Db.Queryable<MES_CUST_SN>()
                                            _lotnos = string.Join(",", MainDB.Queryable<MES_CUST_SN>()
                                                .Where((q) => snList.Contains(q.FLOW_SN))
                                                .Select((q) => q.WORK_ORDER).Distinct().ToList());
                                            return _lotnos;
@@ -742,7 +794,7 @@
        private string GetLabelVarWo(BAS_LABEL_VAR lv, string value)
        {
            string result = "";
            var labelVarwos = Biz.Db.Queryable<BAS_LABEL_VAR_WO>().Where(x => x.LABEL_ID == lv.LABEL_ID && x.VAR_NAME == lv.VAR_NAME).ToList();
            var labelVarwos = MainDB.Queryable<BAS_LABEL_VAR_WO>().Where(x => x.LABEL_ID == lv.LABEL_ID && x.VAR_NAME == lv.VAR_NAME).ToList();
            if (labelVarwos.Any(q => q.WORK_ORDER == WorkBatch.Batch.ORDER_NO))
            {
                result = labelVarwos.First(q => q.WORK_ORDER == WorkBatch.Batch.ORDER_NO).VAR_VALUE;
@@ -854,7 +906,7 @@
        private string GetHuaWeiWeek(string pkgOrder, List<string> snList)
        {
            Dictionary<string, string> dic = new();
            var snOrder = Biz.Db.Queryable<MES_CUST_SN, BIZ_MES_WO>((q, w) => new JoinQueryInfos(JoinType.Left, q.WORK_ORDER == w.ORDER_NO))
            var snOrder = MainDB.Queryable<MES_CUST_SN, BIZ_MES_WO>((q, w) => new JoinQueryInfos(JoinType.Left, q.WORK_ORDER == w.ORDER_NO))
                                            .Where((q, w) => q.PKG_ORDER == pkgOrder && (snList.Contains(q.FLOW_SN) || snList.Contains(q.CUST_SN)))
                                           .Select((q, w) => new { q.PKG_ORDER, q.WORK_ORDER, w.ACT_START_TIME, w.PLAN_START_TIME, q.FLOW_SN, q.CUST_SN }).ToList();
            foreach (var sn in snList)

 Tiger.Business.MES/Transaction/TestNode.cs

@@ -37,7 +37,7 @@
                //工步列表为空或者工序节点工步有未完成时，优先完成工序节点工步
                if (Steps.IsNullOrEmpty() || !IsFinishNodeSteps)
                {
                    var wosns = Biz.Db.Queryable<BIZ_MES_WO_BATCH, BIZ_MES_WO_SN>((q, s) => new JoinQueryInfos(JoinType.Inner, q.ORDER_NO == s.WORK_ORDER && q.BATCH_NO == s.BATCH_NO))
                    var wosns = MainDB.Queryable<BIZ_MES_WO_BATCH, BIZ_MES_WO_SN>((q, s) => new JoinQueryInfos(JoinType.Inner, q.ORDER_NO == s.WORK_ORDER && q.BATCH_NO == s.BATCH_NO))
                                                    .ByAuth(input.AuthOption)//.Where((q, s) => s.STATUS < BIZ_MES_WO_SN.STATUSs.Finished.GetValue())
                                                    .Where((q, s) => s.SN == input.SN || s.FLOW_SN == input.SN || s.TRAY_SN == input.SN).Select((q, s) => new { Batch = q, SN = s }).ToList();

@@ -100,7 +100,7 @@
                                        action.Data.OperInfo = new();
                                        action.IsSuccessed = result.IsSuccessed;
                                        action.LocaleMsg = result.LocaleMsg;
                                        return action;
                                        return SetOutPutMqttMsg(action, input.Locale);
                                    }
                                }
                                //更新CurBatch
@@ -219,7 +219,7 @@
                //action.CatchExceptionWithLog(ex, $"测试工序：提交操作数据异常");
                action.CatchExceptionWithLog(ex, Biz.L("MES.Transaction.TestNode.SubmitException"));
            }
            return action;
            return SetOutPutMqttMsg(action, input.Locale);
        }

        /// <summary>
@@ -257,7 +257,7 @@
                        return woStatus;
                    }

                    var wipSNs = Biz.Db.Queryable<MES_WIP_DATA>().IncludesAllFirstLayer().Where(q => q.SN == input.SN || q.FLOW_SN == input.SN || q.TRAY_SN == input.SN).Where(q => q.FINISHED_FLAG != "Y").ToList();
                    var wipSNs = MainDB.Queryable<MES_WIP_DATA>().IncludesAllFirstLayer().Where(q => q.SN == input.SN || q.FLOW_SN == input.SN || q.TRAY_SN == input.SN).Where(q => q.FINISHED_FLAG != "Y").ToList();
                    if (wipSNs.IsNullOrEmpty())
                    {
                        var wipSN = new MES_WIP_DATA()

 Tiger.Business.MES/Transaction/YadaPacking.cs

@@ -63,7 +63,7 @@
                //    action.IsSuccessed = false;
                //    action.LocaleMsg = new($"包装数量[{input.Qty}]不正确，请重新输入数量后继续包装操作");
                //    //action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.QtyError", input.Qty);
                //    return action;
                //    return SetOutPutMqttMsg(action, input.Locale);
                //}
                if (input.Options.ContainsKey("IsPrintCustomerLabel"))
                {
@@ -91,7 +91,7 @@
                    //工步列表为空或者工序节点工步有未完成时，优先完成工序节点工步
                    if (Steps.IsNullOrEmpty() || !IsFinishNodeSteps)
                    {   
                        var wosns = Biz.Db.Queryable<BIZ_MES_WO_BATCH, BIZ_MES_WO_SN>((q, s) => new JoinQueryInfos(JoinType.Inner, q.ORDER_NO == s.WORK_ORDER && q.BATCH_NO == s.BATCH_NO))
                        var wosns = MainDB.Queryable<BIZ_MES_WO_BATCH, BIZ_MES_WO_SN>((q, s) => new JoinQueryInfos(JoinType.Inner, q.ORDER_NO == s.WORK_ORDER && q.BATCH_NO == s.BATCH_NO))
                                                .ByAuth(input.AuthOption)//.Where((q, s) => s.STATUS < BIZ_MES_WO_SN.STATUSs.Finished.GetValue())
                                                .Where((q, s) => s.SN == input.SN || s.FLOW_SN == input.SN || s.TRAY_SN == input.SN).Select((q, s) => new { Batch = q, SN = s }).ToList();
                        curtime = DateTime.Now;  Logger.Console.Info($"{CurSN} : ***** 2 : {(curtime - prevtime).TotalSeconds}s", ConsoleColor.Green); prevtime = curtime;
@@ -142,7 +142,7 @@
                                    action.IsSuccessed = false;
                                    //action.LocaleMsg = new($"条码[{0}]是载具条码，请扫描载具中的产品条码继续包装操作");
                                    action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.OnlyMinPackage", input.SN);
                                    return action;
                                    return SetOutPutMqttMsg(action, input.Locale);
                                }
                                var curPkg = Context.ContainsKey("CurPackage") ? Context["CurPackage"] as WipPkg : null;
                                if (!curPkg.IsNullOrEmpty() && !curPkg.IsFinished && curPkg.WorkBatch != curSNs.First().Batch.BATCH_NO)
@@ -152,7 +152,7 @@
                                    action.IsSuccessed = false;
                                    //action.LocaleMsg = new($"正在包装工单批次[{0}]的产品，请先完成当前包装后再扫描其他批次[{1}]的产品[{2}]");
                                    action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.BatchError", curPkg.WorkBatch, curSNs.First().Batch.BATCH_NO, input.SN);
                                    return action;
                                    return SetOutPutMqttMsg(action, input.Locale);
                                }
                                if (curSNs.First().Batch.ACT_LINE != CurLine.LINE_CODE)
                                {
@@ -174,7 +174,7 @@
                                            action.Data.OperInfo = new();
                                            action.IsSuccessed = result.IsSuccessed;
                                            action.LocaleMsg = result.LocaleMsg;
                                            return action;
                                            return SetOutPutMqttMsg(action, input.Locale);
                                        }
                                    }
                                    //更新CurBatch
@@ -297,7 +297,7 @@
                action.CatchExceptionWithLog(ex, Biz.L("MES.Transaction.PackingNode.SubmitException"));
            }
            curtime = DateTime.Now;  Logger.Console.Info($"{CurSN} : ***** 9 : {(curtime - prevtime).TotalSeconds}s", ConsoleColor.Green); prevtime = curtime;
            return action;
            return SetOutPutMqttMsg(action, input.Locale);
        }

        /// <summary>
@@ -335,7 +335,7 @@
                        return woStatus;
                    }

                    var wipSNs = Biz.Db.Queryable<MES_WIP_DATA>().IncludesAllFirstLayer().Where(q => q.SN == input.SN || q.FLOW_SN == input.SN || q.TRAY_SN == input.SN).Where(q => q.FINISHED_FLAG != "Y").ToList();
                    var wipSNs = MainDB.Queryable<MES_WIP_DATA>().IncludesAllFirstLayer().Where(q => q.SN == input.SN || q.FLOW_SN == input.SN || q.TRAY_SN == input.SN).Where(q => q.FINISHED_FLAG != "Y").ToList();
                    if (wipSNs.IsNullOrEmpty())
                    {
                        var wipSN = new MES_WIP_DATA()
@@ -404,8 +404,8 @@
                    {
                        CurShipQty = ship.ShipQty;
                        IsPrintCustomerLabel = true;
                        SugarParameter[] pars = Biz.Db.Ado.GetParameters(new { BATCH = CurBatch.Batch.BATCH_NO, NodeIdOrName = curNode.NODE_NAME });
                        var list = Biz.Db.Ado.UseStoredProcedure().GetDataTable("SP_MES_GET_NODE_BATCH_COUNT", pars).AsEnumerable().ToList();
                        SugarParameter[] pars = MainDB.Ado.GetParameters(new { BATCH = CurBatch.Batch.BATCH_NO, NodeIdOrName = curNode.NODE_NAME });
                        var list = MainDB.Ado.UseStoredProcedure().GetDataTable("SP_MES_GET_NODE_BATCH_COUNT", pars).AsEnumerable().ToList();
                        if (!list.IsNullOrEmpty())
                        {
                            var batchCount = list.Where(q => q["ProdDate"].ToString() == "Whole").FirstOrDefault();
@@ -904,7 +904,7 @@
                            action.IsSuccessed = false;
                            //action.LocaleMsg = new($"出货数量设定为[{0}]，目前包装了[{1}]，包装尾数的数量必需是[{2}]，请装够数量后再结束包装");
                            action.LocaleMsg = new("MES.Transaction.PackingNode.NotMatchShipQty", shipQty, curQty, shipQty % ruleQty);
                            return action;
                            return SetOutPutMqttMsg(action);
                        }

                        NodeCmd = "PkgSubmit";
@@ -937,7 +937,7 @@
                action.CatchExceptionWithLog(ex, $"包装工序：手动结束包装异常");
                NodeCmd = null;
            }
            return action;
            return SetOutPutMqttMsg(action);
        }

        /// <summary>
@@ -951,8 +951,8 @@
            try
            {
                var CurPkg = Context.ContainsKey("CurPackage") ? Context["CurPackage"] as WipPkg : null;
                var LabelPV = Biz.Db.Queryable<BAS_LABEL_PV>().ToList();
                var label = CurPkg.Item.LABEL_CODE.IsNullOrEmpty() ? null : Biz.Db.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == CurPkg.Item.LABEL_CODE).IncludesAllFirstLayer().First();
                var LabelPV = MainDB.Queryable<BAS_LABEL_PV>().ToList();
                var label = CurPkg.Item.LABEL_CODE.IsNullOrEmpty() ? null : MainDB.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == CurPkg.Item.LABEL_CODE).IncludesAllFirstLayer().First();
                var printLb =  SetLabelVariables(LabelPV, label, new PackingAction(), CurPkg);
                action.Data = new PackingActionOutput()
                {

 Tiger.Business.MES/WorkAction/Assembly.cs

@@ -16,6 +16,7 @@
    {
        #region Propertys & Variables
        #region å›ºå®šå†™æ³•ï¼Œå·¥åºä¸­çš„必要信息
        public DbClient MainDB { get; set; }
        public bool IsFinished { get; set; } = false;
        public IWorkStep CurStep { get; set; }
        public IPosition CurPosition { get; set; }
@@ -34,6 +35,7 @@
        public void Init(IWorkStep curStep, IPosition position, MES_WO_NODE_ACT nodeAct, MES_WO_ACTION setting)
        {
            #region å›ºå®šå†™æ³•ï¼Œç»™é»˜è®¤å˜é‡èµ‹å€¼
            MainDB = position.MainDB;
            CurStep = curStep;
            CurPosition = position;
            NodeAct = nodeAct;
@@ -41,7 +43,7 @@
            #endregion

            //获取产品BOM
            Boms = Biz.Db.Queryable<BAS_PROD_BOM>().Where(q => q.PROD_CODE == CurPosition.WorkBatch.WO.ITEM_CODE).ToList();
            Boms = MainDB.Queryable<BAS_PROD_BOM>().Where(q => q.PROD_CODE == CurPosition.WorkBatch.WO.ITEM_CODE).ToList();
            //获取上料物料
            var assyList = new List<AssemblySetting>();
            try
@@ -57,7 +59,7 @@
                }
            }
            var codes = assyList.Select(q => q.ITEM_CODE).ToList();
            var items = Biz.Db.Queryable<BAS_ITEM>().Where(q => codes.Contains(q.ITEM_CODE) && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).ToList();
            var items = MainDB.Queryable<BAS_ITEM>().Where(q => codes.Contains(q.ITEM_CODE) && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).ToList();
            //获取上料物料的替代料
            foreach (var assy in assyList)
            {
@@ -74,7 +76,7 @@
                    if (!bom.IsNullOrEmpty())
                    {
                        var subs = bom.SUB_CODE.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries);
                        var surItems = Biz.Db.Queryable<BAS_ITEM>().Where(q => subs.Contains(q.ITEM_CODE) && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).ToList();
                        var surItems = MainDB.Queryable<BAS_ITEM>().Where(q => subs.Contains(q.ITEM_CODE) && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).ToList();
                        foreach (var sub in surItems)
                        {
                            if (!item.SubItems.Any(q => q.ITEM_CODE == sub.ITEM_CODE))

 Tiger.Business.MES/WorkAction/IPQC.cs

@@ -16,6 +16,7 @@
    {
        #region Propertys & Variables
        #region å›ºå®šå†™æ³•ï¼Œå·¥åºä¸­çš„必要信息
        public DbClient MainDB { get; set; }
        public bool IsFinished { get; set; } = false;
        public IWorkStep CurStep { get; set; }
        public IPosition CurPosition { get; set; }
@@ -32,6 +33,7 @@
        public void Init(IWorkStep curStep, IPosition position, MES_WO_NODE_ACT nodeAct, MES_WO_ACTION setting)
        {
            #region å›ºå®šå†™æ³•ï¼Œç»™é»˜è®¤å˜é‡èµ‹å€¼
            MainDB = position.MainDB;
            CurStep = curStep;
            CurPosition = position;
            NodeAct = nodeAct;

 Tiger.Business.MES/WorkAction/PackageInputCheck.cs

@@ -17,6 +17,7 @@
    {
        #region Propertys & Variables
        #region å›ºå®šå†™æ³•ï¼Œå·¥åºä¸­çš„必要信息
        public DbClient MainDB { get; set; }
        public bool IsFinished { get; set; } = false;
        public IWorkStep CurStep { get; set; }
        public IPosition CurPosition { get; set; }
@@ -37,6 +38,7 @@
        public void Init(IWorkStep curStep, IPosition position, MES_WO_NODE_ACT nodeAct, MES_WO_ACTION setting)
        {
            #region å›ºå®šå†™æ³•ï¼Œç»™é»˜è®¤å˜é‡èµ‹å€¼
            MainDB = position.MainDB;
            CurStep = curStep;
            CurPosition = position;
            NodeAct = nodeAct;
@@ -44,7 +46,7 @@
            #endregion

            //获取当前产品在当前客户的关系
            CustInfo = Biz.Db.Queryable<BAS_ITEM_CUST>().Where(q => q.ITEM_ID == CurPosition.WorkBatch.WO.ItemInfo.ID && q.CUST_CODE == CurPosition.WorkBatch.WO.CUST_CODE).First();
            CustInfo = MainDB.Queryable<BAS_ITEM_CUST>().Where(q => q.ITEM_ID == CurPosition.WorkBatch.WO.ItemInfo.ID && q.CUST_CODE == CurPosition.WorkBatch.WO.CUST_CODE).First();

            CurStep.Message = Biz.L("扫描厂内条码或客户条码");
            CurStep.Status = StepStatus.Normal;
@@ -118,7 +120,7 @@
            }
            U9Cost = (DateTime.Now - begin).TotalSeconds;

            FlowCSN = Biz.Db.Queryable<MES_CUST_SN>().Where(q => q.FLOW_SN == wipSn.SN || q.CUST_SN == wipSn.SN).First();
            FlowCSN = MainDB.Queryable<MES_CUST_SN>().Where(q => q.FLOW_SN == wipSn.SN || q.CUST_SN == wipSn.SN).First();
            //找不到生产记录，认为扫描错误
            if (FlowCSN.IsNullOrEmpty())
            {

 Tiger.Business.MES/WorkAction/PackingAction.cs

@@ -18,6 +18,7 @@
    {
        #region Propertys & Variables
        #region å›ºå®šå†™æ³•ï¼Œå·¥åºä¸­çš„必要信息
        public DbClient MainDB { get; set; }
        public bool IsFinished { get; set; } = false;
        public IWorkStep CurStep { get; set; }
        public IPosition CurPosition { get; set; }
@@ -48,19 +49,20 @@
            CurPosition = position;
            NodeAct = nodeAct;
            Setting = setting;
            MainDB = position.MainDB;
            #endregion

            //正常条码过站执行包装行为
            PkgRule = Biz.Db.Queryable<BAS_PKG_RULE>().Where(q => q.RULE_CODE == setting.PKG_CODE).IncludesAllFirstLayer().IncludesAllSecondLayer(q => q.Details).First();
            PkgRule = MainDB.Queryable<BAS_PKG_RULE>().Where(q => q.RULE_CODE == setting.PKG_CODE).IncludesAllFirstLayer().IncludesAllSecondLayer(q => q.Details).First();

            //根据行为设置获取多层包装的标签打印模板字典
            var codes = (Setting.OPTION_1 ?? "").JsonToObject<List<WipPkgItem>>() ?? new List<WipPkgItem>();
            foreach (var code in codes)
            {
                var label = code.LABEL_CODE.IsNullOrEmpty() ? null : Biz.Db.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == code.LABEL_CODE).IncludesAllFirstLayer().First();
                var label = code.LABEL_CODE.IsNullOrEmpty() ? null : MainDB.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == code.LABEL_CODE).IncludesAllFirstLayer().First();
                LabelDic.Add(code.PKG_LEVEL, label);
            }
            LabelPV = Biz.Db.Queryable<BAS_LABEL_PV>().ToList();
            LabelPV = MainDB.Queryable<BAS_LABEL_PV>().ToList();

            //如果工序上下文中没有包装记录则新建一个，有且未包装完成则获取当前的包装记录
            if (CurPosition.Context.ContainsKey("CurPackage") && !CurPosition.Context["CurPackage"].IsNullOrEmpty() && !(CurPosition.Context["CurPackage"] as WipPkg).IsFinished)
@@ -76,7 +78,7 @@
                    RULE_CODE = PkgRule.RULE_CODE,
                    RULE_NAME = PkgRule.RULE_NAME,
                    PROD_CODE = CurPosition.WorkBatch.WO.ITEM_CODE,
                    CustSN = Biz.Db.Queryable<MES_CUST_SN>().Where(q => q.FLOW_SN == CurPosition.CurWipSNs.First().FLOW_SN).First(),
                    CustSN = MainDB.Queryable<MES_CUST_SN>().Where(q => q.FLOW_SN == CurPosition.CurWipSNs.First().FLOW_SN).First(),
                    Item = new WipPkgItem()
                    {
                        PKG_CODE = max.PKG_CODE,
@@ -125,7 +127,7 @@
            //获取是否包装完后需要称重
            CurPkg.NeedWeighing = Setting.OPTION_2 == "Y";
            //获取包装规则的称重范围
            PkgProd = Biz.Db.Queryable<BAS_PKG_PROD>().Where(q => q.PKG_RULE_ID == PkgRule.ID && q.ITEM_CODE == CurPosition.WorkBatch.WO.ITEM_CODE).First();
            PkgProd = MainDB.Queryable<BAS_PKG_PROD>().Where(q => q.PKG_RULE_ID == PkgRule.ID && q.ITEM_CODE == CurPosition.WorkBatch.WO.ITEM_CODE).First();

            CurStep?.SetStatusMessage(StepStatus.Normal, Biz.L("记录包装数据"));
        }
@@ -141,6 +143,7 @@
            CurPosition = position;
            NodeAct = null;
            Setting = null;
            MainDB = position.MainDB;
            #endregion
            //获取当前的包装记录
            if (CurPosition.Context.ContainsKey("CurPackage") && !CurPosition.Context["CurPackage"].IsNullOrEmpty())
@@ -152,13 +155,13 @@
                throw new Exception("找不到包装数据，请重新扫描需要包装的产品");
            }
            //手动结束包装专用，临时执行行为
            PkgRule = Biz.Db.Queryable<BAS_PKG_RULE>().Where(q => q.RULE_CODE == CurPkg.RULE_CODE).IncludesAllFirstLayer().IncludesAllSecondLayer(q => q.Details).First();
            PkgRule = MainDB.Queryable<BAS_PKG_RULE>().Where(q => q.RULE_CODE == CurPkg.RULE_CODE).IncludesAllFirstLayer().IncludesAllSecondLayer(q => q.Details).First();

            //根据行为设置获取多层包装的标签打印模板字典
            LabelDic = CurPosition.Context["CurLabelDic"] as Dictionary<int, BAS_LABEL_TEMP>;
            LabelPV = Biz.Db.Queryable<BAS_LABEL_PV>().ToList();
            LabelPV = MainDB.Queryable<BAS_LABEL_PV>().ToList();
            //获取包装规则的称重范围
            PkgProd = Biz.Db.Queryable<BAS_PKG_PROD>().Where(q => q.PKG_RULE_ID == PkgRule.ID && q.ITEM_CODE == CurPkg.PROD_CODE).First();
            PkgProd = MainDB.Queryable<BAS_PKG_PROD>().Where(q => q.PKG_RULE_ID == PkgRule.ID && q.ITEM_CODE == CurPkg.PROD_CODE).First();
            //把

            CurStep?.SetStatusMessage(StepStatus.Normal, Biz.L("记录包装数据"));
@@ -566,7 +569,7 @@
                        IsFinished = true,
                    };

                    CurPkgItem.Package = Biz.Db.Queryable<MES_WIP_PKG>().Where(q => q.SN == CurPkgItem.SN && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).First() ?? new()
                    CurPkgItem.Package = MainDB.Queryable<MES_WIP_PKG>().Where(q => q.SN == CurPkgItem.SN && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).First() ?? new()
                    {
                        AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
                        AUTH_PROD = CurPosition.CurLine.LINE_CODE,

 Tiger.Business.MES/WorkAction/PrintInStoreLabel.cs

@@ -17,6 +17,7 @@
    {
        #region Propertys & Variables
        #region å›ºå®šå†™æ³•ï¼Œå·¥åºä¸­çš„必要信息
        public DbClient MainDB { get; set; }
        public bool IsFinished { get; set; } = false;
        public IWorkStep CurStep { get; set; }
        public IPosition CurPosition { get; set; }
@@ -37,14 +38,15 @@
        public void Init(IWorkStep curStep, IPosition position, MES_WO_NODE_ACT nodeAct, MES_WO_ACTION setting)
        {
            #region å›ºå®šå†™æ³•ï¼Œç»™é»˜è®¤å˜é‡èµ‹å€¼
            MainDB = position.MainDB;
            CurStep = curStep;
            CurPosition = position;
            NodeAct = nodeAct;
            Setting = setting;
            #endregion

            Label = Biz.Db.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == setting.LABEL_CODE).IncludesAllFirstLayer().First();
            LabelPV = Biz.Db.Queryable<BAS_LABEL_PV>().ToList();
            Label = MainDB.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == setting.LABEL_CODE).IncludesAllFirstLayer().First();
            LabelPV = MainDB.Queryable<BAS_LABEL_PV>().ToList();

            CurStep.Message = Biz.L("等待标签打印");
            CurStep.Status = StepStatus.Normal;

 Tiger.Business.MES/WorkAction/PrintLabel.cs

@@ -16,6 +16,7 @@
    {
        #region Propertys & Variables
        #region å›ºå®šå†™æ³•ï¼Œå·¥åºä¸­çš„必要信息
        public DbClient MainDB { get; set; }
        public bool IsFinished { get; set; } = false;
        public IWorkStep CurStep { get; set; }
        public IPosition CurPosition { get; set; }
@@ -34,14 +35,15 @@
        public void Init(IWorkStep curStep, IPosition position, MES_WO_NODE_ACT nodeAct, MES_WO_ACTION setting)
        {
            #region å›ºå®šå†™æ³•ï¼Œç»™é»˜è®¤å˜é‡èµ‹å€¼
            MainDB = position.MainDB;
            CurStep = curStep;
            CurPosition = position;
            NodeAct = nodeAct;
            Setting = setting;
            #endregion

            Label = Biz.Db.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == setting.LABEL_CODE).IncludesAllFirstLayer().First();
            LabelPV = Biz.Db.Queryable<BAS_LABEL_PV>().ToList();
            Label = MainDB.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == setting.LABEL_CODE).IncludesAllFirstLayer().First();
            LabelPV = MainDB.Queryable<BAS_LABEL_PV>().ToList();

            CurStep.Message = Biz.L("等待标签打印");
            CurStep.Status = StepStatus.Normal;

 Tiger.Business.MES/WorkAction/ThreeInOne.cs

@@ -17,6 +17,7 @@
    {
        #region Propertys & Variables
        #region å›ºå®šå†™æ³•ï¼Œå·¥åºä¸­çš„必要信息
        public DbClient MainDB { get; set; }
        public bool IsFinished { get; set; } = false;
        public IWorkStep CurStep { get; set; }
        public IPosition CurPosition { get; set; }
@@ -39,6 +40,7 @@
        public void Init(IWorkStep curStep, IPosition position, MES_WO_NODE_ACT nodeAct, MES_WO_ACTION setting)
        {
            #region å›ºå®šå†™æ³•ï¼Œç»™é»˜è®¤å˜é‡èµ‹å€¼
            MainDB = position.MainDB;
            CurStep = curStep;
            CurPosition = position;
            NodeAct = nodeAct;
@@ -46,11 +48,11 @@
            #endregion

            //获取打印模板
            Label = Biz.Db.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == setting.LABEL_CODE).IncludesAllFirstLayer().First();
            LabelPV = Biz.Db.Queryable<BAS_LABEL_PV>().ToList();
            Label = MainDB.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == setting.LABEL_CODE).IncludesAllFirstLayer().First();
            LabelPV = MainDB.Queryable<BAS_LABEL_PV>().ToList();

            //获取当前产品在当前客户的关系
            CustInfo = Biz.Db.Queryable<BAS_ITEM_CUST>().Where(q => q.ITEM_ID == CurPosition.WorkBatch.WO.ItemInfo.ID && q.CUST_CODE == CurPosition.WorkBatch.WO.CUST_CODE).First();
            CustInfo = MainDB.Queryable<BAS_ITEM_CUST>().Where(q => q.ITEM_ID == CurPosition.WorkBatch.WO.ItemInfo.ID && q.CUST_CODE == CurPosition.WorkBatch.WO.CUST_CODE).First();

            CurStep.Message = Biz.L("扫描厂内条码或客户条码");
            CurStep.Status = StepStatus.Normal;
@@ -100,7 +102,7 @@
            }

            var wipSn = CurPosition.CurWipSNs.First();
            FlowCSN = Biz.Db.Queryable<MES_CUST_SN>().Where(q => q.FLOW_SN == wipSn.SN || q.CUST_SN == wipSn.SN).First();
            FlowCSN = MainDB.Queryable<MES_CUST_SN>().Where(q => q.FLOW_SN == wipSn.SN || q.CUST_SN == wipSn.SN).First();
            //找不到生产记录，认为扫描错误
            if (FlowCSN.IsNullOrEmpty())
            {
@@ -264,7 +266,7 @@
            var action = new ApiAction<SubmitOutput>(new SubmitOutput());

            //查询是否存在已导入的客户条码
            CustCSN = Biz.Db.Queryable<MES_CUST_SN>().Where(q => q.CUST_SN == input.Data).First();
            CustCSN = MainDB.Queryable<MES_CUST_SN>().Where(q => q.CUST_SN == input.Data).First();

            var isOK = true;
            //客户条码扫到厂内条码

 Tiger.Business.MES/WorkAction/VerifyCustomSN.cs

@@ -17,6 +17,7 @@
    {
        #region Propertys & Variables
        #region å›ºå®šå†™æ³•ï¼Œå·¥åºä¸­çš„必要信息
        public DbClient MainDB { get; set; }
        public bool IsFinished { get; set; } = false;
        public IWorkStep CurStep { get; set; }
        public IPosition CurPosition { get; set; }
@@ -34,6 +35,7 @@
        public void Init(IWorkStep curStep, IPosition position, MES_WO_NODE_ACT nodeAct, MES_WO_ACTION setting)
        {
            #region å›ºå®šå†™æ³•ï¼Œç»™é»˜è®¤å˜é‡èµ‹å€¼
            MainDB = position.MainDB;
            CurStep = curStep;
            CurPosition = position;
            NodeAct = nodeAct;
@@ -41,7 +43,7 @@
            #endregion

            //获取当前产品在当前客户的关系
            CustInfo = Biz.Db.Queryable<BAS_ITEM_CUST>().Where(q => q.ITEM_ID == CurPosition.WorkBatch.WO.ItemInfo.ID && q.CUST_CODE == CurPosition.WorkBatch.WO.CUST_CODE).First();
            CustInfo = MainDB.Queryable<BAS_ITEM_CUST>().Where(q => q.ITEM_ID == CurPosition.WorkBatch.WO.ItemInfo.ID && q.CUST_CODE == CurPosition.WorkBatch.WO.CUST_CODE).First();

            CurStep.SetStatusMessage(StepStatus.Normal, Biz.L("验证是否客户标签"));
        }

 Tiger.Business.MES/WorkAction/Weighing.cs

@@ -16,6 +16,7 @@
    {
        #region Propertys & Variables
        #region å›ºå®šå†™æ³•ï¼Œå·¥åºä¸­çš„必要信息
        public DbClient MainDB { get; set; }
        public bool IsFinished { get; set; } = false;
        public IWorkStep CurStep { get; set; }
        public IPosition CurPosition { get; set; }
@@ -33,13 +34,14 @@
        public void Init(IWorkStep curStep, IPosition position, MES_WO_NODE_ACT nodeAct, MES_WO_ACTION setting)
        {
            #region å›ºå®šå†™æ³•ï¼Œç»™é»˜è®¤å˜é‡èµ‹å€¼
            MainDB = position.MainDB;
            CurStep = curStep;
            CurPosition = position;
            NodeAct = nodeAct;
            Setting = setting;
            #endregion

            CurPkg = Biz.Db.Queryable<MES_WIP_PKG>().Where(q => q.SN == CurPosition.CurSN && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).First() ?? new()
            CurPkg = MainDB.Queryable<MES_WIP_PKG>().Where(q => q.SN == CurPosition.CurSN && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).First() ?? new()
            {
                AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
                AUTH_PROD = CurPosition.CurLine.LINE_CODE,

 Tiger.Business.MES/WorkAction/WipExtInfo.cs

@@ -16,6 +16,7 @@
    {
        #region Propertys & Variables
        #region å›ºå®šå†™æ³•ï¼Œå·¥åºä¸­çš„必要信息
        public DbClient MainDB { get; set; }
        public bool IsFinished { get; set; } = false;
        public IWorkStep CurStep { get; set; }
        public IPosition CurPosition { get; set; }
@@ -34,6 +35,7 @@
        public void Init(IWorkStep curStep, IPosition position, MES_WO_NODE_ACT nodeAct, MES_WO_ACTION setting)
        {
            #region å›ºå®šå†™æ³•ï¼Œç»™é»˜è®¤å˜é‡èµ‹å€¼
            MainDB = position.MainDB;
            CurStep = curStep;
            CurPosition = position;
            NodeAct = nodeAct;
@@ -42,9 +44,9 @@

            //获取扩展字段定义
            var seq = Setting.ITEM_CODE.ToInt32();
            ExtInfo = Biz.Db.Queryable<BAS_WIP_EXT>().Where(q => q.SEQ == seq).First();
            ExtInfo = MainDB.Queryable<BAS_WIP_EXT>().Where(q => q.SEQ == seq).First();
            //获取当前SN的扩展信息
            CurWipExt = Biz.Db.Queryable<MES_WIP_EXT>().Where(q => CurPosition.CurWipSNs.Any(w => w.SN == q.SN)).ToList();
            CurWipExt = MainDB.Queryable<MES_WIP_EXT>().Where(q => CurPosition.CurWipSNs.Any(w => w.SN == q.SN)).ToList();
            foreach (var wipSN in CurPosition.CurWipSNs)
            {
                if (!CurWipExt.Any(q => q.SN == wipSN.SN))

 Tiger.Business.MES/WorkAction/YadaAssembly.cs

@@ -17,6 +17,7 @@
    {
        #region Propertys & Variables
        #region å›ºå®šå†™æ³•ï¼Œå·¥åºä¸­çš„必要信息
        public DbClient MainDB { get; set; }
        public bool IsFinished { get; set; } = false;
        public IWorkStep CurStep { get; set; }
        public IPosition CurPosition { get; set; }
@@ -36,6 +37,7 @@
        public void Init(IWorkStep curStep, IPosition position, MES_WO_NODE_ACT nodeAct, MES_WO_ACTION setting)
        {
            #region å›ºå®šå†™æ³•ï¼Œç»™é»˜è®¤å˜é‡èµ‹å€¼
            MainDB = position.MainDB;
            CurStep = curStep;
            CurPosition = position;
            NodeAct = nodeAct;
@@ -43,7 +45,7 @@
            #endregion

            //获取产品BOM
            Boms = Biz.Db.Queryable<BAS_PROD_BOM>().Where(q => q.PROD_CODE == CurPosition.WorkBatch.WO.ITEM_CODE).ToList();
            Boms = MainDB.Queryable<BAS_PROD_BOM>().Where(q => q.PROD_CODE == CurPosition.WorkBatch.WO.ITEM_CODE).ToList();
            //获取上料物料
            var assyList = new List<AssemblySetting>();
            try
@@ -59,7 +61,7 @@
                }
            }
            var codes = assyList.Select(q => q.ITEM_CODE).ToList();
            var items = Biz.Db.Queryable<BAS_ITEM>().Where(q => codes.Contains(q.ITEM_CODE) && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).ToList();
            var items = MainDB.Queryable<BAS_ITEM>().Where(q => codes.Contains(q.ITEM_CODE) && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).ToList();
            //获取上料物料的替代料
            foreach (var assy in assyList)
            {
@@ -76,7 +78,7 @@
                    if (!bom.IsNullOrEmpty())
                    {
                        var subs = bom.SUB_CODE.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries);
                        var surItems = Biz.Db.Queryable<BAS_ITEM>().Where(q => subs.Contains(q.ITEM_CODE) && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).ToList();
                        var surItems = MainDB.Queryable<BAS_ITEM>().Where(q => subs.Contains(q.ITEM_CODE) && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).ToList();
                        foreach (var sub in surItems)
                        {
                            if (!item.SubItems.Any(q => q.ITEM_CODE == sub.ITEM_CODE))
@@ -208,7 +210,7 @@
                    {
                        isOK = false;
                        //在推荐批次所属工单的条码中存在
                        if (Biz.Db.Queryable<BIZ_MES_WO_SN>().Any(q => suggest.Contains(q.WORK_ORDER) && (q.SN == input.SN || q.FLOW_SN == input.SN || q.TRAY_SN == input.SN)))
                        if (MainDB.Queryable<BIZ_MES_WO_SN>().Any(q => suggest.Contains(q.WORK_ORDER) && (q.SN == input.SN || q.FLOW_SN == input.SN || q.TRAY_SN == input.SN)))
                        {
                            isOK = true;
                        }

 Tiger.Business.MES/WorkAction/YadaWoReport.cs

@@ -16,6 +16,7 @@
    {
        #region Propertys & Variables
        #region å›ºå®šå†™æ³•ï¼Œå·¥åºä¸­çš„必要信息
        public DbClient MainDB { get; set; }
        public bool IsFinished { get; set; } = false;
        public IWorkStep CurStep { get; set; }
        public IPosition CurPosition { get; set; }
@@ -33,6 +34,7 @@
        public void Init(IWorkStep curStep, IPosition position, MES_WO_NODE_ACT nodeAct, MES_WO_ACTION setting)
        {
            #region å›ºå®šå†™æ³•ï¼Œç»™é»˜è®¤å˜é‡èµ‹å€¼
            MainDB = position.MainDB;
            CurStep = curStep;
            CurPosition = position;
            NodeAct = nodeAct;

 Tiger.Business.MESTests/Tiger.Business.MESTests.csproj

@@ -17,9 +17,9 @@
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
    <PackageReference Include="MSTest.TestAdapter" Version="3.6.0" />
    <PackageReference Include="MSTest.TestFramework" Version="3.6.0" />
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
    <PackageReference Include="MSTest.TestAdapter" Version="3.6.3" />
    <PackageReference Include="MSTest.TestFramework" Version="3.6.3" />
  </ItemGroup>

  <ItemGroup>

 Tiger.Dependencies/Tiger.Dependencies.csproj

@@ -17,7 +17,7 @@
    <PackageReference Include="MailKit" Version="4.8.0" />
    <PackageReference Include="NLog" Version="5.3.4" />
    <PackageReference Include="NLog.Database" Version="5.3.4" />
    <PackageReference Include="Rhea.Common" Version="6.1.7.1360" />
    <PackageReference Include="Rhea.Common" Version="6.1.7.1361" />
    <PackageReference Include="SharpZipLib" Version="1.4.2" />
    <PackageReference Include="Sundial" Version="2.64.0" />
    <PackageReference Include="Swashbuckle.AspNetCore" Version="7.1.0" />

 Tiger.IBusiness.MES/Transaction/IPosition.cs

@@ -12,6 +12,7 @@
    public interface IPosition : IMESTransaction
    {
        #region Propertys & Variables
        public DbClient MainDB { get; }
        public string UserCode { get; set; }
        public string PostCode { get; set; }
        public MES_FACTORY CurFactory { get; set; }

 Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs

@@ -62,10 +62,6 @@
        /// </summary>
        public bool IsFinished { get; set; } = false;
        /// <summary>
        /// çŸ­æ¶ˆæ¯
        /// </summary>
        public ShortMessage ShortMsg { get; set; }
        /// <summary>
        /// å½“前操作的节点名称
        /// </summary>
        public string NodeName { get; set; }
@@ -82,6 +78,14 @@
        /// </summary>
        public string NextStepID { get; set; }
        /// <summary>
        /// çŸ­æ¶ˆæ¯
        /// </summary>
        public ShortMessage ShortMsg { get; set; }
        /// <summary>
        /// Mqtt消息
        /// </summary>
        public MQTT.Message MqttMsg { get; set; }
        /// <summary>
        /// å½“前操作返回的数据
        /// </summary>
        public object Data { get; set; }

 Tiger.Model.Net/Entitys/MQTTEntity.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,60 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Text;

namespace Tiger.Model
{
    public class MQTT
    {
        public class Message
        {
            public Message()
            {

            }

            public Message(bool isSuccessed, Voice voice, string content, string color)
            {
                IsSuccessed = isSuccessed;
                Voice = voice;
                Content = content;
                Color = color;
            }

            /// <summary>
            /// æ˜¯å¦æˆåŠŸ
            /// </summary>
            public bool IsSuccessed { get; set; }

            /// <summary>
            /// æ˜¯å¦å‘声
            /// </summary>
            public Voice Voice { get; set; }

            /// <summary>
            /// æ¶ˆæ¯
            /// </summary>
            public string Content { get; set; }

            /// <summary>
            /// é¢œè‰²
            /// </summary>
            public string Color { get; set; }
        }

        public enum Voice
        {
            [Description("不发音")]
            Silent,
            [Description("成功")]
            Success,
            [Description("通过")]
            Pass,
            [Description("失败")]
            Fail,
            [Description("警告")]
            Warning,
        }
    }
}

 Tiger.Model.Net/Tiger.Model.Net.csproj

@@ -61,8 +61,8 @@
    <ErrorReport>prompt</ErrorReport>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="SqlSugar, Version=5.1.4.168, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>..\packages\SqlSugar.5.1.4.169\lib\SqlSugar.dll</HintPath>
    <Reference Include="SqlSugar, Version=5.1.4.170, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>..\packages\SqlSugar.5.1.4.171-preview11\lib\SqlSugar.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -77,6 +77,7 @@
  <ItemGroup>
    <Compile Include="Base\DbEntityBase.cs" />
    <Compile Include="DTO\MESDTO.cs" />
    <Compile Include="Entitys\MQTTEntity.cs" />
    <Compile Include="Entitys\Api\Base.cs" />
    <Compile Include="Entitys\Automate\SNInfo.cs" />
    <Compile Include="Entitys\Automate\Vechicle.cs" />

 Tiger.Model.Net/packages.config

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net452" />
  <package id="SqlSugar" version="5.1.4.169" targetFramework="net48" />
  <package id="SqlSugar" version="5.1.4.171-preview11" targetFramework="net48" />
</packages>