包装行为增加称重功能

Rodney Chen

2024-08-16 04dcc3ed97efac23ec778dec4a6afddc6cd9aa65

 Tiger.Business.MES/WorkAction/PackingAction.cs

@@ -9,6 +9,8 @@
using Tiger.IBusiness.MES.WorkAction;
using Tiger.Model;
using Tiger.Model.Entitys.MES.Position;
using static Tiger.Model.WMS_ITEM_PKG;
using Tiger.Model.Minsun;

namespace Tiger.Business.MES.WorkAction
{
@@ -30,6 +32,7 @@
        public Dictionary<int, BAS_LABEL_TEMP> LabelDic { get; set; }    = new();
        public List<BAS_LABEL_PV> LabelPV { get; set; } = new();
        public int FinishLevel = 0;
        public bool NeedWeighing { get; set; } = false;
        #endregion Propertys & Variables

        #region Functions
@@ -63,6 +66,8 @@
                LabelDic.Add(code.PKG_LEVEL, label);
            }
            LabelPV = Biz.Db.Queryable<BAS_LABEL_PV>().ToList();
            //获取是否包装完后需要称重
            NeedWeighing = Setting.OPTION_2 == "Y";
            //如果工序上下文中没有包装记录则新建一个，有则获取当前的包装记录
            if (CurPosition.Context.ContainsKey("CurPackage") && !CurPosition.Context["CurPackage"].IsNullOrEmpty())
            {
@@ -194,15 +199,8 @@
                case "Scan":
                    if (CurCmd.IsNullOrEmpty() || CurCmd.ExecCode == "Scan" || (CurCmd.ExecCode == "Print" && CurCmd.PkgLevel == pInput.PkgLevel))
                    {
                        //客户端扫描成功
                        if (pInput.IsFinish)
                        {
                            CurCmd = null;
                            PrintTimes = 0;
                            action = SavePkgData(input, action);
                        }
                        //客户端扫描失败
                        else
                        if (!pInput.IsFinish || pInput.PkgSN.IsNullOrEmpty())
                        {
                            var dtl = PkgRule.Details.First(q => q.PKG_LEVEL == pInput.PkgLevel);
                            action.IsSuccessed = false;
@@ -210,6 +208,19 @@
                            action.LocaleMsg = new("MES.WorkAction.PackingAction.ScanFail", dtl.PKG_LEVEL, dtl.PkgType.PKG_NAME);
                            return action;
                        }
                        //验证当前包装条码是否已经被扫描过
                        if (GetPackageList(CurPkg.Item).Any(q => q.SN == pInput.PkgSN))
                        {
                            var dtl = PkgRule.Details.First(q => q.PKG_LEVEL == pInput.PkgLevel);
                            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);
                            return action;
                        }
                        //客户端扫描成功
                        CurCmd = null;
                        PrintTimes = 0;
                        action = SavePkgData(input, action);
                    }
                    break;
                //Print：打印，打印当前包装层级的标签
@@ -259,7 +270,41 @@
                    {
                        CurCmd = null;
                        PrintTimes = 0;
                        action = End();
                        if (NeedWeighing)
                        {
                            var data = new PackingActionOutput() { PkgInfo = CurPkg };
                            data.ExecCode = "Weighing";
                            data.PkgLevel = CurPkgItem.PKG_LEVEL;
                            CurCmd = data;
                            action.Data.Data = data;
                            //action.LocaleMsg = new($"请把包装[{CurPkgItem.Package.SN}]上称称重");
                            action.LocaleMsg = new("MES.WorkAction.PackingAction.PleaseWeighing", CurPkgItem.Package.SN);
                        }
                        else
                        {
                            action = End();
                        }
                    }
                    break;
                // Complete：完成，完成全部包装后结束行为
                case "Weighing":
                    if (CurCmd.ExecCode == "Weighing")
                    {
                        if (!pInput.WeightInfo.IsNullOrEmpty() && pInput.WeightInfo.Weight > 0)
                        {
                            CurCmd = null;
                            PrintTimes = 0;
                            CurPkgItem.Package.WEIGHT = pInput.WeightInfo.Weight;
                            CurPkgItem.Package.WEIGHT_UNIT = pInput.WeightInfo.Unit;
                            action = End();
                        }
                        else
                        {
                            action.IsSuccessed = false;
                            //action.LocaleMsg = new($"包装[{CurPkgItem.Package.SN}]称重数据异常，请重新上称称重");
                            action.LocaleMsg = new("MES.WorkAction.PackingAction.PleaseWeighingAgain", CurPkgItem.Package.SN);
                            return action;
                        }
                    }
                    break;
                // 手动结束包装，保存暂存的包装数据
