包装行为增加称重功能

Rodney Chen

2024-08-16 04dcc3ed97efac23ec778dec4a6afddc6cd9aa65

包装行为增加称重功能

 Tiger.Api/Language.db

Binary files differ

 Tiger.Business.MES/Transaction/CollectNode.cs

@@ -280,6 +280,7 @@
                            {
                                AUTH_ORG = wipSN.AUTH_ORG,
                                AUTH_PROD = wipSN.LINE_CODE,
                                WIP_ID = wipSN.ID,
                                SN = wipSN.SN,
                                STATUS = MES_WIP_DFT.STATUSs.WaitHandle.GetValue(),
                                ITEM_CODE = wipSN.ITEM_CODE,

 Tiger.Business.MES/Transaction/PackingNode.cs

@@ -311,6 +311,7 @@
                            {
                                AUTH_ORG = wipSN.AUTH_ORG,
                                AUTH_PROD = wipSN.LINE_CODE,
                                WIP_ID = wipSN.ID,
                                SN = wipSN.SN,
                                STATUS = MES_WIP_DFT.STATUSs.WaitHandle.GetValue(),
                                ITEM_CODE = wipSN.ITEM_CODE,

 Tiger.Business.MES/WorkAction/PackingAction.cs

@@ -32,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
@@ -65,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())
            {
@@ -267,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;
                // 手动结束包装，保存暂存的包装数据
@@ -529,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;
        }
@@ -547,45 +584,49 @@

            //记录行为操作记录
            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,
                    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);
                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);
                }
            }

            //创建变量克隆对象用于传入DBSubmitAction中保存当前需要暂存的数据值
@@ -595,7 +636,10 @@
            CurStep.DBSubmitAction = () =>
            {
                var db = CurPosition.GetCommitDB();
                db.Storageable(_wipActs, CurPosition.UserCode).ExecuteCommand();
                if (_wipActs.Any())
                {
                    db.Storageable(_wipActs, CurPosition.UserCode).ExecuteCommand();
                }
                if (_pkgList.Any())
                {
                    db.Insertable(_pkgList, CurPosition.UserCode).ExecuteCommand();

 Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs

@@ -107,7 +107,8 @@
        /// 包装行为当前执行的操作代码，包括：<br/>
        /// Scan：扫码，扫描当前包装层级的条码<br/>
        /// Print：打印，打印当前包装层级的标签<br/>
        /// Complete：完成，完成全部包装后结束行为<br/>
        /// Complete：完成，完成全部包装<br/>
        /// Weighing：称重，完成包装后对整个包装成称重<br/>
        /// </summary>
        public string ExecCode { get; set; }
        /// <summary>
@@ -122,6 +123,10 @@
        /// 当前操作的包装层级的标签条码
        /// </summary>
        public string PkgSN { get; set; }
        /// <summary>
        /// 当前操作的包装层级的重量信息
        /// </summary>
        public WeightInfo WeightInfo { get; set; }
    }

    public class PackingActionOutput
@@ -132,6 +137,7 @@
        /// Scan：扫码，扫描当前包装层级的条码<br/>
        /// Print：打印，打印当前包装层级的标签<br/>
        /// Complete：完成，已保存包装数据<br/>
        /// Weighing：称重，完成包装后对整个包装成称重<br/>
        /// </summary>
        public string ExecCode { get; set; }
        /// <summary>