Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Serve...

Rodney Chen

6 天以前 756e6c531d49a4565e47949120cb33bae431566e

 Tiger.Business.MES/WorkAction/Weighing.cs

@@ -41,27 +41,7 @@
            Setting = setting;
            #endregion

            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,
                SN = CurPosition.CurSN,
                PKG_TYPE = CurPosition.WorkBatch.WO.ItemInfo?.UNIT,
                ITEM_CODE = CurPosition.CurWipSNs.First().ITEM_CODE,
                QTY = CurPosition.CurWipSNs.Sum(q => q.QTY),
                UNIT = CurPosition.WorkBatch.WO.ItemInfo?.UNIT,
                WORK_ORDER = CurPosition.CurWipSNs.First().WORK_ORDER,
                BATCH_NO = CurPosition.CurWipSNs.First().BATCH_NO,
                ROT_CODE = CurPosition.CurWipSNs.First().ROT_CODE,
                NODE_ID = CurPosition.CurWipSNs.First().NODE_ID,
                NODE_NAME = CurPosition.CurWipSNs.First().NODE_NAME,
                FTY_CODE = CurPosition.CurWipSNs.First().FTY_CODE,
                WS_CODE = CurPosition.CurWipSNs.First().WS_CODE,
                LINE_CODE = CurPosition.CurWipSNs.First().LINE_CODE,
                POST_CODE = CurPosition.CurWipSNs.First().POST_CODE,
                OPER_CODE = CurPosition.CurWipSNs.First().OPER_CODE,
                SEGMENT = CurPosition.CurWipSNs.First().SEGMENT,
            };


            CurStep.Message = Biz.L("等待称重数据");
            CurStep.Status = StepStatus.Normal;
@@ -85,6 +65,28 @@
        public ApiAction<SubmitOutput> TryBegin(SubmitInput input)
        {
            var action = new ApiAction<SubmitOutput>(new SubmitOutput());

            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,
                SN = CurPosition.CurSN,
                PKG_TYPE = CurPosition.WorkBatch.WO.ItemInfo?.UNIT,
                ITEM_CODE = CurPosition.CurWipSNs.First().ITEM_CODE,
                QTY = CurPosition.CurWipSNs.Sum(q => q.QTY),
                UNIT = CurPosition.WorkBatch.WO.ItemInfo?.UNIT,
                WORK_ORDER = CurPosition.CurWipSNs.First().WORK_ORDER,
                BATCH_NO = CurPosition.CurWipSNs.First().BATCH_NO,
                ROT_CODE = CurPosition.CurWipSNs.First().ROT_CODE,
                NODE_ID = CurPosition.CurWipSNs.First().NODE_ID,
                NODE_NAME = CurPosition.CurWipSNs.First().NODE_NAME,
                FTY_CODE = CurPosition.CurWipSNs.First().FTY_CODE,
                WS_CODE = CurPosition.CurWipSNs.First().WS_CODE,
                LINE_CODE = CurPosition.CurWipSNs.First().LINE_CODE,
                POST_CODE = CurPosition.CurWipSNs.First().POST_CODE,
                OPER_CODE = CurPosition.CurWipSNs.First().OPER_CODE,
                SEGMENT = CurPosition.CurWipSNs.First().SEGMENT,
            };

            action.LocaleMsg = GetBeginMsg();

@@ -150,6 +152,7 @@

            //记录行为操作记录
            var wipActs = new List<MES_WIP_ACT>();
            var wipVars = new List<MES_WIP_ACT_VAR>();
            foreach (var wipSn in CurPosition.CurWipSNs)
            {
                var wipAct = new MES_WIP_ACT()
@@ -185,21 +188,67 @@
                    PRD_CODE = wipSn.PRD_CODE,
                    ACT_TYPE = NodeAct.ACT_TYPE,
                    ACT_SN = wipSn.SN,
                    ACT_VAR_DIC = CurStep.ActionDic.ToJson(),
                    ACT_RESULT = "Y",
                    ELAPSED_TIME = CurStep.GetElapsedTime().TotalMilliseconds.ToInt64(),
                    TRACE_INFO = $"条码[{CurPosition.CurSN}]称重数据[{CurPkg.WEIGHT} {CurPkg.WEIGHT_UNIT}]保存成功",
                };
                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 _CurPkg = CurPkg.Clone();
            //保存数据
            CurStep.DBSubmitAction = () =>
            {
                var db = CurPosition.GetCommitDB();
                db.Storageable(_wipActs, CurPosition.UserCode).ExecuteCommand();
                db.Storageable(_wipVars, CurPosition.UserCode).ExecuteCommand();
                db.Storageable(_CurPkg, CurPosition.UserCode).ExecuteCommand();
            };