优化手动结束包装支持打印入库标签

Rodney Chen

2024-10-27 f0c7f4ba26a8bcb4e551c50d6d9468edb542c063

 Tiger.Business.MES/Transaction/Position.cs

@@ -62,6 +62,7 @@
        public WorkBatch CurBatch { get; set; }
        public IWorkBatch WorkBatch => CurBatch;
        public List<MES_WIP_DATA> CurWipSNs { get; set; } = new();
        public List<MES_WIP_DATA> LastWipSNs { get; set; } = new();
        public string CurSN => (CurWipSNs.Any() ? (CurWipSNs.First().TRAY_SN.IsNullOrEmpty() ? CurWipSNs.First().SN : CurWipSNs.First().TRAY_SN) : "");
        public List<MES_WIP_HIS> CurWipSNHiss { get; set; } = new();
        public List<MES_WIP_DFT> CurDefects { get; set; } = new();
@@ -102,7 +103,7 @@
            var action = new ApiAction();
            try
            {
                if (!WoContext.ExistsBatch(input.OrderNo, CurLine.LINE_CODE, batchNo))
                if (!WoContext.ExistsBatch(input.OrderNo, CurLine.LINE_CODE, batchNo, true))
                {
                    var wo = await Biz.Db.Queryable<BIZ_MES_WO>().ByAuth(input.AuthOption).Where(q => q.ORDER_NO == input.OrderNo).FirstAsync();
                    //验证明细是否正确
@@ -117,7 +118,7 @@
                    {
                        action.IsSuccessed = false;
                        //action.LocaleMsg = new($"工单[{0}]状态[{1}]不能生产");
                        action.LocaleMsg = new("MES.Transaction.Position.SelectOrder.StatusException", input.OrderNo, wo.STATUS.GetEnum<BIZ_MES_WO.STATUSs>().GetName());
                        action.LocaleMsg = new("MES.Transaction.Position.SelectOrder.StatusException", input.OrderNo, wo.STATUS.GetEnumDesc<BIZ_MES_WO.STATUSs>());
                        return action;
                    }
                    var batch = await Biz.Db.Queryable<BIZ_MES_WO_BATCH>().ByAuth(input.AuthOption)
@@ -135,7 +136,7 @@
                    {
                        action.IsSuccessed = false;
                        //action.LocaleMsg = new($"工单[{0}]批次[1]状态[{2}]不能生产");
                        action.LocaleMsg = new("MES.Transaction.Position.SelectOrder.BatchStatusException", input.OrderNo, batch.BATCH_NO, batch.STATUS.GetEnum<BIZ_MES_WO_BATCH.STATUSs>().GetName());
                        action.LocaleMsg = new("MES.Transaction.Position.SelectOrder.BatchStatusException", input.OrderNo, batch.BATCH_NO, batch.STATUS.GetEnumDesc<BIZ_MES_WO_BATCH.STATUSs>());
                        return action;
                    }
                    var wb = new WorkBatch(input.OrderNo).Init(CurLine.LINE_CODE);
@@ -410,24 +411,24 @@
            //保存工步的数据库提交操作到提交操作列表
            if (!Steps.IsNullOrEmpty())
            {
               var commitList = new List<Action>();
               foreach (var step in Steps.OrderBy(q => q.Sequence))
               {
                   commitList.Add(step.DBSubmitAction);
               }
               //记录工序耗时
               commitList.Add(() =>
               {
                   EndAt = DateTime.Now;
                   var ids = CurWipSNHiss.Select(q => q.ID).ToList();
                   GetCommitDB().Updateable<MES_WIP_HIS>().SetColumns(q => q.ELAPSED_TIME == ElapsedTime.TotalMilliseconds.ToInt64()).Where(q => ids.Contains(q.ID)).ExecuteCommand();
               });
                var commitList = new List<Action>();
                foreach (var step in Steps.OrderBy(q => q.Sequence))
                {
                    commitList.Add(step.DBSubmitAction);
                }
                //记录工序耗时
                var ids = CurWipSNHiss.Select(q => q.ID).ToList().Clone();
                commitList.Add(() =>
                {
                    EndAt = DateTime.Now;
                    GetCommitDB().Updateable<MES_WIP_HIS>().SetColumns(q => q.ELAPSED_TIME == ElapsedTime.TotalMilliseconds.ToInt64()).Where(q => ids.Contains(q.ID)).ExecuteCommand();
                });
                //增加附加的保存内容
                if (!appendToSave.IsNullOrEmpty())
                {
                    commitList.Add(appendToSave);
                }
               DBCommitList.Add(CurSN, commitList);
                DBCommitList.Add(CurSN, commitList);
            }
            else
            {
@@ -479,6 +480,9 @@
                    throw dbTran.ErrorException;
                }
            }
            //记录最后成功过站的条码
            LastWipSNs.Clear();
            LastWipSNs.AddRange(CurWipSNs);
        }

        protected void DoSaveToDB()
