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

Ben Lin

2024-10-11 df3b96fa372f3e7bac5867fdec643f2e931e32a7

 Tiger.Business.MES/WorkAction/PackingAction.cs

@@ -1,4 +1,5 @@
using Rhea.Common;
using Microsoft.CodeAnalysis.Differencing;
using Rhea.Common;
using SqlSugar;
using System;
using System.Collections.Generic;
@@ -218,6 +219,7 @@
                CurCmd = data;
                PrintTimes++;
                CurStep?.SetStatusMessage(StepStatus.Normal, Biz.L("打印标签"));
                action.IsSuccessed = true;
                action.Data.Data = data;
                action.Data.ShortMsg = new("打印标签", ShortMessage.Types.Normal);
                //action.LocaleMsg = new Locale($"开始第{PrintTimes}次打印第{min.PKG_LEVEL}层包装[{min.PkgType.PKG_NAME}]的标签[{LabelDic[min.PKG_LEVEL]?.LABEL_CODE}: {LabelDic[min.PKG_LEVEL].LABEL_NAME}]");
@@ -225,7 +227,7 @@
            }

            //如果返回成功则认为当前行为可以开始执行，否则返回失败
            action.IsSuccessed = true;
            //action.IsSuccessed = true;
            return action;
        }

@@ -253,6 +255,7 @@
                            action.IsSuccessed = false;
                            //action.LocaleMsg = new($"条码扫描失败，请重新扫描第{dtl.PKG_LEVEL}层包装[{dtl.PkgType.PKG_NAME}]的标签条码");
                            action.LocaleMsg = new("MES.WorkAction.PackingAction.ScanFail", dtl.PKG_LEVEL, dtl.PkgType.PKG_NAME);
                            CurPosition.ResetNode();
                            return action;
                        }
                        //验证当前包装条码是否已经被扫描过
@@ -264,6 +267,7 @@
                            action.IsSuccessed = false;
                            //action.LocaleMsg = new($"条码[{pInput.PkgSN}]无需重复扫描，请扫描第{dtl.PKG_LEVEL}层包装[{dtl.PkgType.PKG_NAME}]的标签条码");
                            action.LocaleMsg = new("MES.WorkAction.PackingAction.ScanRepeat", pInput.PkgSN, dtl.PKG_LEVEL, dtl.PkgType.PKG_NAME);
                            CurPosition.ResetNode();
                            return action;
                        }
                        //客户端扫描成功
@@ -890,10 +894,13 @@
            else
            {
                var _pkgList = CurPkg.IsFinished ? GetPackageList(CurPkg.Item) : new();
               
                //最外层包装已经完成包装，则把工序中暂存标记设为false，统一提交包装内产品的过站记录
                CurPosition.NeedTemporaryStoreDBCommitAction = false;
                //保存数据
                var db = Biz.Db;
                var dbTran = db.UseTran(() =>
                CurPosition.SaveStepsCommitActionToDB(() =>
                {
                    var db = CurPosition.GetCommitDB();
                    if (_pkgList.Any())
                    {
                        db.Storageable(_pkgList, CurPosition.UserCode).ExecuteCommand();
@@ -915,11 +922,6 @@
                        }
                    }
                });
                if (!dbTran.IsSuccess)
                {
                    //抛出异常
                    throw dbTran.ErrorException;
                }
            }

            if (CurPkg.IsFinished)