Handle packaging barcodes and improve weighing logic

Rodney Chen

2025-01-02 aecffc1fac016281d4c835fafe23c002906acef5

Handle packaging barcodes and improve weighing logic

Added logic in InputQty.cs to prevent quantity modification if the SN is a packaging barcode, setting an error message and status. Updated MES_WIP_PKG table during production. Moved CurPkg initialization in Weighing.cs from constructor to TryBegin method, and added a waiting message in the constructor. TryBegin now initializes CurPkg with relevant data if it doesn't exist.

 Tiger.Api/Language.db

Binary files differ

 Tiger.Business.MES/WorkAction/InputQty.cs

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

            action.LocaleMsg = GetBeginMsg();

            //如果是包装条码则不允许修改数量
            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,6 +128,7 @@
                                                                                           .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)
@@ -287,6 +302,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)

 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;
@@ -86,6 +66,28 @@
        {
            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();

            //如果返回成功则认为当前行为可以开始执行，否则返回失败