@@ -538,7 +542,7 @@
        /// <param name="labelPVs">过程变量列表</param>
        /// <param name="lv">标签模板变量</param>
        /// <returns></returns>
        public string GetPrintProcessValue(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_VAR lv, List<BAS_LABEL_VAR> lvars, IWorkAction action)
        public string GetPrintProcessValue(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_VAR lv, List<BAS_LABEL_VAR> lvars, IWorkAction curAction)
        {
            var pv = labelPVs.FirstOrDefault(q => q.VAR_CODE == lv.VAR_VALUE);
            if (!pv.IsNullOrEmpty())
@@ -552,57 +556,91 @@
                                case "GetSN":
                                    return CurSN;
                                case "GetBAS_ITEM":
                                    return WorkBatch.Product.CUST_PROD_CODE;
                                    return GetLabelVarWo(lv, WorkBatch.Product.CUST_PROD_CODE);
                                case "GetItemName":
                                    return GetLabelVarWo(lv, WorkBatch.Product.ITEM_NAME);
                                case "GetCustomer":
                                    return WorkBatch.Batch.Customer.ToJson();
                                    return GetLabelVarWo(lv, WorkBatch.Batch.Customer.ToJson());
                                case "GetSalesOrder":
                                    return GetLabelVarWo(lv, WorkBatch.WO.SALES_ORDER);
                                case "GetPackNumber":
                                    return GetLabelVarWo(lv, WorkBatch.WO.ORDER_NO);
                                case "GetBoxQR":
                                    return action is PackingAction ? GetBoxCode(lvars, action as PackingAction) : "";
                                    return curAction is PackingAction ? GetBoxCode(lvars, curAction as PackingAction) : "";
                                case "GetCardQR":
                                    return action is PackingAction ? GetCardCode(lvars, action as PackingAction) : "";
                                    return curAction is PackingAction ? GetCardOrBoxQR(GetCardCode(lvars), lvars, curAction as PackingAction) : "";
                                case "GetCardSN":
                                    List<string> minPkgList = new List<string>();
                                    var _pkaction = action is PackingAction ? action as PackingAction : null;
                                    var _pkaction = curAction is PackingAction ? curAction as PackingAction : null;
                                    if (_pkaction != null)
                                    {
                                        minPkgList = GetMinPkgList(_pkaction);
                                    }
                                    return string.Join("\r\n", minPkgList);
                                case "GetDescription":
                                    return WorkBatch.Product.ITEM_DESC;
                                    return GetLabelVarWo(lv, WorkBatch.Product.ITEM_DESC);
                                case "GetFengZ":
                                    return WorkBatch.Product.ExtInfo.Packaging; 
                                    return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo.Packaging);
                                case "GetPAndO":
                                    return WorkBatch.WO.SALES_CONTRACT;
                                    return GetLabelVarWo(lv, WorkBatch.WO.SALES_CONTRACT);
                                case "GetLTD":
                                    return WorkBatch.Batch.Customer.SHORT_NAME;
                                    return GetLabelVarWo(lv, WorkBatch.WO.Customer?.CUST_NAME_CN);
                                case "GetHWDate":
                                    List<string> list = new List<string>();
                                    var _action = action is PackingAction ? action as PackingAction : null;
                                    if (_action!=null)
                                    var _action = curAction is PackingAction ? curAction as PackingAction : null;
                                    if (_action != null)
                                    {
                                        list = GetMinPkgList(_action);
                                    }
                                    return GetHuaWeiWeek(WorkBatch.Batch.ORDER_NO, list);
                                case "GetQty":
                                    List<string> qtylist = new List<string>();
                                    var _qtyAction = action is PackingAction ? action as PackingAction : null;
                                    var _qtyAction = curAction is PackingAction ? curAction as PackingAction : null;
                                    if (_qtyAction != null)
                                    {
                                        qtylist = GetMinPkgList(_qtyAction);
                                    }
                                    return $"{qtylist.Count}PCS";
                                case "GetModel":
                                    return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo.Model);
                                    return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo?.Model);
                                case "GetInput":
                                    return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo.Input);
                                    return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo?.Input);
                                case "GetOutput":
                                    return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo.OutPut);
                                    return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo?.OutPut);
                                case "GetPower":
                                    return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo.Power);
                                    return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo?.Power);
                                case "GetAccuracy":
                                    return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo.Accuracy);
                                    return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo?.Accuracy);
                                case "GetVarByWo":
                                    return GetLabelVarWo(lv, "");
                                case "GetLOTNO":
                                    string _lotnos = "";
                                    var _orderAction = curAction is PackingAction ? curAction as PackingAction : null;
                                    if (_orderAction != null)
                                    {
                                        var snList = _orderAction.GetMinPackageList(_orderAction.CurPkg.Item).Select(q => q.FLOW_SN).ToList();
                                        if (!snList.Any())
                                        {
                                            snList.Add(_orderAction.CurPkg.CustSN.FLOW_SN);
                                        }
                                        _lotnos = string.Join(",", Biz.Db.Queryable<MES_CUST_SN>()
                                            .Where((q) => snList.Contains(q.FLOW_SN))
                                            .Select((q) => q.WORK_ORDER).Distinct().ToList());
                                        return _lotnos;
                                    }
                                    return "";
                                case "GetNOTES":
                                    return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo?.Remark); 
                                case "GetXH":
                                    return GetCardCode(lvars);
                                case "GetCardNo":
                                    return "";
                                case "GetCardTotal":
                                    return "";
                                case "GetModelSpec": //Model+空格+SPEC,
                                    return GetLabelVarWo(lv, $"{WorkBatch.Product.ExtInfo?.Model} {WorkBatch.Product.SPEC}");
                                case "GetDATE":
                                    return GetLabelVarWo(lv, $"{DateTime.Now.ToString("yyyy/MM/dd")}");
                                default:
                                    return "";
                            }
