设置当前物料的默认储位

Ben Lin

昨天 a960900364d19bbf0ad7923a57989609e7fce798

 Tiger.Business.MES/WorkAction/PackingAction.cs

@@ -32,7 +32,7 @@
        public PackingActionOutput CurCmd { get; set; }
        public int PrintTimes = 0;
        public Dictionary<int, BAS_LABEL_TEMP> LabelDic { get; set; } = new();
        public List<BAS_LABEL_PV> LabelPV { get; set; } = new();
        public List<BAS_PROCESS_VAR> LabelPV { get; set; } = new();
        public int FinishLevel = 0;
        private bool IsManually => CurStep.IsNullOrEmpty();
        #endregion Propertys & Variables
@@ -62,7 +62,7 @@
                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 = MainDB.Queryable<BAS_LABEL_PV>().ToList();
            LabelPV = MainDB.Queryable<BAS_PROCESS_VAR>().ToList();

            //如果工序上下文中没有包装记录则新建一个，有且未包装完成则获取当前的包装记录
            if (CurPosition.Context.ContainsKey("CurPackage") && !CurPosition.Context["CurPackage"].IsNullOrEmpty() && !(CurPosition.Context["CurPackage"] as WipPkg).IsFinished)
@@ -159,7 +159,7 @@

            //根据行为设置获取多层包装的标签打印模板字典
            LabelDic = CurPosition.Context["CurLabelDic"] as Dictionary<int, BAS_LABEL_TEMP>;
            LabelPV = MainDB.Queryable<BAS_LABEL_PV>().ToList();
            LabelPV = MainDB.Queryable<BAS_PROCESS_VAR>().ToList();
            //获取包装规则的称重范围
            PkgProd = MainDB.Queryable<BAS_PKG_PROD>().Where(q => q.PKG_RULE_ID == PkgRule.ID && q.ITEM_CODE == CurPkg.PROD_CODE).First();
            //把
@@ -842,6 +842,7 @@
            {
                //记录行为操作记录
                var wipActs = new List<MES_WIP_ACT>();
                var wipVars = new List<MES_WIP_ACT_VAR>();
                foreach (var wipSn in CurPosition.CurWipSNs)
                {

@@ -883,14 +884,59 @@
                        ACT_VALUE_2 = CurPkg.ToJson(),
                        ACT_VALUE_3 = CurPkg.IsFinished ? LabelDic[CurPkg.Item.PKG_LEVEL].ToJson() : "",
                        ACT_VALUE_4 = "Customer",
                        ACT_VAR_DIC = CurStep.ActionDic.ToJson(),
                        ELAPSED_TIME = CurStep.GetElapsedTime().TotalMilliseconds.ToInt64(),
                        TRACE_INFO = $"产品条码[{string.Join("，", CurPosition.CurSN)}]包装完成",
                    };
                    wipActs.Add(wipAct);
                    foreach (var item in NodeAct.Variables)
                    {
                        var wipVar = new MES_WIP_ACT_VAR()
                        {
                            AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
                            AUTH_PROD = CurPosition.CurLine.LINE_CODE,
                            HIS_ID = CurPosition.CurWipSNHiss.First(q => q.SN == wipSn.SN).ID,
                            WIP_ID = wipSn.ID,
                            SN = wipSn.SN,
                            ITEM_CODE = wipSn.ITEM_CODE,
                            WORK_ORDER = wipSn.WORK_ORDER,
                            BATCH_NO = wipSn.BATCH_NO,
                            CUST_CODE = CurPosition.WorkBatch.WO.CUST_CODE,
                            ROT_CODE = wipSn.ROT_CODE,
                            NODE_ID = wipSn.NODE_ID,
                            NODE_NAME = wipSn.NODE_NAME,
                            ACT_ID = NodeAct.ID,
                            ACT_NAME = NodeAct.ACT_NAME,
                            FTY_CODE = wipSn.FTY_CODE,
                            WS_CODE = wipSn.WS_CODE,
                            LINE_CODE = wipSn.LINE_CODE,
                            POST_CODE = wipSn.POST_CODE,
                            OPER_CODE = wipSn.OPER_CODE,
                            SEGMENT = wipSn.SEGMENT,
                            FLOW_SN = wipSn.FLOW_SN,
                            TRAY_SN = wipSn.TRAY_SN,
                            INNER_SN = wipSn.INNER_SN,
                            CARTON_SN = wipSn.CARTON_SN,
                            PALLET_SN = wipSn.PALLET_SN,
                            OPERATION_TIME = DateTime.Now,
                            SFTS_CODE = wipSn.SFTS_CODE,
                            SFT_CODE = wipSn.SFT_CODE,
                            PRD_CODE = wipSn.PRD_CODE,
                            VAR_CODE = item.VAR_CODE,
                            VAR_NAME = item.VAR_NAME,
                            VAR_CONTROL = item.VAR_CONTROL,
                            VALUE_TYPE = item.VALUE_TYPE,
                            PROCESS_VAR = item.PROCESS_VAR,
                            INPUT_VALUE = CurStep.ActionDic.GetOrDefault(item.VAR_CODE),
                            TRACE_INFO = CurStep.ActionDic.ToJson(),
                        };
                        wipVars.Add(wipVar);
                    }
                }

                //创建变量克隆对象用于传入DBSubmitAction中保存当前需要暂存的数据值
                var _wipActs = wipActs.Clone();
                var _wipVars = wipVars.Clone();
                var _pkgList = CurPkg.IsFinished ? CurPosition.GetPackageList(CurPkg.Item).Clone() : new();
                var _wipIDs = CurPkg.IsFinished ? CurPkg.Item.GetWipSnList().Select(q => q.Key).ToList().Clone() : new();
                //保存数据
@@ -900,6 +946,7 @@
                    if (_wipActs.Any())
                    {
                        db.Storageable(_wipActs, CurPosition.UserCode).ExecuteCommand();
                        db.Storageable(_wipVars, CurPosition.UserCode).ExecuteCommand();
                    }
                    if (_pkgList.Any())
                    {