Add new properties and classes for process and code handling

Rodney Chen

2025-01-02 87422530bec9baf531d2e0715b9c786a4d35667f

 Tiger.Business.MES/WorkAction/InputQty.cs

@@ -69,11 +69,25 @@

            action.LocaleMsg = GetBeginMsg();

            //如果返回成功则认为当前行为可以开始执行，否则返回失败
            CurStep.Message = Biz.L("请输入数量");
            CurStep.Status = StepStatus.Normal;
            action.IsSuccessed = true;
            action.Data.ShortMsg = new("请输入数量", ShortMessage.Types.Success);
            //如果是包装条码则不允许修改数量
            if (MainDB.Queryable<MES_WIP_PKG>().Any(q => q.PARENT_SN == CurPosition.CurSN && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG))
            {
                CurStep.Message = Biz.L("包装条码不允许修改数量");
                CurStep.Status = StepStatus.Error;
                action.IsSuccessed = false;
                action.Data.ShortMsg = new("包装条码不允许修改数量", ShortMessage.Types.Error);
                //action.LocaleMsg = new($"包装条码[{0}]不允许修改数量，请重新扫描正确的条码");
                action.LocaleMsg = new("MES.WorkAction.InputQty.NotAllowPackage", CurPosition.CurSN);
                CurPosition.ResetNode();
            }
            else
            {
                //如果返回成功则认为当前行为可以开始执行，否则返回失败
                CurStep.Message = Biz.L("请输入数量");
                CurStep.Status = StepStatus.Normal;
                action.IsSuccessed = true;
                action.Data.ShortMsg = new("请输入数量", ShortMessage.Types.Success);
            }
            return action;
        }

@@ -114,7 +128,8 @@
                                                                                           .Where(q => !CurPosition.CurWipSNs.Any(sn => sn.ID == q.WIP_ID)).DistinctBy(q => q.WIP_ID).Sum(q => q.QTY);
                    var batchInput = CurPosition.WorkBatch.WoSNs.Where(q => q.BATCH_NO == CurPosition.WorkBatch.Batch.BATCH_NO && BIZ_MES_WO_SN.STATUSs.NotInput.GetValue() < q.STATUS && q.STATUS <= BIZ_MES_WO_SN.STATUSs.Finished.GetValue())
                                                                                               .Where(q => !CurPosition.CurWipSNs.Any(sn => sn.ID == q.WIP_ID)).DistinctBy(q => q.WIP_ID).Sum(q => q.QTY);
                    

      
                    //工单批次投入数量减去报废数量如果大于等于计划数量，则不允许生产
                    if ((NewBatchInputQty = batchInput + newInput) > CurPosition.WorkBatch.Batch.PLAN_QTY)
                    {
@@ -171,8 +186,18 @@
            var action = new ApiAction<SubmitOutput>(new SubmitOutput());
            //记录行为操作记录
            var wipActs = new List<MES_WIP_ACT>();
            var wipVars = new List<MES_WIP_ACT_VAR>();
            foreach (var wipSn in CurPosition.CurWipSNs)
            {
                wipSn.QTY = NewQty;
                foreach (var item in CurPosition.CurWipSNHiss.Where(q => q.WIP_ID == wipSn.ID))
                {
                    item.QTY = NewQty;
                }
                foreach (var item in CurPosition.WorkBatch.WoSNs.Where(q => q.WIP_ID == wipSn.ID))
                {
                    item.QTY = NewQty;
                }
                var wipAct = new MES_WIP_ACT()
                {
                    AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
@@ -206,15 +231,60 @@
                    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}]更新数量为[{NewQty}]保存成功",
                };
                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 wo = CurPosition.WorkBatch.WO.ORDER_NO;
            var batch = CurPosition.WorkBatch.Batch.BATCH_NO;
            var nodeID = NodeAct.NODE_ID;
@@ -233,6 +303,11 @@
                    .SetColumns(q => q.QTY == NewQty)
                    .Where(q => q.WORK_ORDER == wo && q.NODE_ID == nodeID && _wipIDs.Contains(q.WIP_ID))
                    .ExecuteCommand();
                //生产包装记录
                db.Updateable<MES_WIP_PKG>(CurPosition.UserCode)
                    .SetColumns(q => q.QTY == NewQty)
                    .Where(q => q.WORK_ORDER == wo && _wipIDs.Contains(q.ID))
                    .ExecuteCommand();
                //工单表
                db.Updateable<BIZ_MES_WO>(CurPosition.UserCode)
                    .SetColumns(q => q.INPUT_QTY == NewWoInputQty)
@@ -249,6 +324,7 @@
                    .Where(q => q.WORK_ORDER == wo && _wipIDs.Contains(q.WIP_ID))
                    .ExecuteCommand();
                db.Storageable(_wipActs, CurPosition.UserCode).ExecuteCommand();
                db.Storageable(_wipVars, CurPosition.UserCode).ExecuteCommand();
            };

            IsFinished = true;