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

Rodney Chen

7 天以前 756e6c531d49a4565e47949120cb33bae431566e

 Tiger.Business.MES/WorkAction/YadaWoReport.cs

@@ -16,13 +16,14 @@
    {
        #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; }
        public MES_WO_NODE_ACT NodeAct { get; set; }
        public MES_WO_ACTION Setting { get; set; }
        #endregion
        private MES_WIP_PKG CurPkg;

        #endregion Propertys & Variables

        #region Functions
@@ -33,35 +34,16 @@
        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()
            {
                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.Message = Biz.L("生产报工");
            CurStep.Status = StepStatus.Normal;
        }

@@ -71,8 +53,8 @@
        /// <returns></returns>
        public Locale GetBeginMsg()
        {
            var msg = new Locale("MES.WorkAction.Weighing.BeginMsg", CurPosition.CurSN);
            //var msg = new Locale($"请把产品[{CurPosition.CurSN}]上称称重");
            var msg = new Locale("MES.WorkAction.YadaWoReport.BeginMsg", CurPosition.WorkBatch.WO.ORDER_NO);
            //var msg = new Locale($"工单[{0}]生产报工");
            return msg;
        }

@@ -87,10 +69,10 @@
            action.LocaleMsg = GetBeginMsg();

            //如果返回成功则认为当前行为可以开始执行，否则返回失败
            CurStep.Message = Biz.L("称重开始");
            CurStep.Message = Biz.L("开始生产报工");
            CurStep.Status = StepStatus.Normal;
            action.IsSuccessed = true;
            action.Data.ShortMsg = new("称重开始", ShortMessage.Types.Success);
            action.Data.ShortMsg = new("开始生产报工", ShortMessage.Types.Success);
            return action;
        }

@@ -102,7 +84,7 @@
        {
            var action = new ApiAction<SubmitOutput>(new SubmitOutput());

            action = SaveWeightInfo(input, action);
            action = ReportToERP(input, action);
            //上料数据保存失败
            if (!action.IsSuccessed)
            {
@@ -119,21 +101,20 @@
            return action;
        }

        public ApiAction<SubmitOutput> SaveWeightInfo(SubmitInput input, ApiAction<SubmitOutput> action)
        public ApiAction<SubmitOutput> ReportToERP(SubmitInput input, ApiAction<SubmitOutput> action)
        {
            try
            {
                var wInput = input?.Data?.JsonToObject<WeightInfo>();
                CurPkg.WEIGHT = wInput.Weight;
                CurPkg.WEIGHT_UNIT = wInput.Unit;
               

            }
            catch (System.Exception ex)
            {
                CurStep.Message = Biz.L("称重异常");
                CurStep.Message = Biz.L("生产报工异常");
                CurStep.Status = StepStatus.Error;
                action.Data.ShortMsg = new("称重异常", ShortMessage.Types.Error);
                action.CatchExceptionWithLog(ex, $"称重行为：条码[{CurPosition.CurSN}]称重数据[{input?.Data?.ToString()}]保存异常");
                action.LocaleMsg = new("MES.WorkAction.Weighing.SaveWeightInfoException", CurPosition.CurSN, input?.Data.ToString());
                action.Data.ShortMsg = new("生产报工异常", ShortMessage.Types.Error);
                action.CatchExceptionWithLog(ex, $"生产报工行为：工单[{CurPosition.WorkBatch.WO.ORDER_NO}]生产报工异常");
                action.LocaleMsg = new("MES.WorkAction.YadaWoReport.ReportToERPException", CurPosition.WorkBatch.WO.ORDER_NO);
            }
            return action;
        }
@@ -148,6 +129,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()
@@ -183,30 +165,75 @@
                    PRD_CODE = wipSn.PRD_CODE,
                    ACT_TYPE = NodeAct.ACT_TYPE,
                    ACT_SN = wipSn.SN,
                    ACT_VAR_DIC = CurStep.ActionDic.ToJson(),
                    ACT_RESULT = "Y",
                    ACT_VALUE_1 = "报公数据",
                    ELAPSED_TIME = CurStep.GetElapsedTime().TotalMilliseconds.ToInt64(),
                    TRACE_INFO = $"条码[{CurPosition.CurSN}]称重数据[{CurPkg.WEIGHT} {CurPkg.WEIGHT_UNIT}]保存成功",
                    TRACE_INFO = $"工单[{CurPosition.WorkBatch.WO.ORDER_NO}]生产报工成功",
                };
                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 _CurPkg = CurPkg.Clone();
            var _wipVars = wipVars.Clone();
            //保存数据
            CurStep.DBSubmitAction = () =>
            {
                var db = CurPosition.GetCommitDB();
                db.Storageable(_wipActs, CurPosition.UserCode).ExecuteCommand();
                db.Storageable(_CurPkg, CurPosition.UserCode).ExecuteCommand();
                db.Storageable(_wipVars, CurPosition.UserCode).ExecuteCommand();
            };

            IsFinished = true;
            CurStep.Message = Biz.L("称重完成");
            CurStep.Message = Biz.L("生产报工完成");
            CurStep.Status = StepStatus.Finished;
            action.Data.ShortMsg = new("称重完成", ShortMessage.Types.Success);
            //action.LocaleMsg = new($"条码[{CurPosition.CurSN}]称重数据[{CurPkg.WEIGHT} {CurPkg.WEIGHT_UNIT}]保存成功");
            action.LocaleMsg = new("MES.WorkAction.Weighing.SaveSuccess", CurPosition.CurSN, CurPkg.WEIGHT, CurPkg.WEIGHT_UNIT);
            action.Data.ShortMsg = new("生产报工完成", ShortMessage.Types.Success);
            //action.LocaleMsg = new($"工单[{0}]生产报工成功");
            action.LocaleMsg = new("MES.WorkAction.YadaWoReport.SaveSuccess", CurPosition.WorkBatch.WO.ORDER_NO);
            return action;
        }