@@ -665,7 +703,7 @@
            }
            else
            {
                result = value.IsNullOrEmpty() ? (labelVarwos.Count > 0 ? labelVarwos.First().DEFAULT_VALUE : "") : value;
                result = value.IsNullOrEmpty() ? (labelVarwos.Count > 0 ? labelVarwos.First(q => q.WORK_ORDER.IsNullOrEmpty()).DEFAULT_VALUE : "") : value;
            }
            return result;
        }
@@ -675,7 +713,8 @@
        /// </summary>
        /// <param name="action"></param>
        /// <returns></returns>
        private List<string> GetMinPkgList(PackingAction action) {
        private List<string> GetMinPkgList(PackingAction action)
        {
            List<string> list = new List<string>();
            if (action.CurPkg.Item.PKG_LEVEL == 1)
            {
@@ -705,10 +744,10 @@
        /// <param name="lvars"></param>
        /// <param name="action"></param>
        /// <returns></returns>
        private string GetCardCode(List<BAS_LABEL_VAR> lvars, PackingAction action)
        private string GetCardCode(List<BAS_LABEL_VAR> lvars)
        {
            var cardCode = Biz.CodeRule["CartonNo"]?.Generate("B", $"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "" ;
            return GetCardOrBoxQR(cardCode, lvars, action);
            var cardCode = Biz.CodeRule["CartonNo"]?.Generate("B", $"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "";
            return cardCode;
        }

        /// <summary>
@@ -724,17 +763,16 @@
            var wo = WorkBatch.Batch.ORDER_NO;
            var snList = string.Join("\r\n", minPkgList);
            if (snList.IsNullOrEmpty()) { snList = $"{CurSN}"; }
            var _sn = minPkgList.FirstOrDefault() ?? CurSN;
            var itemCode = Biz.Db.Queryable<MES_CUST_SN>().Where(q => q.FLOW_SN == _sn || q.CUST_SN == _sn).First()?.ITEM_CODE;
            var itemCode = action.CurPkg.CustSN?.ITEM_CODE;
            var weight = action.CurPkg.WeightInfo.Weight;
            var unit = action.CurPkg.WeightInfo.Unit.ToUpper();
            var model = WorkBatch.Product.ExtInfo.Model;
            var Input = WorkBatch.Product.ExtInfo.Input;
            var OutPut = WorkBatch.Product.ExtInfo.OutPut;
            var Power = WorkBatch.Product.ExtInfo.Power;
            var Accuracy = WorkBatch.Product.ExtInfo.Accuracy;
            var Display = WorkBatch.Product.ExtInfo.Display;
            var Remark = WorkBatch.Product.ExtInfo.Remark;
            var model = WorkBatch.Product.ExtInfo?.Model;
            var Input = WorkBatch.Product.ExtInfo?.Input;
            var OutPut = WorkBatch.Product.ExtInfo?.OutPut;
            var Power = WorkBatch.Product.ExtInfo?.Power;
            var Accuracy = WorkBatch.Product.ExtInfo?.Accuracy;
            var Display = WorkBatch.Product.ExtInfo?.Display;
            var Remark = WorkBatch.Product.ExtInfo?.Remark;

            return $"{code}|{itemCode}|{wo}|\r\n{snList}|{weight}{unit}|型号:{model},输入:{Input},显示:{Display},输出:{OutPut},电源:{Power},精度:{Accuracy},备注:{Remark}";
        }
@@ -782,6 +820,52 @@
            }
        }
        #endregion
        #region 条码规则方法
        /// <summary>
        /// 获取根据条码规则生成条码
        /// </summary>
        /// <param name="ruleCode"></param>
        /// <param name="curAction"></param>
        /// <returns></returns>
        public string GenerateSN(string ruleCode, IWorkAction curAction)
        {
            var rule = Biz.CodeRule[ruleCode ?? ""];
            if (!rule.IsNullOrEmpty())
            {
                switch (rule.RULE_CODE)
                {
                    case "WhiteBoxNo":
                        return rule.Generate("W", $"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "";
                    case "CartonNo":
                        return rule.Generate("B", $"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "";
                    default:
                        return rule.Generate().Data.ToString() ?? "";
                }
            }
            return "";
        }
        #endregion
        #region 包装专用方法
        /// <summary>
        /// 根据传入的包装对象返回所有的包装实体列表
        /// </summary>
        /// <param name="parent"></param>
        /// <returns></returns>
        public List<MES_WIP_PKG> GetPackageList(WipPkgItem parent)
        {
            List<MES_WIP_PKG> list = new();
            if (!parent.Package.IsNullOrEmpty())
            {
                list.Add(parent.Package);
            }
            foreach (var item in parent.Items)
            {
                item.Package.PARENT_SN = parent.Package?.SN;
                list.AddRange(GetPackageList(item));
            }
            return list;
        }
        #endregion
        #endregion Functions

        public override bool Close(bool needSaveHistoryLog = false)