优化三码合一行为，增加包装工单首站投入验证行为

Rodney Chen

2024-09-23 420ec0dec8cd0c17eb18ce6ecd5d03eed0266541

优化三码合一行为，增加包装工单首站投入验证行为

 Tiger.Api/Language.db

Binary files differ

 Tiger.Business.MES/WorkAction/PackageInputCheck.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,273 @@
using Rhea.Common;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Tiger.IBusiness;
using Tiger.IBusiness.MES.WorkAction;
using Tiger.Model;
using Tiger.Model.Entitys.MES.Position;
using Tiger.Model.MES.Yada;

namespace Tiger.Business.MES.WorkAction
{
    public class PackageInputCheck : IPackageInputCheck
    {
        #region Propertys & Variables
        #region å›ºå®šå†™æ³•ï¼Œå·¥åºä¸­çš„必要信息
        public bool IsFinished { get; set; } = false;
        public IWorkStep CurStep { get; set; }
        public IPosition CurPosition { get; set; }
        public MES_WO_NODE_ACT NodeAct { get; set; }
        public MES_WO_ACTION Setting { get; set; }
        #endregion
        public MES_CUST_SN FlowCSN  { get; set; }
        public BAS_LABEL_TEMP Label { get; set; }
        public List<BAS_LABEL_PV> LabelPV { get; set; }
        public List<mes_MOPickList> MoPickList { get; set; }
        public BAS_ITEM_CUST CustInfo { get; set; }
        #endregion Propertys & Variables

        #region Functions
        /// <summary>
        /// åˆå§‹åŒ–工序行为
        /// </summary>
        /// <returns></returns>
        public void Init(IWorkStep curStep, IPosition position, MES_WO_NODE_ACT nodeAct, MES_WO_ACTION setting)
        {
            #region å›ºå®šå†™æ³•ï¼Œç»™é»˜è®¤å˜é‡èµ‹å€¼
            CurStep = curStep;
            CurPosition = position;
            NodeAct = nodeAct;
            Setting = setting;
            #endregion

            //获取打印模板
            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();

            //获取当前产品在当前客户的关系
            CustInfo = Biz.Db.Queryable<BAS_ITEM_CUST>().Where(q => q.ITEM_ID == CurPosition.WorkBatch.WO.ItemInfo.ID && q.CUST_CODE == CurPosition.WorkBatch.WO.CUST_CODE).First();

            CurStep.Message = Biz.L("扫描厂内条码或客户条码");
            CurStep.Status = StepStatus.Normal;
        }

        /// <summary>
        /// èŽ·å–行为开始的提示信息
        /// </summary>
        /// <returns></returns>
        public Locale GetBeginMsg()
        {
            var msg = new Locale("MES.WorkAction.PackageInputCheck.BeginMsg", CurPosition.CurSN, CurPosition.WorkBatch.WO.ORDER_NO);
            //var msg = new Locale($"开始检查条码[{0}]是否可以在工单[{1}]投料生产");
            return msg;
        }

