增加雅达专用上料行为 增加雅达U9数据实体

Rodney Chen

2024-09-04 94359cabfd77f8cac9191b41a586b587953dffd5

增加雅达专用上料行为
增加雅达U9数据实体

 Tiger.Business.MES/WorkAction/ThreeInOne.cs

@@ -84,6 +84,8 @@
            //厂内条码已绑定客户条码，直接结束行为
            if (!CurCSN.IsNullOrEmpty())
            {
                if (CurCSN.WORK_ORDER == CurPosition.WorkBatch.WO.ORDER_NO)
                {
                CurCSN.WORK_ORDER = CurPosition.WorkBatch.WO.ORDER_NO;
                CurCSN.ITEM_CODE = CurPosition.WorkBatch.WO.ITEM_CODE;
                action.Data.Data = new
@@ -94,6 +96,11 @@
                };
                action = End(input);
            }
                else
                {

                }
            }
            //厂内条码未绑定客户条码
            else
            {

 Tiger.Business.MES/WorkAction/YadaAssembly.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,385 @@
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;

namespace Tiger.Business.MES.WorkAction
{
    public class YadaAssembly : IYadaAssembly
    {
        #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 List<BAS_PROD_BOM> Boms { get; set; } = new();
        public AssemblyInfo CurAssembly { get; set; } = new();
        #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

            //获取产品BOM
            Boms = Biz.Db.Queryable<BAS_PROD_BOM>().Where(q => q.PROD_CODE == CurPosition.WorkBatch.WO.ITEM_CODE).ToList();
            //获取上料物料
            var assyList = new List<AssemblySetting>();
            try
            {
                assyList = (setting.ITEM_CODE ?? "").JsonToObject<List<AssemblySetting>>();
            }
            catch (System.Exception ex)
            {
                var codeList = setting.ITEM_CODE.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries);
                foreach (var code in codeList)
                {
                    assyList.Add(new(){ ITEM_CODE = code, QTY = 1 });
                }
            }
            var codes = assyList.Select(q => q.ITEM_CODE).ToList();
            var items = Biz.Db.Queryable<BAS_ITEM>().Where(q => codes.Contains(q.ITEM_CODE) && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).ToList();
            //获取上料物料的替代料
            foreach (var assy in assyList)
            {
                var info = items.FirstOrDefault(q => q.ITEM_CODE == assy.ITEM_CODE);
                if (!info.IsNullOrEmpty())
                {
                    var item = new AssemblyItem { 
                        ItemInfo = info,  
                        RuleCode = assy.RULE_CODE,
                        LoadQty = assy.QTY,
                        IsBatchItem = assy.IsBatchItem,
                    };
                    var bom = Boms.FirstOrDefault(q => q.ITEM_CODE == assy.ITEM_CODE);
                    if (!bom.IsNullOrEmpty())
                    {
                        var subs = bom.SUB_CODE.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries);
                        var surItems = Biz.Db.Queryable<BAS_ITEM>().Where(q => subs.Contains(q.ITEM_CODE) && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).ToList();
                        foreach (var sub in surItems)
                        {
                            if (!item.SubItems.Any(q => q.ITEM_CODE == sub.ITEM_CODE))
                            {
                                item.SubItems.Add(sub);
                            }
                        }
                    }
                    CurAssembly.Items.Add(item);
                }
            }
        }

        /// <summary>
        /// èŽ·å–行为开始的提示信息
        /// </summary>
        /// <returns></returns>
        public Locale GetBeginMsg()
        {
            var msg = new Locale("MES.WorkAction.Assembly.BeginMsg", string.Join("，", CurAssembly.Items.Select(q => $"{q.ItemInfo.ITEM_NAME}({q.ItemInfo.ITEM_CODE})")));
            //var msg = new Locale($"请扫描以下需要上料的物料条码：{string.Join("，", CurAssembly.Items.Select(q => $"{q.ItemInfo.ITEM_NAME}({q.ItemInfo.ITEM_CODE})"))}");
            return msg;
        }

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

            if (!CurPosition.CurWipSNs.Any(w => w.SN == input.SN))
            {
                action = SaveAssembly(input, action);
                return action;
            }

            //如果返回成功则认为当前行为可以开始执行，否则返回失败
            CurStep.Message = Biz.L("等待上料");
            CurStep.Status = StepStatus.Normal;
            action.IsSuccessed = false;
            action.Data.ShortMsg = new("等待上料", ShortMessage.Types.Normal);
            return action;
        }

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

            action = SaveAssembly(input, action);
            //上料数据保存失败
            if (!action.IsSuccessed)
            {
                //如果行为设置为出错需要重置工序操作
                if (NodeAct.NEED_RESET == "Y")
                {
                    CurPosition.ResetNode();
                }
            }
            return action;
        }

        public ApiAction<SubmitOutput> SaveAssembly(SubmitInput input, ApiAction<SubmitOutput> action)
        {
            try
            {
                foreach (var item in CurAssembly.Items.Where(q => !q.IsFinished))
                {
                    var isOK = true;
                    var matchItem = item.ItemInfo;
                    //根据条码规则验证上料是否正确
                    if (!item.RuleCode.IsNullOrEmpty())
                    {
                        if (!Biz.CodeRule[item.RuleCode].IsNullOrEmpty())
                        {
                            var result = Biz.CodeRule[item.RuleCode].Verify(input.SN);
                            if (!result.IsSuccessed)
                            {
                                isOK = false;
                            }
                        }
                        //不存在条码规则，则判断是否有自定义规则，没有则返回失败
                        else
                        {
                            switch (item.RuleCode)
                            {
                                case "自行验证":
                                    break;
                                default:
                                    isOK = false;
                                    break;
                            }
                        }
                    }
                    //主料验证不通过，则尝试验证替代料
                    if (!isOK && item.SubItems.Any())
                    {
                        foreach (var subItem in item.SubItems)
                        {
                            if (!subItem.RULE_CODE.IsNullOrEmpty())
                            {
                                if (!Biz.CodeRule[subItem.RULE_CODE].IsNullOrEmpty())
                                {
                                    var result = Biz.CodeRule[item.RuleCode].Verify(input.SN);
                                    //只要有一个替代料通过验证则可以上料
                                    if (result.IsSuccessed)
                                    {
                                        isOK = true;
                                        matchItem = subItem;
                                        break;
                                    }
                                }
                            }
                        }
                    }
                    //验证通过则保存上料信息
                    if (isOK)
                    {
                        //批次物料则只记录一次，非批次物料则要按个数验证数量
                        if (item.IsBatchItem)
                        {
                            foreach (var wipSn in CurPosition.CurWipSNs)
                            {
                                var record = new MES_WIP_ASSY()
                                {
                                    AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
                                    AUTH_PROD = CurPosition.CurLine.LINE_CODE,
                                    WIP_ID = wipSn.ID,
                                    SN = input.SN,
                                    PROD_SN = wipSn.SN,
                                    ITEM_CODE = matchItem.ITEM_CODE,
                                    QTY = 1,
                                    UNIT = matchItem.UNIT,
                                    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,
                                    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,
                                };
                                item.Records.Add(record);
                            }
                            item.IsFinished = true;
                        }
                        else 
                        {
                            foreach (var wipSn in CurPosition.CurWipSNs)
                            {
                                var record = new MES_WIP_ASSY()
                                {
                                    AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
                                    AUTH_PROD = CurPosition.CurLine.LINE_CODE,
                                    WIP_ID = wipSn.ID,
                                    SN = input.SN,
                                    PROD_SN = wipSn.SN,
                                    ITEM_CODE = matchItem.ITEM_CODE,
                                    QTY = 1,
                                    UNIT = matchItem.UNIT,
                                    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,
                                    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,
                                };
                                item.Records.Add(record);
                            }

                            if (item.Records.Sum(q => q.QTY) / item.Records.Count >= item.LoadQty * CurPosition.CurWipSNs.Count)
                            {
                                item.IsFinished = true;
                            }
                        }

                        CurStep.Message = Biz.L("上料成功");
                        CurStep.Status = StepStatus.Success;
                        action.IsSuccessed = true;
                        action.Data.ShortMsg = new("上料成功", ShortMessage.Types.Success);
                        action.Data.Data = CurAssembly;
                        //action.LocaleMsg = new Locale($"扫描物料[{matchItem.ITEM_NAME}({matchItem.ITEM_CODE})的条码[{input.SN}]成功，请继续上料");
                        action.LocaleMsg = new Locale("MES.WorkAction.Assembly.LoadSuccess", matchItem.ITEM_NAME, matchItem.ITEM_CODE);

                        //上料完成
                        if (CurAssembly.IsFinished)
                        {
                            action = End(input);
                        }
                        return action;
                    }
                }
                //都没有物料验证通过，则返回错误信息
                CurStep.Message = Biz.L("上料失败");
                CurStep.Status = StepStatus.Error;
                action.IsSuccessed = false;
                action.Data.ShortMsg = new("上料失败", ShortMessage.Types.Failed);
                //action.LocaleMsg = new($"条码[{input.SN}]验证失败，不是以下物料的条码：{string.Join("，", CurAssembly.Items.Where(q => !q.IsFinished).Select(q => $"{q.ItemInfo.ITEM_NAME}({q.ItemInfo.ITEM_CODE})"))}");
                action.LocaleMsg = new("MES.WorkAction.Assembly.LoadFail", input.SN, string.Join("，", CurAssembly.Items.Where(q => !q.IsFinished).Select(q => $"{q.ItemInfo.ITEM_NAME}({q.ItemInfo.ITEM_CODE})")));
            }
            catch (System.Exception ex)
            {
                CurStep.Message = Biz.L("上料异常");
                CurStep.Status = StepStatus.Error;
                action.Data.ShortMsg = new("上料异常", ShortMessage.Types.Exception);
                action.CatchExceptionWithLog(ex, $"上料行为：验证条码[{input.SN}]并保存数据异常");
                action.IsSuccessed = false;
                //action.LocaleMsg = new($"验证条码[{input.SN}]并保存数据异常，工序已重置，请重新扫描进站产品条码");
                action.LocaleMsg = new("MES.WorkAction.Assembly.SaveAssemblyException", input.SN);
                CurPosition.ResetNode();
            }
            return action;
        }

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

            //记录行为操作记录
            var wipActs = new List<MES_WIP_ACT>();
            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_VALUE_1 = CurAssembly.ToJson(),
                    ACT_RESULT = "Y",
                    TRACE_INFO = $"以下物料上料完成：{string.Join(",", CurAssembly.Items.Select(q => $"{q.ItemInfo.ITEM_NAME}({q.ItemInfo.ITEM_CODE})"))}",
                };
                wipActs.Add(wipAct);
            }


            //创建变量克隆对象用于传入DBSubmitAction中保存当前需要暂存的数据值
            var _wipActs = wipActs.Clone();
            //整理上料记录
            var _records = new List<MES_WIP_ASSY>();
            foreach (var item in CurAssembly.Items)
            {
                _records.AddRange(item.Records.Clone());
            }
            //保存数据
            CurStep.DBSubmitAction = () =>
            {
                var db = CurPosition.GetCommitDB();
                db.Storageable(_wipActs, CurPosition.UserCode).ExecuteCommand();
                db.Insertable(_records, CurPosition.UserCode).ExecuteCommand();
            };

            IsFinished = true;
            CurStep.Message = Biz.L("上料完成");
            CurStep.Status = StepStatus.Finished;
            action.Data.ShortMsg = new("上料完成", ShortMessage.Types.Success);
            //action.LocaleMsg = new($"以下物料上料完成：{string.Join("，", CurAssembly.Items.Select(q => $"{q.ItemInfo.ITEM_NAME}({q.ItemInfo.ITEM_CODE})"))}");
            action.LocaleMsg = new("MES.WorkAction.Assembly.LoadFinish", string.Join("，", CurAssembly.Items.Select(q => $"{q.ItemInfo.ITEM_NAME}({q.ItemInfo.ITEM_CODE})")));
            return action;
        }

        #endregion Functions
    }
}

 Tiger.IBusiness/MES/WorkAction/IYadaAssembly.cs

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