@@ -339,28 +384,30 @@
                        PKG_QTY = dtl.PKG_QTY,
                        LABEL_CODE = LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE,
                        IsFinished = true,
                        Package = new()
                        {
                            AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
                            AUTH_PROD = CurPosition.CurLine.LINE_CODE,
                            SN = pInput.PkgSN,
                            PKG_TYPE = dtl.PkgType.PKG_NAME,
                            ITEM_CODE = CurPosition.CurWipSNs.First().ITEM_CODE,
                            QTY = CurPosition.CurWipSNs.First().QTY,
                            UNIT = dtl.PkgType.PKG_NAME,
                            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,
                        }
                    };

                    CurPkgItem.Package = Biz.Db.Queryable<MES_WIP_PKG>().Where(q => q.SN == pInput.PkgSN && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).First() ?? new()
                    {
                        AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
                        AUTH_PROD = CurPosition.CurLine.LINE_CODE,
                        SN = pInput.PkgSN,
                    };
                    CurPkgItem.Package.WIP_ID = CurPosition.CurWipSNs.Count == 1 ? CurPosition.CurWipSNs.First().ID : null;
                    CurPkgItem.Package.PKG_TYPE = dtl.PkgType.PKG_NAME;
                    CurPkgItem.Package.ITEM_CODE = CurPosition.CurWipSNs.First().ITEM_CODE;
                    CurPkgItem.Package.QTY = CurPosition.CurWipSNs.First().QTY;
                    CurPkgItem.Package.UNIT = dtl.PkgType.PKG_NAME;
                    CurPkgItem.Package.WORK_ORDER = CurPosition.CurWipSNs.First().WORK_ORDER;
                    CurPkgItem.Package.BATCH_NO = CurPosition.CurWipSNs.First().BATCH_NO;
                    CurPkgItem.Package.ROT_CODE = CurPosition.CurWipSNs.First().ROT_CODE;
                    CurPkgItem.Package.NODE_ID = CurPosition.CurWipSNs.First().NODE_ID;
                    CurPkgItem.Package.NODE_NAME = CurPosition.CurWipSNs.First().NODE_NAME;
                    CurPkgItem.Package.FTY_CODE = CurPosition.CurWipSNs.First().FTY_CODE;
                    CurPkgItem.Package.WS_CODE = CurPosition.CurWipSNs.First().WS_CODE;
                    CurPkgItem.Package.LINE_CODE = CurPosition.CurWipSNs.First().LINE_CODE;
                    CurPkgItem.Package.POST_CODE = CurPosition.CurWipSNs.First().POST_CODE;
                    CurPkgItem.Package.OPER_CODE = CurPosition.CurWipSNs.First().OPER_CODE;
                    CurPkgItem.Package.SEGMENT = CurPosition.CurWipSNs.First().SEGMENT;
                    FinishLevel++;
                    action = SavePkgData(input, action);
                }
@@ -402,7 +449,7 @@
                        //最外层包装已经完成包装，保存包装数据到数据库
                        else
                        {
                            action = SaveToDB();
                            action = CompletePkg();
                        }
                    }
                    //当前处理的包装层级已经处理完，继续往上保存
@@ -506,29 +553,9 @@
            return list;
        }

        public ApiAction<SubmitOutput> SaveToDB()
        public ApiAction<SubmitOutput> CompletePkg()
        {
            var action = new ApiAction<SubmitOutput>(new SubmitOutput());

            var pkgList = GetPackageList(CurPkg.Item);

            var woSNs = CurPosition.WorkBatch.WoSNs.Where(q => CurPosition.CurWipSNs.Any(w => q.SN == w.SN)).ToList();
            foreach (var woSN in woSNs)
            {
                woSN.TRAY_SN = CurPkg.Item.Package.SN;
                woSN.OUTER_SN = CurPkg.Item.Package.SN;
            }

            //保存数据库
            var db = Biz.Db;
            var dbTran = db.UseTran(() =>
            {
                db.Insertable(pkgList, CurPosition.UserCode).ExecuteCommand();
            });
            if (!dbTran.IsSuccess)
            {
                throw dbTran.ErrorException;
            }

            var data = new PackingActionOutput() { PkgInfo = CurPkg };
            data.ExecCode = "Complete";
@@ -539,10 +566,10 @@
            action.LocaleMsg = new("MES.WorkAction.PackingAction.PackageComplete", CurPkg.Item.PKG_LEVEL, CurPkg.Item.PKG_NAME);

            //手动结束包装则标记行为完成
            if (CurStep.IsNullOrEmpty())
            {
                IsFinished = true;
            }
            //if (CurStep.IsNullOrEmpty())
            //{
            //    IsFinished = true;
            //}

            return action;
        }