        /// <summary>
        /// å°è¯•å¼€å§‹æ‰§è¡Œå·¥åºè¡Œä¸º
        /// </summary>
        /// <returns></returns>
        public ApiAction<SubmitOutput> TryBegin(SubmitInput input)
        {
            var action = Submit(input);

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

        /// <summary>
        /// å·¥åºè¡Œä¸ºæäº¤æ•°æ®
        /// </summary>
        /// <returns></returns>
        public ApiAction<SubmitOutput> Submit(SubmitInput input)
        {
            var action = new ApiAction<SubmitOutput>(new SubmitOutput());

            //获取工单备料信息
            MoPickList = Biz.DataSource["YadaU9C"].Client.Queryable<mes_MOPickList>().Where(q => q.MoDocNo == CurPosition.WorkBatch.WO.ORDER_NO).ToList();

            //只允许单个产品进行客户条码绑定
            if (CurPosition.CurWipSNs.Count > 1)
            {
                CurStep.Message = Biz.L("扫描厂内条码或客户条码");
                CurStep.Status = StepStatus.Error;
                action.Data.ShortMsg = new("扫描厂内条码或客户条码", ShortMessage.Types.Error);
                action.IsSuccessed = false;
                //action.LocaleMsg = new($"条码[{0}]是包装/载具条码，请重新扫描单个厂内条码进行客户条码绑定");
                action.LocaleMsg = new("MES.WorkAction.PackageInputCheck.NotProductSN", CurPosition.CurSN);
                //重置工序操作
                CurPosition.ResetNode();

                return action;
            }

            var wipSn = CurPosition.CurWipSNs.First();
            FlowCSN = Biz.Db.Queryable<MES_CUST_SN>().Where(q => q.FLOW_SN == wipSn.SN || q.CUST_SN == wipSn.SN).First();
            //找不到生产记录，认为扫描错误
            if (FlowCSN.IsNullOrEmpty())
            {
                CurStep.Message = Biz.L("投料错误");
                CurStep.Status = StepStatus.Error;
                action.Data.ShortMsg = new("投料错误", ShortMessage.Types.Failed);
                action.IsSuccessed = false;
                //action.LocaleMsg = new($"投料错误，找不到条码[{0}]的生产记录");
                action.LocaleMsg = new("MES.WorkAction.PackageInputCheck.InputSnError", wipSn.SN);
                //重置工序操作
                CurPosition.ResetNode();
                return action;
            }
            else
            {
                //厂内条码已绑定
                if (FlowCSN.IsBound || FlowCSN.IsFlowSn)
                {
                    //物料料号是当前工单料号或者在工单备料表中，直接结束行为
                    if (FlowCSN.ITEM_CODE == CurPosition.WorkBatch.WO.ITEM_CODE || MoPickList.Any(q => q.Code == FlowCSN.ITEM_CODE))
                    {
                        action = End(input);
                        return action;
                    }
                    else
                    {
                        CurStep.Message = Biz.L("投料错误");
                        CurStep.Status = StepStatus.Error;
                        action.Data.ShortMsg = new("投料错误", ShortMessage.Types.Failed);
                        action.IsSuccessed = false;
                        //action.LocaleMsg = new($"产品(厂内条码[{0}])不适用于当前工单[{1}]的生产");
                        action.LocaleMsg = new("MES.WorkAction.PackageInputCheck.InputSnOrderError", FlowCSN.FLOW_SN, CurPosition.WorkBatch.WO.ORDER_NO);
                        //重置工序操作
                        CurPosition.ResetNode();
                        return action;
                    }
                }
                //厂内条码未绑定客户条码
                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}]未被绑定，请先扫描厂内条码");
                    action.LocaleMsg = new("MES.WorkAction.PackageInputCheck.PleaseScanFlowSn", wipSn.SN);
                    //重置工序操作
                    CurPosition.ResetNode();
                    return action;
                }

            }

