Handle packaging barcodes and improve weighing logic

Rodney Chen

2025-01-02 aecffc1fac016281d4c835fafe23c002906acef5

 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();

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