优化了三码合一行为

Rodney Chen

2024-09-04 b2a011edd5bf1abb316900cfd041ae0f888f9dc8

优化了三码合一行为

 Tiger.Api/Language.db

Binary files differ

 Tiger.Business.MES/Transaction/CollectNode.cs

@@ -63,7 +63,7 @@
                    else
                    {
                        var wosns = Biz.Db.Queryable<BIZ_MES_WO_BATCH, BIZ_MES_WO_SN>((q, s) => new JoinQueryInfos(JoinType.Inner, q.ORDER_NO == s.WORK_ORDER))
                                                        .ByAuth(input.AuthOption).Where((q, s) => s.SN == input.SN || s.TRAY_SN == input.SN).Select((q, s) => new { Batch = q, SN = s }).ToList();
                                                        .ByAuth(input.AuthOption).Where((q, s) => s.SN == input.SN || s.FLOW_SN == input.SN || s.TRAY_SN == input.SN).Select((q, s) => new { Batch = q, SN = s }).ToList();

                        //查找到条码已绑定的工单
                        if (!wosns.IsNullOrEmpty())

 Tiger.Business.MES/Transaction/PackingNode.cs

@@ -86,7 +86,7 @@
                        else
                        {
                            var wosns = Biz.Db.Queryable<BIZ_MES_WO_BATCH, BIZ_MES_WO_SN>((q, s) => new JoinQueryInfos(JoinType.Inner, q.ORDER_NO == s.WORK_ORDER))
                                                        .ByAuth(input.AuthOption).Where((q, s) => s.SN == input.SN || s.TRAY_SN == input.SN).Select((q, s) => new { Batch = q, SN = s }).ToList();
                                                        .ByAuth(input.AuthOption).Where((q, s) => s.SN == input.SN || s.FLOW_SN == input.SN || s.TRAY_SN == input.SN).Select((q, s) => new { Batch = q, SN = s }).ToList();
                                                        
                            //查找到条码已绑定的工单
                            if (!wosns.IsNullOrEmpty())

 Tiger.Business.MES/Transaction/TestNode.cs

@@ -64,7 +64,7 @@
                    else
                    {
                        var wosns = Biz.Db.Queryable<BIZ_MES_WO_BATCH, BIZ_MES_WO_SN>((q, s) => new JoinQueryInfos(JoinType.Inner, q.ORDER_NO == s.WORK_ORDER))
                                                        .ByAuth(input.AuthOption).Where((q, s) => s.SN == input.SN || s.TRAY_SN == input.SN).Select((q, s) => new { Batch = q, SN = s }).ToList();
                                                        .ByAuth(input.AuthOption).Where((q, s) => s.SN == input.SN || s.FLOW_SN == input.SN || s.TRAY_SN == input.SN).Select((q, s) => new { Batch = q, SN = s }).ToList();

                        //查找到条码已绑定的工单
                        if (!wosns.IsNullOrEmpty())

 Tiger.Business.MES/WorkAction/ThreeInOne.cs

@@ -9,6 +9,7 @@
using Tiger.IBusiness.MES.WorkAction;
using Tiger.Model;
using Tiger.Model.Entitys.MES.Position;
using Tiger.Model.MES.Yada;

namespace Tiger.Business.MES.WorkAction
{
@@ -25,6 +26,7 @@
        public MES_CUST_SN CurCSN  { get; set; }
        public BAS_LABEL_TEMP Label { get; set; }
        public List<BAS_LABEL_PV> LabelPV { get; set; }
        public List<mes_MOPickList> MoPickList { get; set; }
        #endregion Propertys & Variables

        #region Functions
@@ -43,6 +45,7 @@

            Label = Biz.Db.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == setting.LABEL_CODE).IncludesAllFirstLayer().First();
            LabelPV = Biz.Db.Queryable<BAS_LABEL_PV>().ToList();
            MoPickList = Biz.DataSource["YadaU9C"].Client.Queryable<mes_MOPickList>().Where(q => q.MoDocNo == CurPosition.WorkBatch.WO.ORDER_NO).ToList();
        }

        /// <summary>
@@ -84,7 +87,8 @@
            //厂内条码已绑定客户条码，直接结束行为
            if (!CurCSN.IsNullOrEmpty())
            {
                if (CurCSN.WORK_ORDER == CurPosition.WorkBatch.WO.ORDER_NO)
                //客户条码已绑定当前工单或者其批次属于当前工单上料物料的推荐批次
                if (CurCSN.WORK_ORDER == CurPosition.WorkBatch.WO.ORDER_NO || MoPickList.Any(q => q.Code == CurCSN.ITEM_CODE && q.SuggestedBatch == CurCSN.WORK_ORDER))
                {
                    CurCSN.WORK_ORDER = CurPosition.WorkBatch.WO.ORDER_NO;
                    CurCSN.ITEM_CODE = CurPosition.WorkBatch.WO.ITEM_CODE;
@@ -98,7 +102,24 @@
                }
                else
                {

                    action.Data.Data = new
                    {
                        NeedPrint = false,
                        NeedScan = false,
                        Label = "",
                    };
                    CurStep.Message = Biz.L("投料错误");
                    CurStep.Status = StepStatus.Error;
                    action.Data.ShortMsg = new("投料错误", ShortMessage.Types.Failed);
                    action.IsSuccessed = false;
                    //action.LocaleMsg = new($"产品的客户条码[{0}]属于工单[{1}]不适用于当前工单[{2}]的生产");
                    action.LocaleMsg = new("MES.WorkAction.ThreeInOne.InputSnError", CurCSN.CUST_SN, CurCSN.WORK_ORDER, CurPosition.WorkBatch.WO.ORDER_NO);
                    //如果行为设置为出错需要重置工序操作
                    if (NodeAct.NEED_RESET == "Y")
                    {
                        CurPosition.ResetNode();
                    }
                    return action;
                }
            }
            //厂内条码未绑定客户条码
@@ -209,8 +230,20 @@

            //记录行为操作记录
            var wipActs = new List<MES_WIP_ACT>();
            var woSns = new List<BIZ_MES_WO_SN>();
            var snHiss = new List<MES_WIP_HIS>();
            foreach (var wipSn in CurPosition.CurWipSNs)
            {
                //更新在制品信息SN为客户条码
                wipSn.SN = CurCSN.CUST_SN;
                //更新在制品信息历史得SN为客户条码
                var his = CurPosition.CurWipSNHiss.First(q => q.WIP_ID == wipSn.ID);
                his.SN = CurCSN.CUST_SN;
                snHiss.Add(his);
                //更新工单条码表的
                var woSn = CurPosition.WorkBatch.WoSNs.First(q => q.WIP_ID == wipSn.ID);
                woSn.SN = CurCSN.CUST_SN;
                woSns.Add(woSn);
                var wipAct = new MES_WIP_ACT()
                {
                    AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
@@ -253,12 +286,18 @@
            }

            //创建变量克隆对象用于传入DBSubmitAction中保存当前需要暂存的数据值
            var _wipSns = CurPosition.CurWipSNs.Clone();
            var _snHiss = snHiss.Clone();
            var _woSns = woSns.Clone();
            var _wipActs = wipActs.Clone();
            var _CurCSN = CurCSN.Clone();
            //保存数据
            CurStep.DBSubmitAction = () =>
            {
                var db = CurPosition.GetCommitDB();
                db.Storageable(_wipSns, CurPosition.UserCode).ExecuteCommand();
                db.Storageable(_snHiss, CurPosition.UserCode).ExecuteCommand();
                db.Storageable(_woSns, CurPosition.UserCode).ExecuteCommand();
                db.Storageable(_wipActs, CurPosition.UserCode).ExecuteCommand();
                db.Storageable(_CurCSN, CurPosition.UserCode).ExecuteCommand();
            };