@@ -557,49 +584,82 @@

            //记录行为操作记录
            var wipActs = new List<MES_WIP_ACT>();
            foreach (var wipSn in CurPosition.CurWipSNs)
            //不是手动结束包装则保存行为操作记录
            if (!CurStep.IsNullOrEmpty())
            {
                var wipAct = new MES_WIP_ACT()
                {
                    AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
                    AUTH_PROD = CurPosition.CurLine.LINE_CODE,
                    HIS_ID = CurPosition.CurWipSNHiss.First(q => q.SN == wipSn.SN).ID,
                    SN = wipSn.SN,
                    STATUS = wipSn.STATUS,
                    ITEM_CODE = wipSn.ITEM_CODE,
                    WORK_ORDER = wipSn.WORK_ORDER,
                    BATCH_NO = wipSn.BATCH_NO,
                    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,
                    TRAY_SN = wipSn.TRAY_SN,
                    OPERATION_TIME = DateTime.Now,
                    SFTS_CODE = wipSn.SFTS_CODE,
                    SFT_CODE = wipSn.SFT_CODE,
                    PRD_CODE = wipSn.PRD_CODE,
                    ACT_TYPE = NodeAct.ACT_TYPE,
                    ACT_SN = wipSn.SN,
                    ACT_RESULT = "Y",
                    TRACE_INFO = $"产品条码[{string.Join("，", CurPosition.CurSN)}]包装完成",
                };
                wipActs.Add(wipAct);
               foreach (var wipSn in CurPosition.CurWipSNs)
               {
                   var wipAct = new MES_WIP_ACT()
                   {
                       AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
                       AUTH_PROD = CurPosition.CurLine.LINE_CODE,
                       WIP_ID = wipSn.ID,
                       HIS_ID = CurPosition.CurWipSNHiss.First(q => q.SN == wipSn.SN).ID,
                       SN = wipSn.SN,
                       STATUS = wipSn.STATUS,
                       ITEM_CODE = wipSn.ITEM_CODE,
                       WORK_ORDER = wipSn.WORK_ORDER,
                       BATCH_NO = wipSn.BATCH_NO,
                       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,
                       ACT_TYPE = NodeAct.ACT_TYPE,
                       ACT_SN = wipSn.SN,
                       ACT_RESULT = "Y",
                       TRACE_INFO = $"产品条码[{string.Join("，", CurPosition.CurSN)}]包装完成",
                   };
                   wipActs.Add(wipAct);
               }
            }
            //var woSNs = CurPosition.WorkBatch.WoSNs.Where(q => CurPosition.CurWipSNs.Any(w => q.SN == w.SN)).ToList();

            //创建变量克隆对象用于传入DBSubmitAction中保存当前需要暂存的数据值
            var _wipActs = wipActs.Clone();
            var _pkgList = CurPkg.IsFinished ? GetPackageList(CurPkg.Item) : new();
            //保存数据
            CurStep.DBSubmitAction = () =>
            {
                var db = CurPosition.GetCommitDB();
                db.Storageable(wipActs, CurPosition.UserCode).ExecuteCommand();
                //db.Storageable(woSNs, CurPosition.UserCode).ExecuteCommand();
                if (_wipActs.Any())
                {
                   db.Storageable(_wipActs, CurPosition.UserCode).ExecuteCommand();
                }
                if (_pkgList.Any())
                {
                    db.Insertable(_pkgList, CurPosition.UserCode).ExecuteCommand();
                    foreach (var pkg in _pkgList)
                    {
                        //包装信息保存到在制品信息表
                        db.Updateable<MES_WIP_DATA>()
                            .SetColumns(q => q.TRAY_SN == CurPkg.Item.Package.SN)
                            .SetColumns(q => q.INNER_SN == q.CARTON_SN)
                            .SetColumns(q => q.CARTON_SN == CurPkg.Item.Package.SN)
                            .Where(q => q.WORK_ORDER == pkg.WORK_ORDER && q.SN == pkg.SN)
                            .ExecuteCommand();
                        //包装信息保存到工单条码明细表
                        db.Updateable<BIZ_MES_WO_SN>()
                            .SetColumns(q => q.TRAY_SN == CurPkg.Item.Package.SN)
                            .SetColumns(q => q.OUTER_SN == CurPkg.Item.Package.SN)
                            .Where(q => q.WORK_ORDER == pkg.WORK_ORDER && q.SN == pkg.SN)
                            .ExecuteCommand();
                    }
                }
            };

            if (CurPkg.IsFinished)