            return action;
        }
        /// <summary>
        /// ç»“束执行工序行为
        /// </summary>
        /// <returns></returns>
        public ApiAction<SubmitOutput> End(SubmitInput input)
        {
            var action = new ApiAction<SubmitOutput>(new SubmitOutput());

            //更新厂内流程码
            FlowCSN.CUST_CODE = CurPosition.WorkBatch.WO.CUST_CODE;
            FlowCSN.WORK_ORDER = CurPosition.WorkBatch.WO.ORDER_NO;
            FlowCSN.ITEM_CODE = CurPosition.WorkBatch.WO.ITEM_CODE;

            //记录行为操作记录
            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 = FlowCSN.CUST_SN;
                wipSn.FLOW_SN = FlowCSN.FLOW_SN;
                //更新在制品信息历史得SN为客户条码
                var his = CurPosition.CurWipSNHiss.First(q => q.WIP_ID == wipSn.ID);
                his.SN = FlowCSN.CUST_SN;
                his.FLOW_SN = FlowCSN.FLOW_SN;
                snHiss.Add(his);
                //更新工单条码表的
                var woSn = CurPosition.WorkBatch.WoSNs.First(q => q.WIP_ID == wipSn.ID);
                woSn.SN = FlowCSN.CUST_SN;
                woSn.FLOW_SN = FlowCSN.FLOW_SN;
                woSns.Add(woSn);
                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,
                    WIP_ID = wipSn.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_VALUE_1 = Label.LABEL_CODE,
                    ACT_VALUE_2 = Label.Variables.ToJson(),
                    ACT_RESULT = "Y",
                    TRACE_INFO = $"条码[{wipSn.SN}]可以在工单[{wipSn.WORK_ORDER}]投料生产",
                };
                wipActs.Add(wipAct);
            }

            //创建变量克隆对象用于传入DBSubmitAction中保存当前需要暂存的数据值
            var _wipSns = CurPosition.CurWipSNs.Clone();
            var _snHiss = snHiss.Clone();
            var _woSns = woSns.Clone();
            var _wipActs = wipActs.Clone();
            var _FlowCSN = FlowCSN.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(_FlowCSN, CurPosition.UserCode).ExecuteCommand();
            };

            IsFinished = true;
            CurStep.Message = Biz.L("投料检查成功");
            CurStep.Status = StepStatus.Finished;
            action.Data.ShortMsg = new("投料检查成功", ShortMessage.Types.Success);
            //action.LocaleMsg = new($"条码[{0}]可以在工单[{1}]投入生产");
            action.LocaleMsg = new("MES.WorkAction.PackageInputCheck.BindingComplete", FlowCSN.FLOW_SN, FlowCSN.WORK_ORDER);
            return action;
        }

        #endregion Functions
    }
}

 Tiger.Business.MES/WorkAction/ThreeInOne.cs

@@ -23,7 +23,8 @@
        public MES_WO_NODE_ACT NodeAct { get; set; }
        public MES_WO_ACTION Setting { get; set; }
        #endregion
        public MES_CUST_SN CurCSN  { get; set; }
        public MES_CUST_SN FlowCSN  { get; set; }
        public MES_CUST_SN CustCSN { get; set; }
        public BAS_LABEL_TEMP Label { get; set; }
        public List<BAS_LABEL_PV> LabelPV { get; set; }
        public List<mes_MOPickList> MoPickList { get; set; }
@@ -47,12 +48,11 @@
            //获取打印模板
            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();

            //获取当前产品在当前客户的关系
            CustInfo = Biz.Db.Queryable<BAS_ITEM_CUST>().Where(q => q.ITEM_ID == CurPosition.WorkBatch.WO.ItemInfo.ID && q.CUST_CODE == CurPosition.WorkBatch.WO.CUST_CODE).First();

            CurStep.Message = Biz.L("扫描厂内条码");
            CurStep.Message = Biz.L("扫描厂内条码或客户条码");
            CurStep.Status = StepStatus.Normal;
        }

