收货行ID类型修改

YangYuGang

2 天以前 6b821f97b2a82c199113d68054b3e3c93f3443aa

 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)
                    {
@@ -259,6 +274,7 @@
                        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(),
                    };
@@ -287,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)