namespace Tiger.IBusiness.MES.WorkAction
{
    public interface IYadaAssembly : IWorkAction
    {

    }
}

 Tiger.Model.Net/Entitys/MES/YadaU9/mes_BomComponent.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,67 @@
using System;
using SqlSugar;
using System.Linq;
using System.ComponentModel;
using System.Collections.Generic;
using Tiger.Model;

namespace Tiger.Model.MES.Yada
{
    /// <summary>
    /// å®žä½“：mes_BomComponent
    /// </summary>
    [Serializable]
    [SugarTable("mes_BomComponent")]
    public class mes_BomComponent : iViewEntity
    {
        #region æž„造函数
        /// <summary>
        /// å®žä½“：mes_BomComponent
        /// </summary>
        public mes_BomComponent() {}
        #endregion

        #region å…¬å…±å±žæ€§
        /// <summary>
        /// 
        /// </summary>
        public long ID { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public long Org { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string ItemMasterCode { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string ItemMasterName { get; set; }
        #endregion

        #region è™šæ‹Ÿå±žæ€§
        /*例子
        [SugarColumn(IsIgnore = true)]
        public string FieldName { get; set; }
        */
        #endregion

        #region æžšä¸¾å˜é‡
        /*例子
        public enum FieldNames
        {
            [Description("枚举描述0")]
            Enum0,
            [Description("枚举描述1")]
            Enum1,
        }
        */
        #endregion

        #region å…¬å…±æ–¹æ³•

        #endregion

    }//endClass
}

 Tiger.Model.Net/Entitys/MES/YadaU9/mes_BomDetail.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,187 @@
using System;
using SqlSugar;
using System.Linq;
using System.ComponentModel;
using System.Collections.Generic;
using Tiger.Model;

namespace Tiger.Model.MES.Yada
{
    /// <summary>
    /// å®žä½“：mes_BomDetail
    /// </summary>
    [Serializable]
    [SugarTable("mes_BomDetail")]
    public class mes_BomDetail : iViewEntity
    {
        #region æž„造函数
        /// <summary>
        /// å®žä½“：mes_BomDetail
        /// </summary>
        public mes_BomDetail() {}
        #endregion

        #region å…¬å…±å±žæ€§
        /// <summary>
        /// 
        /// </summary>
        public DateTime BomCreatedOn { get; set; } = DateTime.MinValue;
        /// <summary>
        /// 
        /// </summary>
        public DateTime BomModifiedOn { get; set; } = DateTime.MinValue;
        /// <summary>
        /// 
        /// </summary>
        public string BomComponentCreatedBy { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public DateTime BomComponentModifiedOn { get; set; } = DateTime.MinValue;
        /// <summary>
        /// 
        /// </summary>
        public string IssueStyle { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string SubstituteStyle { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public int SubSeq { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string ComponentRemark { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string ComponentType { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public decimal SubPercent { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public decimal ParentQty { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string IsCeiling { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string IssueUOM { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string IsEffective { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public DateTime ComponentEffectiveDate { get; set; } = DateTime.MinValue;
        /// <summary>
        /// 
        /// </summary>
        public DateTime ComponentDisableDate { get; set; } = DateTime.MinValue;
        /// <summary>
        /// 
        /// </summary>
        public string BomComponentCode { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string BomComponentName { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string ItemVersionCode { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public int Sequence { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string UsageQtyType { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public decimal UsageQty { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string IsPrimaryLot { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string ProductUOM { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string BomMasterEffectiveDate { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string BomMasterDisableDate { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string Explain { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public long BomComponentId { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public long BomId { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public long Org { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string BomCode { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string BomName { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string BomVersionCode { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public int Lot { get; set; }
        #endregion

        #region è™šæ‹Ÿå±žæ€§
        /*例子
        [SugarColumn(IsIgnore = true)]
        public string FieldName { get; set; }
        */
        #endregion

        #region æžšä¸¾å˜é‡
        /*例子
        public enum FieldNames
        {
            [Description("枚举描述0")]
            Enum0,
            [Description("枚举描述1")]
            Enum1,
        }
        */
        #endregion

        #region å…¬å…±æ–¹æ³•

        #endregion

    }//endClass
}

 Tiger.Model.Net/Entitys/MES/YadaU9/mes_BomMaster.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,55 @@
using System;
using SqlSugar;
using System.Linq;
using System.ComponentModel;
using System.Collections.Generic;
using Tiger.Model;

namespace Tiger.Model.MES.Yada
{
    /// <summary>
    /// å®žä½“：mes_BomMaster
    /// </summary>
    [Serializable]
    [SugarTable("mes_BomMaster")]
    public class mes_BomMaster : iViewEntity
    {
        #region æž„造函数
        /// <summary>
        /// å®žä½“：mes_BomMaster
        /// </summary>
        public mes_BomMaster() {}
        #endregion

        #region å…¬å…±å±žæ€§
        /// <summary>
        /// 
        /// </summary>
        public long ID { get; set; }
        #endregion

        #region è™šæ‹Ÿå±žæ€§
        /*例子
        [SugarColumn(IsIgnore = true)]
        public string FieldName { get; set; }
        */
        #endregion

        #region æžšä¸¾å˜é‡
        /*例子
        public enum FieldNames
        {
            [Description("枚举描述0")]
            Enum0,
            [Description("枚举描述1")]
            Enum1,
        }
        */
        #endregion

        #region å…¬å…±æ–¹æ³•

        #endregion

    }//endClass
}

 Tiger.Model.Net/Entitys/MES/YadaU9/mes_Customer.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,71 @@
using System;
using SqlSugar;
using System.Linq;
using System.ComponentModel;
using System.Collections.Generic;
using Tiger.Model;

namespace Tiger.Model.MES.Yada
{
    /// <summary>
    /// å®žä½“：mes_Customer
    /// </summary>
    [Serializable]
    [SugarTable("mes_Customer")]
    public class mes_Customer : iViewEntity
    {
        #region æž„造函数
        /// <summary>
        /// å®žä½“：mes_Customer
        /// </summary>
        public mes_Customer() {}
        #endregion

        #region å…¬å…±å±žæ€§
        /// <summary>
        /// 
        /// </summary>
        public long ID { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public long Org { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string Code { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string SearchCode { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string Name { get; set; }
        #endregion

        #region è™šæ‹Ÿå±žæ€§
        /*例子
        [SugarColumn(IsIgnore = true)]
        public string FieldName { get; set; }
        */
        #endregion

        #region æžšä¸¾å˜é‡
        /*例子
        public enum FieldNames
        {
            [Description("枚举描述0")]
            Enum0,
            [Description("枚举描述1")]
            Enum1,
        }
        */
        #endregion

        #region å…¬å…±æ–¹æ³•

        #endregion

    }//endClass
}

 Tiger.Model.Net/Entitys/MES/YadaU9/mes_ItemMaster.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,71 @@
using System;
using SqlSugar;
using System.Linq;
using System.ComponentModel;
using System.Collections.Generic;
using Tiger.Model;

namespace Tiger.Model.MES.Yada
{
    /// <summary>
    /// å®žä½“：mes_ItemMaster
    /// </summary>
    [Serializable]
    [SugarTable("mes_ItemMaster")]
    public class mes_ItemMaster : iViewEntity
    {
        #region æž„造函数
        /// <summary>
        /// å®žä½“：mes_ItemMaster
        /// </summary>
        public mes_ItemMaster() {}
        #endregion

        #region å…¬å…±å±žæ€§
        /// <summary>
        /// 
        /// </summary>
        public long ID { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public long Org { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string Code { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string Code1 { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string Name { get; set; }
        #endregion

        #region è™šæ‹Ÿå±žæ€§
        /*例子
        [SugarColumn(IsIgnore = true)]
        public string FieldName { get; set; }
        */
        #endregion

        #region æžšä¸¾å˜é‡
        /*例子
        public enum FieldNames
        {
            [Description("枚举描述0")]
            Enum0,
            [Description("枚举描述1")]
            Enum1,
        }
        */
        #endregion

        #region å…¬å…±æ–¹æ³•

        #endregion

    }//endClass
}

 Tiger.Model.Net/Entitys/MES/YadaU9/mes_MOPickList.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,123 @@
using System;
using SqlSugar;
using System.Linq;
using System.ComponentModel;
using System.Collections.Generic;
using Tiger.Model;

namespace Tiger.Model.MES.Yada
{
    /// <summary>
    /// å®žä½“：mes_MOPickList
    /// </summary>
    [Serializable]
    [SugarTable("mes_MOPickList")]
    public class mes_MOPickList : iViewEntity
    {
        #region æž„造函数
        /// <summary>
        /// å®žä½“：mes_MOPickList
        /// </summary>
        public mes_MOPickList() {}
        #endregion

        #region å…¬å…±å±žæ€§
        /// <summary>
        /// 
        /// </summary>
        public string WhCode { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string WhName { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public long BinId { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string BinCode { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string BinName { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string SuggestedBatch { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public decimal ActualReqQty { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public decimal IssuedQty { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public decimal IssueNotDeliverQty { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public int IssueStyle { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string IssueStyleName { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public long WhId { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public long SupplyOrg { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public int DocLineNO { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public long MoId { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string MoDocNo { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public long ItemMaster { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string Code { get; set; }
        #endregion

        #region è™šæ‹Ÿå±žæ€§
        /*例子
        [SugarColumn(IsIgnore = true)]
        public string FieldName { get; set; }
        */
        #endregion

        #region æžšä¸¾å˜é‡
        /*例子
        public enum FieldNames
        {
            [Description("枚举描述0")]
            Enum0,
            [Description("枚举描述1")]
            Enum1,
        }
        */
        #endregion

        #region å…¬å…±æ–¹æ³•

        #endregion

    }//endClass
}

 Tiger.Model.Net/Entitys/MES/YadaU9/mes_Mo.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,71 @@
using System;
using SqlSugar;
using System.Linq;
using System.ComponentModel;
using System.Collections.Generic;
using Tiger.Model;

namespace Tiger.Model.MES.Yada
{
    /// <summary>
    /// å®žä½“：mes_Mo
    /// </summary>
    [Serializable]
    [SugarTable("mes_Mo")]
    public class mes_Mo : iViewEntity
    {
        #region æž„造函数
        /// <summary>
        /// å®žä½“：mes_Mo
        /// </summary>
        public mes_Mo() {}
        #endregion

        #region å…¬å…±å±žæ€§
        /// <summary>
        /// 
        /// </summary>
        public long Org { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string DocTypeCode { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string DocTypeName { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string DocNo { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public decimal ProductQty { get; set; }
        #endregion

        #region è™šæ‹Ÿå±žæ€§
        /*例子
        [SugarColumn(IsIgnore = true)]
        public string FieldName { get; set; }
        */
        #endregion

        #region æžšä¸¾å˜é‡
        /*例子
        public enum FieldNames
        {
            [Description("枚举描述0")]
            Enum0,
            [Description("枚举描述1")]
            Enum1,
        }
        */
        #endregion

        #region å…¬å…±æ–¹æ³•

        #endregion

    }//endClass
}

 Tiger.Model.Net/Entitys/MES/YadaU9/mes_MoBarCode.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,75 @@
using System;
using SqlSugar;
using System.Linq;
using System.ComponentModel;
using System.Collections.Generic;
using Tiger.Model;

namespace Tiger.Model.MES.Yada
{
    /// <summary>
    /// å®žä½“：mes_MoBarCode
    /// </summary>
    [Serializable]
    [SugarTable("mes_MoBarCode")]
    public class mes_MoBarCode : iViewEntity
    {
        #region æž„造函数
        /// <summary>
        /// å®žä½“：mes_MoBarCode
        /// </summary>
        public mes_MoBarCode() {}
        #endregion

        #region å…¬å…±å±žæ€§
        /// <summary>
        /// 
        /// </summary>
        public string InBarCode { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string OutBarCode { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string CustomerItem { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public long MoBarSerial { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public DateTime CreatedOn { get; set; } = DateTime.MinValue;
        /// <summary>
        /// 
        /// </summary>
        public DateTime ModifiedOn { get; set; } = DateTime.MinValue;
        #endregion

        #region è™šæ‹Ÿå±žæ€§
        /*例子
        [SugarColumn(IsIgnore = true)]
        public string FieldName { get; set; }
        */
        #endregion

        #region æžšä¸¾å˜é‡
        /*例子
        public enum FieldNames
        {
            [Description("枚举描述0")]
            Enum0,
            [Description("枚举描述1")]
            Enum1,
        }
        */
        #endregion

        #region å…¬å…±æ–¹æ³•

        #endregion

    }//endClass
}

 Tiger.Model.Net/Entitys/MES/YadaU9/mes_Organization.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,71 @@
using System;
using SqlSugar;
using System.Linq;
using System.ComponentModel;
using System.Collections.Generic;
using Tiger.Model;

namespace Tiger.Model.MES.Yada
{
    /// <summary>
    /// å®žä½“：mes_Organization
    /// </summary>
    [Serializable]
    [SugarTable("mes_Organization")]
    public class mes_Organization : iViewEntity
    {
        #region æž„造函数
        /// <summary>
        /// å®žä½“：mes_Organization
        /// </summary>
        public mes_Organization() {}
        #endregion

        #region å…¬å…±å±žæ€§
        /// <summary>
        /// 
        /// </summary>
        public long ID { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string Code { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string ShortName { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string Name { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string Description { get; set; }
        #endregion

        #region è™šæ‹Ÿå±žæ€§
        /*例子
        [SugarColumn(IsIgnore = true)]
        public string FieldName { get; set; }
        */
        #endregion

        #region æžšä¸¾å˜é‡
        /*例子
        public enum FieldNames
        {
            [Description("枚举描述0")]
            Enum0,
            [Description("枚举描述1")]
            Enum1,
        }
        */
        #endregion

        #region å…¬å…±æ–¹æ³•

        #endregion

    }//endClass
}

 Tiger.Model.Net/Entitys/MES/YadaU9/mes_ProductType.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,67 @@
using System;
using SqlSugar;
using System.Linq;
using System.ComponentModel;
using System.Collections.Generic;
using Tiger.Model;

namespace Tiger.Model.MES.Yada
{
    /// <summary>
    /// å®žä½“：mes_ProductType
    /// </summary>
    [Serializable]
    [SugarTable("mes_ProductType")]
    public class mes_ProductType : iViewEntity
    {
        #region æž„造函数
        /// <summary>
        /// å®žä½“：mes_ProductType
        /// </summary>
        public mes_ProductType() {}
        #endregion

        #region å…¬å…±å±žæ€§
        /// <summary>
        /// 
        /// </summary>
        public long ID { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string Code { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string Name { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public DateTime CreatedOn { get; set; } = DateTime.MinValue;
        #endregion

        #region è™šæ‹Ÿå±žæ€§
        /*例子
        [SugarColumn(IsIgnore = true)]
        public string FieldName { get; set; }
        */
        #endregion

        #region æžšä¸¾å˜é‡
        /*例子
        public enum FieldNames
        {
            [Description("枚举描述0")]
            Enum0,
            [Description("枚举描述1")]
            Enum1,
        }
        */
        #endregion

        #region å…¬å…±æ–¹æ³•

        #endregion

    }//endClass
}

 Tiger.Model.Net/Entitys/MES/YadaU9/mes_Supplier.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,55 @@
using System;
using SqlSugar;
using System.Linq;
using System.ComponentModel;
using System.Collections.Generic;
using Tiger.Model;

namespace Tiger.Model.MES.Yada
{
    /// <summary>
    /// å®žä½“：mes_Supplier
    /// </summary>
    [Serializable]
    [SugarTable("mes_Supplier")]
    public class mes_Supplier : iViewEntity
    {
        #region æž„造函数
        /// <summary>
        /// å®žä½“：mes_Supplier
        /// </summary>
        public mes_Supplier() {}
        #endregion

        #region å…¬å…±å±žæ€§
        /// <summary>
        /// 
        /// </summary>
        public long ID { get; set; }
        #endregion

        #region è™šæ‹Ÿå±žæ€§
        /*例子
        [SugarColumn(IsIgnore = true)]
        public string FieldName { get; set; }
        */
        #endregion

        #region æžšä¸¾å˜é‡
        /*例子
        public enum FieldNames
        {
            [Description("枚举描述0")]
            Enum0,
            [Description("枚举描述1")]
            Enum1,
        }
        */
        #endregion

        #region å…¬å…±æ–¹æ³•

        #endregion

    }//endClass
}

 Tiger.Model.Net/Tiger.Model.Net.csproj

@@ -190,6 +190,17 @@
    <Compile Include="Entitys\MES\SMT_TOOL_HIS.cs" />
    <Compile Include="Entitys\MES\SMT_WO_TABLE.cs" />
    <Compile Include="Entitys\MES\Weigh.cs" />
    <Compile Include="Entitys\MES\YadaU9\mes_BomComponent.cs" />
    <Compile Include="Entitys\MES\YadaU9\mes_BomDetail.cs" />
    <Compile Include="Entitys\MES\YadaU9\mes_BomMaster.cs" />
    <Compile Include="Entitys\MES\YadaU9\mes_Customer.cs" />
    <Compile Include="Entitys\MES\YadaU9\mes_ItemMaster.cs" />
    <Compile Include="Entitys\MES\YadaU9\mes_Mo.cs" />
    <Compile Include="Entitys\MES\YadaU9\mes_MoBarCode.cs" />
    <Compile Include="Entitys\MES\YadaU9\mes_MOPickList.cs" />
    <Compile Include="Entitys\MES\YadaU9\mes_Organization.cs" />
    <Compile Include="Entitys\MES\YadaU9\mes_ProductType.cs" />
    <Compile Include="Entitys\MES\YadaU9\mes_Supplier.cs" />
    <Compile Include="Entitys\QMS\QMS_AQL_PLAN.cs" />
    <Compile Include="Entitys\QMS\QMS_AQL_STD.cs" />
    <Compile Include="Entitys\QMS\QMS_INS_CTGY.cs" />