@@ -75,38 +75,67 @@
        {
            var action = new ApiAction<SubmitOutput>(new SubmitOutput());

            //获取工单备料信息
            MoPickList = Biz.DataSource["YadaU9C"].Client.Queryable<mes_MOPickList>().Where(q => q.MoDocNo == CurPosition.WorkBatch.WO.ORDER_NO).ToList();

            //只允许单个产品进行客户条码绑定
            if (CurPosition.CurWipSNs.Count > 1)
            {
                CurStep.Message = Biz.L("请扫描单个产品");
                CurStep.Status = StepStatus.Error;
                action.Data.ShortMsg = new("请扫描单个产品", ShortMessage.Types.Error);
                //action.LocaleMsg = new($"条码[{0}]是包装/载具条码，请重新扫描单个厂内条码进行客户条码绑定");
                action.LocaleMsg = new("MES.WorkAction.ThreeInOne.NotProductSN", CurPosition.CurSN);
                //重置工序操作
                CurPosition.ResetNode();

                action.IsSuccessed = false;
                return action;
            }

            var wipSn = CurPosition.CurWipSNs.First();
            CurCSN = Biz.Db.Queryable<MES_CUST_SN>().Where(q => q.FLOW_SN == wipSn.SN).First();
            //厂内条码已绑定客户条码，直接结束行为
            if (!CurCSN.IsNullOrEmpty())
            {
                //客户条码已绑定当前工单或者其批次属于当前工单上料物料的推荐批次
                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;
                    action.Data.Data = new
                    {
                        NeedPrint = false,
                        NeedScan = false,
                        Label = "",
                    };
                CurStep.Message = Biz.L("扫描厂内条码或客户条码");
                CurStep.Status = StepStatus.Error;
                action.Data.ShortMsg = new("扫描厂内条码或客户条码", ShortMessage.Types.Error);
                action.IsSuccessed = false;
                //action.LocaleMsg = new($"条码[{0}]是包装/载具条码，请重新扫描单个厂内条码进行客户条码绑定");
                action.LocaleMsg = new("MES.WorkAction.ThreeInOne.NotProductSN", CurPosition.CurSN);
                //重置工序操作
                CurPosition.ResetNode();

                return action;
            }

            var wipSn = CurPosition.CurWipSNs.First();
            FlowCSN = Biz.Db.Queryable<MES_CUST_SN>().Where(q => q.FLOW_SN == wipSn.SN || q.CUST_SN == wipSn.SN).First();
            //找不到生产记录，认为扫描错误
            if (FlowCSN.IsNullOrEmpty())
            {
                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}]的生产记录");
                action.LocaleMsg = new("MES.WorkAction.ThreeInOne.InputSnError", wipSn.SN);
                //重置工序操作
                CurPosition.ResetNode();
                return action;
            }
            else
            {
                //厂内条码已绑定
                if (FlowCSN.IsBound)
                {
                    //物料料号是当前工单料号或者在工单备料表中，直接结束行为
                    if (FlowCSN.ITEM_CODE == CurPosition.WorkBatch.WO.ITEM_CODE || MoPickList.Any(q => q.Code == FlowCSN.ITEM_CODE))
                    {
                    action = End(input);
                        action.Data.Data = new
                        {
                            NeedPrint = false,
                            NeedScan = false,
                            Label = "",
                        };
                        return action;
                }
                else
                {
@@ -120,18 +149,17 @@
                    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")
                    {
                        //action.LocaleMsg = new($"产品(厂内条码[{0}])不适用于当前工单[{1}]的生产");
                        action.LocaleMsg = new("MES.WorkAction.ThreeInOne.InputSnOrderError", FlowCSN.FLOW_SN, CurPosition.WorkBatch.WO.ORDER_NO);
                        //重置工序操作
                        CurPosition.ResetNode();
                    }
                    return action;
                }
            }
            //厂内条码未绑定客户条码
            else
                {
                    if (FlowCSN.IsFlowSn)
            {
                //如果客户条码标签模板为空则不需要打印，等待扫描客户条码进行绑定
                if (Label.IsNullOrEmpty())
@@ -165,6 +193,61 @@
                    action.LocaleMsg = new Locale("MES.WorkAction.ThreeInOne.BeginPrint", wipSn.SN);
                }
            }
                    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}]未被绑定，请先扫描厂内条码");
                        action.LocaleMsg = new("MES.WorkAction.ThreeInOne.PleaseScanFlowSn", wipSn.SN);
                        //重置工序操作
                        CurPosition.ResetNode();
                        return action;
                    }
                }

                //客户条码已绑定当前工单或者其批次属于当前工单上料物料的推荐批次，直接结束行为
                //if (FlowCSN.WORK_ORDER == CurPosition.WorkBatch.WO.ORDER_NO || MoPickList.Any(q => q.Code == FlowCSN.ITEM_CODE && q.SuggestedBatch == FlowCSN.WORK_ORDER))
                //{
                //    FlowCSN.WORK_ORDER = CurPosition.WorkBatch.WO.ORDER_NO;
                //    FlowCSN.ITEM_CODE = CurPosition.WorkBatch.WO.ITEM_CODE;
                //    action.Data.Data = new
                //    {
                //        NeedPrint = false,
                //        NeedScan = false,
                //        Label = "",
                //    };
                //    action = End(input);
                //}
                //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.InputSnOrderError", FlowCSN.CUST_SN, FlowCSN.WORK_ORDER, CurPosition.WorkBatch.WO.ORDER_NO);
                //    //如果行为设置为出错需要重置工序操作
                //    if (NodeAct.NEED_RESET == "Y")
                //    {
                //        CurPosition.ResetNode();
                //    }
                //    return action;
                //}
            }

            //如果返回成功则认为当前行为可以开始执行，否则返回失败
            action.IsSuccessed = true;
@@ -179,53 +262,47 @@
        public ApiAction<SubmitOutput> Submit(SubmitInput input)
        {
            var action = new ApiAction<SubmitOutput>(new SubmitOutput());
            var csn = input.Data;

            CurCSN = Biz.Db.Queryable<MES_CUST_SN>().Where(q => q.CUST_SN == input.Data).First() ?? new()
            {
                CUST_SN = input.Data,
            };
            //查询是否存在已导入的客户条码
            CustCSN = Biz.Db.Queryable<MES_CUST_SN>().Where(q => q.CUST_SN == input.Data).First();

            var isOK = true;
            //客户条码已绑定其他厂内条码
            if (!CurCSN.FLOW_SN.IsNullOrEmpty() && CurCSN.FLOW_SN != CurPosition.CurWipSNs.First().SN)
            if (!CustCSN.IsNullOrEmpty() && !CustCSN.FLOW_SN.IsNullOrEmpty() && CustCSN.FLOW_SN != FlowCSN.FLOW_SN)
            {
                CurStep.SetStatusMessage(StepStatus.Error, Biz.L("客户标签绑定失败"));
                action.Data.ShortMsg = new("客户标签绑定失败", ShortMessage.Types.Failed);
                CurStep.SetStatusMessage(StepStatus.Error, Biz.L("请扫描正确的客户标签"));
                action.Data.ShortMsg = new("请扫描正确的客户标签", ShortMessage.Types.Failed);
                action.IsSuccessed = isOK = false;
                //action.LocaleMsg = new($"厂内条码[{0}]绑定客户条码[{1}]失败，客户条码已绑定厂内条码[{2}]");
                action.LocaleMsg = new("MES.WorkAction.ThreeInOne.BindingOtherSN", CurPosition.CurWipSNs.First().SN, CurCSN.CUST_SN, CurCSN.FLOW_SN);
                //action.LocaleMsg = new($"厂内条码[{0}]绑定客户条码[{1}]失败，客户条码已绑定厂内条码[{2}]，请扫描正确的客户标签");
                action.LocaleMsg = new("MES.WorkAction.ThreeInOne.BindingOtherSN", CurPosition.CurWipSNs.First().SN, CustCSN.CUST_SN, CustCSN.FLOW_SN);
            }
            //客户条码不属于当前工单的客户
            if (CurCSN.CUST_CODE.IsNullOrEmpty(CurPosition.WorkBatch.WO.CUST_CODE) != CurPosition.WorkBatch.WO.CUST_CODE)
            if (!CustCSN.IsNullOrEmpty() && CustCSN.CUST_CODE.IsNullOrEmpty(CurPosition.WorkBatch.WO.CUST_CODE) != CurPosition.WorkBatch.WO.CUST_CODE)
            {
                CurStep.SetStatusMessage(StepStatus.Error, Biz.L("客户标签绑定失败"));
                action.Data.ShortMsg = new("客户标签绑定失败", ShortMessage.Types.Failed);
                CurStep.SetStatusMessage(StepStatus.Error, Biz.L("请扫描正确的客户标签"));
                action.Data.ShortMsg = new("请扫描正确的客户标签", ShortMessage.Types.Failed);
                action.IsSuccessed = isOK = false;
                //action.LocaleMsg = new($"客户条码[{0}]属于客户[{1}]，与当前工单的客户[{2}]不一致");
                action.LocaleMsg = new("MES.WorkAction.ThreeInOne.NotSameCustomer", CurCSN.CUST_SN, CurCSN.CUST_CODE, CurPosition.WorkBatch.WO.CUST_CODE);
                //action.LocaleMsg = new($"客户条码[{0}]属于客户[{1}]，与当前工单的客户[{2}]不一致，请扫描正确的客户标签");
                action.LocaleMsg = new("MES.WorkAction.ThreeInOne.NotSameCustomer", CustCSN.CUST_SN, CustCSN.CUST_CODE, CurPosition.WorkBatch.WO.CUST_CODE);
            }
            //验证产品客户标签条码规则
            if (!CustInfo.RULE_CODE.IsNullOrEmpty() && !Biz.CodeRule[CustInfo.RULE_CODE].IsNullOrEmpty())
            {
                var result = Biz.CodeRule[CustInfo.RULE_CODE].Verify(CurCSN.CUST_SN);
                var result = Biz.CodeRule[CustInfo.RULE_CODE].Verify(CustCSN.CUST_SN);
                if (!result.IsSuccessed)
                {
                    CurStep.SetStatusMessage(StepStatus.Error, Biz.L("客户标签绑定失败"));
                    action.Data.ShortMsg = new("客户标签绑定失败", ShortMessage.Types.Failed);
                    CurStep.SetStatusMessage(StepStatus.Error, Biz.L("请扫描正确的客户标签"));
                    action.Data.ShortMsg = new("请扫描正确的客户标签", ShortMessage.Types.Failed);
                    action.IsSuccessed = isOK = false;
                    //action.LocaleMsg = new Locale($"标签条码[{0}]未通过客户标签规则[{1}]验证");
                    action.LocaleMsg = new Locale("MES.WorkAction.ThreeInOne.CustSnVerifyError", CurCSN.CUST_SN, CustInfo.RULE_CODE);
                    //action.LocaleMsg = new Locale($"标签条码[{0}]未通过客户标签规则[{1}]验证，请扫描正确的客户标签");
                    action.LocaleMsg = new Locale("MES.WorkAction.ThreeInOne.CustSnVerifyError", CustCSN.CUST_SN, CustInfo.RULE_CODE);
                }
            }

            //验证通过则保存
            if (isOK)
            {
                CurCSN.CUST_CODE = CurPosition.WorkBatch.WO.CUST_CODE;
                CurCSN.FLOW_SN = CurPosition.CurWipSNs.First().SN;
                CurCSN.WORK_ORDER = CurPosition.WorkBatch.WO.ORDER_NO;
                CurCSN.ITEM_CODE = CurPosition.WorkBatch.WO.ITEM_CODE;
                FlowCSN.CUST_SN = input.Data;
                action = End(input);
            }
            else
@@ -247,6 +324,11 @@
        {
            var action = new ApiAction<SubmitOutput>(new SubmitOutput());

            //更新厂内流程码
            FlowCSN.CUST_CODE = CurPosition.WorkBatch.WO.CUST_CODE;
            FlowCSN.WORK_ORDER = CurPosition.WorkBatch.WO.ORDER_NO;
            FlowCSN.ITEM_CODE = CurPosition.WorkBatch.WO.ITEM_CODE;

            //记录行为操作记录
            var wipActs = new List<MES_WIP_ACT>();
            var woSns = new List<BIZ_MES_WO_SN>();
@@ -254,14 +336,14 @@
            foreach (var wipSn in CurPosition.CurWipSNs)
            {
                //更新在制品信息SN为客户条码
                wipSn.SN = CurCSN.CUST_SN;
                wipSn.SN = FlowCSN.CUST_SN;
                //更新在制品信息历史得SN为客户条码
                var his = CurPosition.CurWipSNHiss.First(q => q.WIP_ID == wipSn.ID);
                his.SN = CurCSN.CUST_SN;
                his.SN = FlowCSN.CUST_SN;
                snHiss.Add(his);
                //更新工单条码表的
                var woSn = CurPosition.WorkBatch.WoSNs.First(q => q.WIP_ID == wipSn.ID);
                woSn.SN = CurCSN.CUST_SN;
                woSn.SN = FlowCSN.CUST_SN;
                woSns.Add(woSn);
                var wipAct = new MES_WIP_ACT()
                {
@@ -299,7 +381,7 @@
                    ACT_VALUE_1 = Label.LABEL_CODE,
                    ACT_VALUE_2 = Label.Variables.ToJson(),
                    ACT_RESULT = "Y",
                    TRACE_INFO = $"厂内条码[{0}]已绑定客户条码[{1}]成功",
                    TRACE_INFO = $"厂内条码[{FlowCSN.FLOW_SN}]绑定客户条码[{FlowCSN.CUST_SN}]成功",
                };
                wipActs.Add(wipAct);
            }
@@ -309,7 +391,8 @@
            var _snHiss = snHiss.Clone();
            var _woSns = woSns.Clone();
            var _wipActs = wipActs.Clone();
            var _CurCSN = CurCSN.Clone();
            var _FlowCSN = FlowCSN.Clone();
            var _CustCSN = CustCSN.Clone();
            //保存数据
            CurStep.DBSubmitAction = () =>
            {
@@ -318,15 +401,19 @@
                db.Storageable(_snHiss, CurPosition.UserCode).ExecuteCommand();
                db.Storageable(_woSns, CurPosition.UserCode).ExecuteCommand();
                db.Storageable(_wipActs, CurPosition.UserCode).ExecuteCommand();
                db.Storageable(_CurCSN, CurPosition.UserCode).ExecuteCommand();
                db.Storageable(_FlowCSN, CurPosition.UserCode).ExecuteCommand();
                if (!_CustCSN.IsNullOrEmpty())
                {
                    db.Deleteable(_CustCSN).ExecuteCommand();
                }
            };

            IsFinished = true;
            CurStep.Message = Biz.L("客户条码已绑定");
            CurStep.Message = Biz.L("客户条码绑定成功");
            CurStep.Status = StepStatus.Finished;
            action.Data.ShortMsg = new("客户条码已绑定", ShortMessage.Types.Success);
            action.Data.ShortMsg = new("客户条码绑定成功", ShortMessage.Types.Success);
            //action.LocaleMsg = new($"厂内条码[{0}]已绑定客户条码[{1}]完成", Label.LABEL_NAME);
            action.LocaleMsg = new("MES.WorkAction.ThreeInOne.BindingComplete", CurCSN.FLOW_SN, CurCSN.CUST_SN);
            action.LocaleMsg = new("MES.WorkAction.ThreeInOne.BindingComplete", FlowCSN.FLOW_SN, FlowCSN.CUST_SN);
            return action;
        }


 Tiger.IBusiness/MES/WorkAction/IPackageInputCheck.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
using Newtonsoft.Json;
using Rhea.Common;
using System;
using Tiger.Model;
using Tiger.Model.Entitys.MES.Position;

namespace Tiger.IBusiness.MES.WorkAction
{
    public interface IPackageInputCheck : IWorkAction
    {
        
    }
}

 Tiger.Model.Net/Entitys/MES/MES_CUST_SN.cs

@@ -34,7 +34,7 @@
        [DisplayName("客户条码")]
        public string CUST_SN { get; set; }
        /// <summary>
        /// åŽ‚内流转条码
        /// åŽ‚内流转条码(若是导入的未绑定客户条码，此字段为空)
        /// </summary>
        [DisplayName("厂内流转条码")]
        public string FLOW_SN { get; set; }
@@ -60,6 +60,21 @@
        [SugarColumn(IsIgnore = true)]
        public string FieldName { get; set; }
        */
        /// <summary>
        /// æ˜¯å¦å·²ç»ç»‘定
        /// </summary>
        [SugarColumn(IsIgnore = true)]
        public bool IsBound => !string.IsNullOrEmpty(FLOW_SN) && !string.IsNullOrEmpty(CUST_SN) && FLOW_SN != CUST_SN;
        /// <summary>
        /// æ˜¯å¦åŽ‚内流转条码
        /// </summary>
        [SugarColumn(IsIgnore = true)]
        public bool IsFlowSn => !string.IsNullOrEmpty(FLOW_SN) && !string.IsNullOrEmpty(CUST_SN) && FLOW_SN == CUST_SN;
        /// <summary>
        /// æ˜¯å¦å®¢æˆ·ç¼–码
        /// </summary>
        [SugarColumn(IsIgnore = true)]
        public bool IsCustSn => string.IsNullOrEmpty(FLOW_SN) && !string.IsNullOrEmpty(CUST_SN);
        #endregion

        #region å¤–键属性