优化标准上下架

Rodney Chen

2024-12-24 cd8182d8fefc55c245400936b6330a00e866adbd

优化标准上下架

 Tiger.Api/Language.db

Binary files differ

 Tiger.Business.WMS/Transaction/In_Default.cs

@@ -12,6 +12,9 @@
using Tiger.Model.Sharetronic.Shelf;
using Tiger.Business.WMS.Sharetronic.Shelf;
using Microsoft.IdentityModel.Tokens;
using Apache.NMS.ActiveMQ.Commands;
using Tiger.Model.MES.Yada;
using Tiger.Model.Entitys.MES.Position;

namespace Tiger.Business.WMS.Transaction
{
@@ -36,15 +39,16 @@
        public string OrgCode { get; set; }
        public Inventory CurInvItem { get; set; }
        public ScanShelfInfo CurScanShelf { get; set; }
        public string Command { get; set; } = "Normal";
        #endregion

        #region Functions
        /// <summary>
        /// æ‰«æç‰©æ–™å¹¶å¤æ ¸ï¼Œå¦‚果物料已经完成移库则货架上亮灯提醒储位
        /// æ‰«æå…¥å£
        /// </summary>
        public async Task<ApiAction> ScanItem(BaseInput input)
        public async Task<ApiAction<ScanOutput>> Scan(BaseInput input)
        {
            var action = new ApiAction();
            var action = new ApiAction<ScanOutput>();
            try
            {
                if (input.SN.IsNullOrEmpty())
@@ -52,18 +56,38 @@
                    action.IsSuccessed = false;
                    //action.LocaleMsg = Biz.L("条码不能为空");
                    action.LocaleMsg = Biz.L("WMS.Default.ScanItem.SnEmptyFailure");
                    return action;
                    return SetOutPutMqttMsg(action, input.Locale);
                }
                //货架为空则扫描的认为是货架
                if (string.IsNullOrEmpty(CurScanShelf?.RackCode))
                if (string.IsNullOrEmpty(CurScanShelf?.ShelfCode))
                {
                    var _action = await ScanShelf(input.SN);
                    action.LocaleMsg = _action.LocaleMsg;
                    action.IsSuccessed = _action.IsSuccessed;
                    action.Data = _action.Data;
                    return action;
                    action = await ScanShelf(input.SN);
                }
                //扫描物料并复核
                {
                    action = await ScanItem(input);
                }
            }
            catch (Exception ex)
            {
                //取消当前操作
                ResetInfo();
                //action.CatchExceptionWithLog(ex, $"扫描[{input.SN}]异常");
                action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.Scan.ScanException", input.SN));
            }
            return SetOutPutMqttMsg(action, input.Locale);
                }

        /// <summary>
        /// æ‰«æç‰©æ–™å¹¶å¤æ ¸ï¼Œå¦‚果物料已经完成移库则货架上亮灯提醒储位
        /// </summary>
        public async Task<ApiAction<ScanOutput>> ScanItem(BaseInput input)
        {
            var action = new ApiAction<ScanOutput>(new ScanOutput() { Command = Command });
            try
            {
                if (CurInvItem.IsNullOrEmpty())
                {
                Result<IInventory> result = WMS_ITEM_Biz.WmsItem.Get(input.SN, input.AuthOption, true);
                if (!result.IsSuccessed)
                {
@@ -71,28 +95,67 @@
                    action.LocaleMsg = result.LocaleMsg;
                    return action;
                }
                var inv = result.Data as Inventory;
                    CurInvItem = result.Data as Inventory;

                //验证条码是否正确!inv.isNormalStatus || inv.Status.GetValue() != WMS_ITEM.STATUSs.NotExists.GetValue() && 
                if (inv.Status.GetValue() == WMS_ITEM.STATUSs.InStore.GetValue())
                    //验证条码是否正确
                    if (new[] { WMS_ITEM.STATUSs.InStore, WMS_ITEM.STATUSs.Loaded, WMS_ITEM.STATUSs.UseUp }.Contains(CurInvItem.Status))
                {
                    action.IsSuccessed = false;
                    //action.LocaleMsg = Biz.L("状态[{0}]异常，请重新扫描");
                    action.LocaleMsg = Biz.L("WMS.Default.ScanItem.StatusException", string.Join(',', inv.StatusList.Select(q => q.GetDesc())));
                        action.LocaleMsg = Biz.L("WMS.Default.ScanItem.StatusException", string.Join(',', CurInvItem.StatusList.Select(q => q.GetDesc())));
                    return action;
                }
                //物料验证
                if (inv.ItemInfo.IsNullOrEmpty() || inv.ItemInfo.IS_ACTIVE == "N")
                    if (CurInvItem.ItemInfo.IsNullOrEmpty() || CurInvItem.ItemInfo.IS_ACTIVE == "N")
                {
                    action.IsSuccessed = false;
                    //action.LocaleMsg = Biz.L("物料编码[{0}]不存在或者该物料未启用");
                    action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ItemCodeNotExistsOrNotActive", inv.ItemInfo.ITEM_CODE.IsNullOrEmpty(inv.Barcode.ItemCode));
                        action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ItemCodeNotExistsOrNotActive", CurInvItem.ItemInfo.ITEM_CODE.IsNullOrEmpty(CurInvItem.Barcode.ItemCode));
                    return action;
                }

                if (!inv.IsNullOrEmpty())
                    //检查物料数量，如果没有则查询雅达条码主档，把数量返回前端确认
                    if (CurInvItem.Items.Any(q => q.QTY <= 0))
                {
                    if (inv.Items.Count == 0)
                        var qtyList = Biz.DataSource["YadaU9C"].Client.Queryable<mes_MaterialBarCode>().Where(q => CurInvItem.Items.Select(q => q.SN).Contains(q.Code)).ToList();
                        foreach (var qty in qtyList)
                        {
                            var item = CurInvItem.Items.First(q => q.SN == qty.Code);
                            item.QTY = qty.WhQty;
                        }
                        action.Data.Data = CurInvItem.Items.ToDictionary(k => k.SN, v => v.QTY);
                        action.Data.Command = Command = "ComfirmQty";
                        //action.LocaleMsg = Biz.L("请确认条码[{0}]的数量是否正确");
                        action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ComfirmQty", input.SN);
                        return action;
                    }
                }

                //更新已确认物料数量
                if (Command == "ComfirmQty")
                {
                    var qtyList = (input.Data ?? "").JsonToObject<Dictionary<string, decimal>>() ?? new Dictionary<string, decimal>();
                    if (qtyList.Any(q => q.Value <= 0))
                    {
                        action.IsSuccessed = false;
                        action.Data.Data = CurInvItem.Items.ToDictionary(k => k.SN, v => v.QTY);
                        action.Data.Command = Command = "ComfirmQty";
                        //action.LocaleMsg = Biz.L("数量不能小于等于零，请重新确认条码[{0}]的数量");
                        action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ReComfirmQty", input.SN); 
                        return action;
                    } 
                    else
                    {
                        foreach (var qty in qtyList)
                        {
                            var item = CurInvItem.Items.First(q => q.SN == qty.Key);
                            item.QTY = qty.Value;
                        }
                        Command = "Normal";
                    }
                }

                if (CurInvItem.Items.Count == 0)
                    {
                        List<WMS_ITEM_HIS> ItemHistorys = new List<WMS_ITEM_HIS>();
                        WMS_ITEM Item;
@@ -100,67 +163,66 @@

                        Item = new()
                        {
                            SN = inv.Barcode.SN,
                            ITEM_CODE = inv.Barcode.ItemCode,
                        SN = CurInvItem.Barcode.SN,
                        ITEM_CODE = CurInvItem.Barcode.ItemCode,
                            AUTH_ORG = input.AuthOption.CurOrg,
                            STATUS = WMS_ITEM.STATUSs.WaitIn.GetValue(),
                            QTY = inv.Barcode.Qty.ToDecimal(),
                            PROD_DATE = inv.Barcode.DateCode.ToDateTime(),
                        QTY = CurInvItem.Barcode.Qty.ToDecimal(),
                        PROD_DATE = CurInvItem.Barcode.DateCode.ToDateTime(),
                            ERP_WH = CurScanShelf.WarehouseCode,
                            UNIT = inv.Barcode.Unit,
                        UNIT = CurInvItem.Barcode.Unit,
                        };

                        WMS_ITEM_HIS his = new(Item, $"标准上架入库");
                        ItemHistorys.Add(his);
                        ItemPkgs = new()
                        {
                            SN = inv.Barcode.SN,
                        SN = CurInvItem.Barcode.SN,
                            AUTH_ORG = input.AuthOption.CurOrg,
                            ITEM_CODE = inv.Barcode.ItemCode,
                            QTY = inv.Barcode.Qty.ToDecimal(),
                        ITEM_CODE = CurInvItem.Barcode.ItemCode,
                        QTY = CurInvItem.Barcode.Qty.ToDecimal(),
                            ERP_WH = CurScanShelf.WarehouseCode,
                            UNIT = inv.Barcode.Unit,
                        UNIT = CurInvItem.Barcode.Unit,
                        };

                        var noExt = inv.Items.Where(q => !inv.ItemsExt.Any(s => s.SN == q.SN)).ToList();
                    var noExt = CurInvItem.Items.Where(q => !CurInvItem.ItemsExt.Any(s => s.SN == q.SN)).ToList();
                        //扩展表不存在时新建
                        foreach (var item in noExt)
                        {
                            inv.ItemsExt.Add(new()
                        CurInvItem.ItemsExt.Add(new()
                            {
                                SN = item.SN,
                                META_SN = inv.Barcode.MetaSn,
                                QR_CODE = inv.Barcode.MetaSn
                            META_SN = CurInvItem.Barcode.MetaSn,
                            QR_CODE = CurInvItem.Barcode.MetaSn
                            });
                        }

                        inv.Items.Add(Item);
                        inv.History.Add(his);
                        inv.Packages.Add(ItemPkgs);
                    CurInvItem.Items.Add(Item);
                    CurInvItem.History.Add(his);
                    CurInvItem.Packages.Add(ItemPkgs);
                    }
                    else if (inv.Items.Count == 1)
                else if (CurInvItem.Items.Count == 1)
                    {
                        inv.Items.First().QTY = inv.Barcode.Qty.ToDecimal();
                        inv.Items.First().ERP_WH = CurScanShelf.WarehouseCode;
                        inv.Items.First().AUTH_ORG = input.AuthOption.CurOrg;
                    CurInvItem.Items.First().QTY = CurInvItem.Barcode.Qty.ToDecimal();
                    CurInvItem.Items.First().ERP_WH = CurScanShelf.WarehouseCode;
                    CurInvItem.Items.First().AUTH_ORG = input.AuthOption.CurOrg;

                        inv.Packages.First().QTY = inv.Barcode.Qty.ToDecimal();
                        inv.Packages.First().ERP_WH = CurScanShelf.WarehouseCode;
                        inv.Packages.First().AUTH_ORG = input.AuthOption.CurOrg;
                    CurInvItem.Packages.First().QTY = CurInvItem.Barcode.Qty.ToDecimal();
                    CurInvItem.Packages.First().ERP_WH = CurScanShelf.WarehouseCode;
                    CurInvItem.Packages.First().AUTH_ORG = input.AuthOption.CurOrg;
                    }
                    //如果扫描外箱的不能更新数量
                    else
                    {
                        foreach (var item in inv.Items)
                    foreach (var item in CurInvItem.Items)
                        {
                            item.ERP_WH = CurScanShelf.WarehouseCode;
                            item.AUTH_ORG = input.AuthOption.CurOrg;
                        }
                        foreach (var item in inv.Packages)
                    foreach (var item in CurInvItem.Packages)
                        {
                            item.ERP_WH = CurScanShelf.WarehouseCode;
                            item.AUTH_ORG = input.AuthOption.CurOrg;
                        }
                    }
                }

@@ -168,7 +230,7 @@
                // åˆ¤æ–­æ˜¯å¦æ™ºèƒ½è´§æž¶
                if (CurScanShelf.Shelf.IsLightShelf)
                {
                    ShelfApiResult shelfApiResult = await Share.Shelf.PutOn(TransID, CurScanShelf.Shelf, inv.Items[0]);
                    ShelfApiResult shelfApiResult = await Share.Shelf.PutOn(TransID, CurScanShelf.Shelf, CurInvItem.Items[0]);
                    if (!shelfApiResult.IsSuccess)
                    {
                        action.IsSuccessed = false;
@@ -209,7 +271,7 @@
                }

                //判断储位是否单放
                if (nLocation.IS_SINGLE == "Y" && inv.Items.Count > 1)
                if (nLocation.IS_SINGLE == "Y" && CurInvItem.Items.Count > 1)
                {
                    action.IsSuccessed = false;
                    //action.LocaleMsg = Biz.L("储位[{0}]只能存放一个物料");
@@ -218,12 +280,12 @@
                }

                //执行上架
                foreach (var item in inv.Items)
                foreach (var item in CurInvItem.Items)
                {
                    item.TRANS_CODE = "In_Default";
                    item.TRANS_NO = $"In_Default_{DateTime.Now:yyyyMMdd}";
                }
                Result<PutOnInfo> putonResult = WMS_ITEM_Biz.WmsItem.PutOn(inv, input.AuthOption, nLocation.LOCATION_CODE);
                Result<PutOnInfo> putonResult = WMS_ITEM_Biz.WmsItem.PutOn(CurInvItem, input.AuthOption, nLocation.LOCATION_CODE);
                if (!putonResult.IsSuccessed)
                {
                    action.IsSuccessed = false;
@@ -250,21 +312,21 @@
                    throw dbTran.ErrorException;
                }
                // è¿”回其他入库对象
                action.Data = new DefaultInStoreOutput
                action.Data.Data = new DefaultInStoreOutput
                {
                    Barcode = inv.SN,
                    MaterialCode = inv.ItemInfo.ITEM_CODE,
                    MaterialName = inv.ItemInfo.ITEM_NAME,
                    CurrentQty = inv.Items[0].QTY,
                    Unit = inv.Items[0].UNIT,
                    DateCode = inv.Items[0].PROD_DATE,
                    Barcode = CurInvItem.SN,
                    MaterialCode = CurInvItem.ItemInfo.ITEM_CODE,
                    MaterialName = CurInvItem.ItemInfo.ITEM_NAME,
                    CurrentQty = CurInvItem.Items[0].QTY,
                    Unit = CurInvItem.Items[0].UNIT,
                    DateCode = CurInvItem.Items[0].PROD_DATE,
                    WarehouseCode = putOnInfo.Warehouse.WH_CODE,
                    RegionCode = putOnInfo.Region.REGION_CODE,
                    ShelfCode = putOnInfo.Shelf.SHELF_CODE,
                    LocationCode = putOnInfo.Location.LOCATION_CODE,
                };
                //action.LocaleMsg = Biz.L($"扫描条码[{0}]上架到储位[{1}]成功");
                action.LocaleMsg = Biz.L("WMS.Default.ScanItem.PutOnSucceeded", inv.SN, putOnInfo.Location.LOCATION_CODE);
                action.LocaleMsg = Biz.L("WMS.Default.ScanItem.PutOnSucceeded", CurInvItem.SN, putOnInfo.Location.LOCATION_CODE);
            }
            catch (Exception ex)
            {
@@ -279,9 +341,9 @@
        /// <summary>
        /// æ‰«æè´§æž¶æˆ–者储位
        /// </summary>
        public async Task<ApiAction<ScanShelfInfo>> ScanShelf(string Code)
        public async Task<ApiAction<ScanOutput>> ScanShelf(string Code)
        {
            var action = new ApiAction<ScanShelfInfo>();
            var action = new ApiAction<ScanOutput>();
            try
            {
                if (Code.IsNullOrEmpty())
@@ -348,7 +410,7 @@
                CurScanShelf.IsScanShelf = true;
                //action.LocaleMsg = Biz.L("扫描货架/储位[{0}]成功");
                action.LocaleMsg = Biz.L("WMS.Default.ScanShelf.ScanSucceeded", Code);
                action.Data = CurScanShelf;
                action.Data.Data = CurScanShelf;
            }
            catch (Exception ex)
            {
@@ -368,6 +430,7 @@
        public override void ResetInfo()
        {
            base.ResetInfo();
            Command = null;
            CurInvItem = null;
            CurScanShelf = null;
        }

 Tiger.Business.WMS/Transaction/Out_Default.cs

@@ -35,15 +35,16 @@
        public string OrgCode { get; set; }
        public Inventory CurInvItem { get; set; }
        public ScanShelfInfo CurScanShelf { get; set; }
        public string Command { get; set; } = "Normal";
        #endregion

        #region Functions
        /// <summary>
        /// æ‰«æç‰©æ–™å¹¶å¤æ ¸ï¼Œå¦‚果是智能货架则亮灯提醒储位
        /// æ‰«æå…¥å£
        /// </summary>
        public async Task<ApiAction<DefaultScanItemOutput>> ScanItem(BaseInput input)
        public async Task<ApiAction<ScanOutput>> Scan(BaseInput input)
        {
            var action = new ApiAction<DefaultScanItemOutput>();
            var action = new ApiAction<ScanOutput>();
            try
            {
                if (input.SN.IsNullOrEmpty())
@@ -51,9 +52,31 @@
                    action.IsSuccessed = false;
                    //action.LocaleMsg = Biz.L("条码不能为空");
                    action.LocaleMsg = Biz.L("WMS.Default.ScanItem.SnEmptyFailure");
                    return action;
                    return SetOutPutMqttMsg(action, input.Locale);
                }
                //扫描物料并复核
                {
                    action = await ScanItem(input);
                }
            }
            catch (Exception ex)
            {
                //取消当前操作
                ResetInfo();
                //action.CatchExceptionWithLog(ex, $"扫描[{input.SN}]异常");
                action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.Scan.ScanException", input.SN));
            }
            return SetOutPutMqttMsg(action, input.Locale);
                }

        /// <summary>
        /// æ‰«æç‰©æ–™å¹¶å¤æ ¸ï¼Œå¦‚果是智能货架则亮灯提醒储位
        /// </summary>
        public async Task<ApiAction<ScanOutput>> ScanItem(BaseInput input)
        {
            var action = new ApiAction<ScanOutput>(new ScanOutput() { Command = Command });
            try
            {
                //解析条码
                Result<IInventory> result = WMS_ITEM_Biz.WmsItem.Get(input.SN, input.AuthOption, true);
                if (!result.IsSuccessed)
@@ -125,7 +148,7 @@
                    throw dbTran.ErrorException;
                }

                action.Data = new DefaultScanItemOutput()
                action.Data.Data = new DefaultScanItemOutput()
                {
                    SN = CurInvItem.SN,
                    ItemCode = CurInvItem.ItemInfo.ITEM_CODE,
@@ -138,13 +161,13 @@
                    ScanAfCut = CurInvItem.Warehouse.SCAN_AF_CUT
                };
                //action.LocaleMsg = Biz.L($"扫描条码[{0}]从储位[{1}]下架成功");
                action.LocaleMsg = Biz.L("WMS.Default.ScanItem.TakeDownSucceeded", action.Data.SN, action.Data.locationCode);
                action.LocaleMsg = Biz.L("WMS.Default.ScanItem.TakeDownSucceeded", CurInvItem.SN, CurInvItem.Location?.LOCATION_CODE);
            }
            catch (Exception ex)
            {
                ResetInfo();
                //action.CatchExceptionWithLog(ex, $"扫描条码[{input.SN}]复核异常");
                action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.ScanItem.ScanException", action.Data.SN));
                action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.ScanItem.ScanException", input.SN));
            }
            return action;
        }
@@ -152,9 +175,9 @@
        /// <summary>
        /// æ‰«æè´§æž¶æˆ–者储位(供亮灯货架使用)
        /// </summary>
        public async Task<ApiAction<ScanShelfInfo>> ScanShelf(string Code)
        public async Task<ApiAction<ScanOutput>> ScanShelf(string Code)
        {
            var action = new ApiAction<ScanShelfInfo>();
            var action = new ApiAction<ScanOutput>();
            try
            {
                if (Code.IsNullOrEmpty())
@@ -177,14 +200,13 @@
                    CurScanShelf.WarehouseCode = whUnit.WH_CODE;
                    CurScanShelf.RegionCode = whUnit.REGION_CODE;
                    CurScanShelf.ShelfCode = whUnit.SHELF_CODE;
                    CurScanShelf.LocationCode = whUnit.LOCATION_CODE;
                    CurScanShelf.ShelfType = whUnit.SHELF_TYPE;
                    CurScanShelf.IsSmartRack = true;
                }
                // æ‰«æå‚¨ä½ä»£ç 
                // æ‰«æåº“位代码
                else
                {
                    var nLocation = await Biz.Db.Queryable<V_WH_UNIT>().Where(t => t.LOCATION_CODE.ToUpper() == Code.ToUpper() && t.AUTH_ORG == OrgCode).FirstAsync();
                    var nLocation = await Biz.Db.Queryable<V_WH_UNIT>().Where(t => t.LOCATION_CODE.ToUpper() == Code.ToUpper() && t.AUTH_ORG == OrgCode).IncludesAllFirstLayer().FirstAsync();
                    if (nLocation == null)
                    {
                        action.IsSuccessed = false;
@@ -210,7 +232,7 @@
                    //        return action;
                    //    }
                    //}

                    CurScanShelf.Shelf = nLocation.Shelf;
                    CurScanShelf.Location = nLocation.Location;
                    CurScanShelf.WarehouseCode = nLocation.WH_CODE;
                    CurScanShelf.RegionCode = nLocation.REGION_CODE;
@@ -222,7 +244,7 @@
                CurScanShelf.IsScanShelf = true;
                //action.LocaleMsg = Biz.L("扫描货架/储位[{0}]成功");
                action.LocaleMsg = Biz.L("WMS.Default.ScanShelf.ScanSucceeded", Code);
                action.Data = CurScanShelf;
                action.Data.Data = CurScanShelf;
            }
            catch (Exception ex)
            {
@@ -242,6 +264,7 @@
        public override void ResetInfo()
        {
            base.ResetInfo();
            Command = null;
            CurInvItem = null;
            CurScanShelf = null;
        }

 Tiger.Business.WMS/Transaction/WMSTransactionBase.cs

@@ -13,6 +13,7 @@
using Newtonsoft.Json;
using Tiger.Business.WMS.Seastone;
using Tiger.IBusiness;
using Tiger.Model.Entitys.MES.Position;

namespace Tiger.Business.WMS.Transaction
{
@@ -87,8 +88,64 @@
        #endregion

        #region MQTT
        /// <summary>
        /// è®¾ç½®å½“前条码的工序信息
        /// </summary>
        public ApiAction<ScanOutput> SetOutPutMqttMsg(ApiAction<ScanOutput> action, string locale = null)
        {
            MQTT.Message msg = new()
            {
                IsSuccessed = action.IsSuccessed,
                Content = Biz.T(action.LocaleMsg, locale),
            };
            switch (action.Status)
            {
                case ApiAction.StatusCodes.Success:
                    msg.Voice = MQTT.Voice.Success;
                    msg.Color = "#FF1E90FF";
                    break;
                case ApiAction.StatusCodes.Warning:
                    msg.Voice = MQTT.Voice.Warning;
                    msg.Color = "#FFB8860B";
                    break;
                case ApiAction.StatusCodes.Error:
                case ApiAction.StatusCodes.Failed:
                    msg.Voice = MQTT.Voice.Fail;
                    msg.Color = "#FFFF0000";
                    break;
                case ApiAction.StatusCodes.Exception:
                    msg.Voice = MQTT.Voice.Fail;
                    msg.Color = "#FF8B0000";
                    break;
                case ApiAction.StatusCodes.Normal:
                case ApiAction.StatusCodes.NeedConfrim:
                case ApiAction.StatusCodes.Confrimed:
                default:
                    msg.Voice = MQTT.Voice.Silent;
                    msg.Color = "#FF000000";
                    break;
            }
            if (action.IsSuccessed)
            {
                msg.Voice = MQTT.Voice.Success;
                msg.Color = "#FF228B22";
            }
            else if (!action.IsSuccessed)
            {
                msg.Voice = MQTT.Voice.Fail;
                msg.Color = "#FFFF0000";
            }
            else
            {
                msg.Voice = MQTT.Voice.Silent;
                msg.Color = "#FF000000";
            }
            action.Data.MqttMsg = msg;
            return action;
        }

        private Thread MQTTThread;
        private void MQTT()
        private void Mqtt()
        {
            try
            {

 Tiger.Controllers.WMS/Controllers/WMSController.In_Default.cs

@@ -112,11 +112,11 @@
                    {
                        if (action.IsAsync)
                        {
                            response = action.GetResponse(await trans.ScanItem(action.Data));
                            response = action.GetResponse(await trans.Scan(action.Data));
                        }
                        else
                        {
                            lock (trans.TransLock) { response = action.GetResponse(trans.ScanItem(action.Data).Result); }
                            lock (trans.TransLock) { response = action.GetResponse(trans.Scan(action.Data).Result); }
                        }
                    }
                    else
@@ -141,45 +141,45 @@
        /// </summary>
        /// <param name="action"></param>
        /// <returns></returns>
        [HttpPost]
        [Route("api/[controller]/In_Default/ScanShelf")]
        public async Task<IActionResult> In_Default_ScanShelfAsync([FromBody] ApiAction action)
        {
            ApiAction response;
            IIn_Default trans = null;
            try
            {
                if (iBiz.WMS.Context.GetTransDic().ContainsKey(action.ID))
                {
                    trans = iBiz.WMS.Context.GetTransDic()[action.ID] as IIn_Default;
                    if (!trans.IsFinished)
                    {
                        if (action.IsAsync)
                        {
                            response = action.GetResponse(await trans.ScanShelf(action.Data?.ToString()));
                        }
                        else
                        {
                            lock (trans.TransLock) { response = action.GetResponse(trans.ScanShelf(action.Data?.ToString()).Result); }
                        }
                    }
                    else
                    {
                        response = action.GetResponse($"Transaction Error: æ ‡å‡†ä¸Šæž¶äº‹åŠ¡[ID:{action.ID}]已经关闭，请重新打开上架功能", false);
                    }
                }
                else
                {
                    response = action.GetResponse($"Transaction Error: æ ‡å‡†ä¸Šæž¶äº‹åŠ¡[ID:{action.ID}]数据丢失，请重新打开上架功能", false);
                }
            }
            catch (System.Exception ex)
            {
                response = action.GetResponse().CatchExceptionWithLog(ex);
            }
            trans?.AddHistory(Request, action);
            return Ok(response);
        }
        //[HttpPost]
        //[Route("api/[controller]/In_Default/ScanShelf")]
        //public async Task<IActionResult> In_Default_ScanShelfAsync([FromBody] ApiAction action)
        //{
        //    ApiAction response;
        //    IIn_Default trans = null;
        //    try
        //    {
        //        if (iBiz.WMS.Context.GetTransDic().ContainsKey(action.ID))
        //        {
        //            trans = iBiz.WMS.Context.GetTransDic()[action.ID] as IIn_Default;
        //            if (!trans.IsFinished)
        //            {
        //                if (action.IsAsync)
        //                {
        //                    response = action.GetResponse(await trans.ScanShelf(action.Data?.ToString()));
        //                }
        //                else
        //                {
        //                    lock (trans.TransLock) { response = action.GetResponse(trans.ScanShelf(action.Data?.ToString()).Result); }
        //                }
        //            }
        //            else
        //            {
        //                response = action.GetResponse($"Transaction Error: æ ‡å‡†ä¸Šæž¶äº‹åŠ¡[ID:{action.ID}]已经关闭，请重新打开上架功能", false);
        //            }
        //        }
        //        else
        //        {
        //            response = action.GetResponse($"Transaction Error: æ ‡å‡†ä¸Šæž¶äº‹åŠ¡[ID:{action.ID}]数据丢失，请重新打开上架功能", false);
        //        }
        //    }
        //    catch (System.Exception ex)
        //    {
        //        response = action.GetResponse().CatchExceptionWithLog(ex);
        //    }
        //    trans?.AddHistory(Request, action);
        //    return Ok(response);
        //}

    }
}

 Tiger.Controllers.WMS/Controllers/WMSController.Out_Default.cs

@@ -112,11 +112,11 @@
                    {
                        if (action.IsAsync)
                        {
                            response = action.GetResponse(await trans.ScanItem(action.Data));
                            response = action.GetResponse(await trans.Scan(action.Data));
                        }
                        else
                        {
                            lock (trans.TransLock) { response = action.GetResponse(trans.ScanItem(action.Data).Result); }
                            lock (trans.TransLock) { response = action.GetResponse(trans.Scan(action.Data).Result); }
                        }
                    }
                    else
@@ -142,45 +142,45 @@
        /// </summary>
        /// <param name="action"></param>
        /// <returns></returns>
        [HttpPost]
        [Route("api/[controller]/Out_Default/ScanShelf")]
        public async Task<IActionResult> Out_Default_ScanShelfAsync([FromBody] ApiAction action)
        {
            ApiAction response;
            IOut_Default trans = null;
            try
            {
                if (iBiz.WMS.Context.GetTransDic().ContainsKey(action.ID))
                {
                    trans = iBiz.WMS.Context.GetTransDic()[action.ID] as IOut_Default;
                    if (!trans.IsFinished)
                    {
                        if (action.IsAsync)
                        {
                            response = action.GetResponse(await trans.ScanShelf(action.Data?.ToString()));
                        }
                        else
                        {
                            lock (trans.TransLock) { response = action.GetResponse(trans.ScanShelf(action.Data?.ToString()).Result); }
                        }
                    }
                    else
                    {
                        response = action.GetResponse($"Transaction Error: æ ‡å‡†ä¸‹æž¶äº‹åŠ¡[ID:{action.ID}]已经关闭，请重新打开标准下架功能", false);
                    }
                }
                else
                {
                    response = action.GetResponse($"Transaction Error: æ ‡å‡†ä¸‹æž¶äº‹åŠ¡[ID:{action.ID}]数据丢失，请重新打开标准下架功能", false);
                }
            }
            catch (System.Exception ex)
            {
                response = action.GetResponse().CatchExceptionWithLog(ex);
            }
            trans?.AddHistory(Request, action);
            return Ok(response);
        }
        //[HttpPost]
        //[Route("api/[controller]/Out_Default/ScanShelf")]
        //public async Task<IActionResult> Out_Default_ScanShelfAsync([FromBody] ApiAction action)
        //{
        //    ApiAction response;
        //    IOut_Default trans = null;
        //    try
        //    {
        //        if (iBiz.WMS.Context.GetTransDic().ContainsKey(action.ID))
        //        {
        //            trans = iBiz.WMS.Context.GetTransDic()[action.ID] as IOut_Default;
        //            if (!trans.IsFinished)
        //            {
        //                if (action.IsAsync)
        //                {
        //                    response = action.GetResponse(await trans.ScanShelf(action.Data?.ToString()));
        //                }
        //                else
        //                {
        //                    lock (trans.TransLock) { response = action.GetResponse(trans.ScanShelf(action.Data?.ToString()).Result); }
        //                }
        //            }
        //            else
        //            {
        //                response = action.GetResponse($"Transaction Error: æ ‡å‡†ä¸‹æž¶äº‹åŠ¡[ID:{action.ID}]已经关闭，请重新打开标准下架功能", false);
        //            }
        //        }
        //        else
        //        {
        //            response = action.GetResponse($"Transaction Error: æ ‡å‡†ä¸‹æž¶äº‹åŠ¡[ID:{action.ID}]数据丢失，请重新打开标准下架功能", false);
        //        }
        //    }
        //    catch (System.Exception ex)
        //    {
        //        response = action.GetResponse().CatchExceptionWithLog(ex);
        //    }
        //    trans?.AddHistory(Request, action);
        //    return Ok(response);
        //}

    }
}

 Tiger.IBusiness.WMS/Transaction/IIn_Default.cs

@@ -13,14 +13,9 @@
        public IIn_Default Init(string id, string userCode, string apiHost, string orgCode);

        /// <summary>
        /// æ‰«æç‰©æ–™å¹¶å¤æ ¸ï¼Œå¦‚果物料已经完成移库则货架上亮灯提醒储位
        /// æ‰«æå…¥å£
        /// </summary>
        public Task<ApiAction> ScanItem(BaseInput input);

        /// <summary>
        /// æ‰«æè´§æž¶æˆ–者储位
        /// </summary>
        public Task<ApiAction<ScanShelfInfo>> ScanShelf(string Code);
        public Task<ApiAction<ScanOutput>> Scan(BaseInput input);

        public bool Close(bool needSaveHistoryLog = false);
    }

 Tiger.IBusiness.WMS/Transaction/IOut_Default.cs

@@ -11,15 +11,11 @@
    public interface IOut_Default : IWMSTransaction
    {
        public IOut_Default Init(string id, string userCode, string apiHost, string orgCode);
        /// <summary>
        /// æ‰«æç‰©æ–™å¹¶å¤æ ¸ï¼Œå¦‚果物料已经完成移库则货架上亮灯提醒储位
        /// </summary>
        public Task<ApiAction<DefaultScanItemOutput>> ScanItem(BaseInput input);

        /// <summary>
        /// æ‰«æè´§æž¶æˆ–者储位
        /// æ‰«æå…¥å£
        /// </summary>
        public Task<ApiAction<ScanShelfInfo>> ScanShelf(string Code);
        public Task<ApiAction<ScanOutput>> Scan(BaseInput input);

        public bool Close(bool needSaveHistoryLog = false);
    }

 Tiger.IBusiness/Core/ApiConfig.cs

@@ -180,7 +180,7 @@
    {
        public static IConfiguration Configuration => RheaConfig.Configuration;
        public static string DB_ModelAssembly => RheaConfig.DB_ModelAssembly;
        public static string DefaultLanguage => Configuration?["DefaultLanguage"] ?? "en-us";
        public static string DefaultLanguage => Configuration?["DefaultLanguage"] ?? "zh-cn";
        public static void InitConfig(IConfiguration _configuration, Dictionary<string, Dictionary<string, string>> language)
        {
            //Init Rhea

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

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

namespace Tiger.Model
{
    /// <summary>
    /// å®žä½“：工序行为变量
    /// </summary>
    [Description("Primary:ID")]
    [DisplayName("工序行为变量")]
    [Serializable]
    [SugarTable("MES_ROUTE_ACT_VAR")]
    public class MES_ROUTE_ACT_VAR : DbEntityWithAuth
    {
        #region æž„造函数
        /// <summary>
        /// å®žä½“：工序行为变量
        /// </summary>
        public MES_ROUTE_ACT_VAR() {}
        #endregion

        #region å…¬å…±å±žæ€§
        /// <summary>
        /// å·¥è‰ºè·¯çº¿ID
        /// </summary>
        [DisplayName("工艺路线ID")]
        public string ROT_ID { get; set; }
        /// <summary>
        /// å·¥è‰ºå·¥åºè¡Œä¸ºID
        /// </summary>
        [DisplayName("工艺工序行为ID")]
        public string ACT_ID { get; set; }
        /// <summary>
        /// è¡Œä¸ºå˜é‡ç¼–码
        /// </summary>
        [DisplayName("行为变量编码")]
        public string VAR_CODE { get; set; }
        /// <summary>
        /// è¡Œä¸ºå˜é‡åç§°
        /// </summary>
        [DisplayName("行为变量名称")]
        public string VAR_NAME { get; set; }
        /// <summary>
        /// å˜é‡çš„控件
        /// </summary>
        [DisplayName("变量的控件")]
        public string VAR_CONTROL { get; set; }
        /// <summary>
        /// å˜é‡å€¼ç±»åž‹(0String字符串|1Integer整形|2Float浮点型|3DateTime日期时间)
        /// </summary>
        [DisplayName("变量值类型(0String字符串|1Integer整形|2Float浮点型|3DateTime日期时间)")]
        public int VALUE_TYPE { get; set; }
        /// <summary>
        /// æ˜¯å¦åªè¯»(Y/N)
        /// </summary>
        [DisplayName("是否只读(Y/N)")]
        public string READONLY { get; set; }
        /// <summary>
        /// æ˜¯å¦æ˜¾ç¤º(Y/N)
        /// </summary>
        [DisplayName("是否显示(Y/N)")]
        public string VISIABLE { get; set; }
        /// <summary>
        /// é»˜è®¤å€¼
        /// </summary>
        [DisplayName("默认值")]
        public string DEFAULT { get; set; }
        /// <summary>
        /// è®¾ç½®å€¼1
        /// </summary>
        [DisplayName("设置值1")]
        public string OPTION_1 { get; set; }
        /// <summary>
        /// è®¾ç½®å€¼2
        /// </summary>
        [DisplayName("设置值2")]
        public string OPTION_2 { get; set; }
        /// <summary>
        /// è®¾ç½®å€¼3
        /// </summary>
        [DisplayName("设置值3")]
        public string OPTION_3 { get; set; }
        /// <summary>
        /// è®¾ç½®å€¼4
        /// </summary>
        [DisplayName("设置值4")]
        public string OPTION_4 { get; set; }
        /// <summary>
        /// è®¾ç½®å€¼5
        /// </summary>
        [DisplayName("设置值5")]
        public string OPTION_5 { get; set; }
        /// <summary>
        /// å¤‡æ³¨
        /// </summary>
        [DisplayName("备注")]
        public string REMARK { get; set; }
        #endregion

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

        #region å¤–键属性
        /*例子
        //一对一外键导航
        [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是MES_ROUTE_ACT_VAR类里面的外键ID字段
        public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
        //一对多外键导航
        [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_ROUTE_ACT_VARId))]//ClassA表中的MES_ROUTE_ACT_VARId
        public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
        //多对多外键导航
        [Navigate(typeof(MappingClass), nameof(MappingClass.MES_ROUTE_ACT_VARId), nameof(MappingClass.ClassAId))]//注意顺序
        public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
        */
        #endregion

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

        /// <summary>
        /// æžšä¸¾ï¼šå˜é‡å€¼ç±»åž‹(0String字符串|1Integer整形|2Float浮点型|3DateTime日期时间)
        /// </summary>
        public enum VALUE_TYPEs
        {
            [Description("字符串")]
            String = 0,
            [Description("整形")]
            Integer = 1,
            [Description("浮点型")]
            Float = 2,
            [Description("日期时间")]
            DateTime = 3,
        }
        #endregion

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

        #endregion

    }//endClass
}

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

@@ -194,6 +194,11 @@
        [DisplayName("行为操作值5")]
        public string ACT_VALUE_5 { get; set; }
        /// <summary>
        /// è¡Œä¸ºå˜é‡å­—å…¸
        /// </summary>
        [DisplayName("行为变量字典")]
        public string ACT_VAR_DIC { get; set; }
        /// <summary>
        /// è¡Œä¸ºæ˜¯å¦æˆåŠŸ(Y/N)
        /// </summary>
        [DisplayName("行为是否成功(Y/N)")]

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

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

namespace Tiger.Model
{
    /// <summary>
    /// å®žä½“：生产行为变量
    /// </summary>
    [Description("Primary:ID")]
    [DisplayName("生产行为变量")]
    [Serializable]
    [SugarTable("MES_WIP_ACT_VAR")]
    public class MES_WIP_ACT_VAR : DbEntityWithAuth
    {
        #region æž„造函数
        /// <summary>
        /// å®žä½“：生产行为变量
        /// </summary>
        public MES_WIP_ACT_VAR() {}
        #endregion

        #region å…¬å…±å±žæ€§
        /// <summary>
        /// åœ¨åˆ¶å“ID
        /// </summary>
        [DisplayName("在制品ID")]
        public string WIP_ID { get; set; }
        /// <summary>
        /// ç”Ÿäº§è¿‡ç¨‹è®°å½•ID
        /// </summary>
        [DisplayName("生产过程记录ID")]
        public string HIS_ID { get; set; }
        /// <summary>
        /// è¿‡ç«™æ¡ç 
        /// </summary>
        [DisplayName("过站条码")]
        public string SN { get; set; }
        /// <summary>
        /// ç‰©æ–™ç¼–码
        /// </summary>
        [DisplayName("物料编码")]
        public string ITEM_CODE { get; set; }
        /// <summary>
        /// å·¥å•å·
        /// </summary>
        [DisplayName("工单号")]
        public string WORK_ORDER { get; set; }
        /// <summary>
        /// å·¥å•æ‰¹æ¬¡å·
        /// </summary>
        [DisplayName("工单批次号")]
        public string BATCH_NO { get; set; }
        /// <summary>
        /// å®¢æˆ·ç¼–码
        /// </summary>
        [DisplayName("客户编码")]
        public string CUST_CODE { get; set; }
        /// <summary>
        /// å·¥è‰ºè·¯çº¿ç¼–码
        /// </summary>
        [DisplayName("工艺路线编码")]
        public string ROT_CODE { get; set; }
        /// <summary>
        /// å·¥è‰ºè·¯çº¿èŠ‚点ID
        /// </summary>
        [DisplayName("工艺路线节点ID")]
        public string NODE_ID { get; set; }
        /// <summary>
        /// å·¥è‰ºè·¯çº¿èŠ‚点名称
        /// </summary>
        [DisplayName("工艺路线节点名称")]
        public string NODE_NAME { get; set; }
        /// <summary>
        /// å·¥å•è¡Œä¸ºèŠ‚点ID
        /// </summary>
        [DisplayName("工单行为节点ID")]
        public string ACT_ID { get; set; }
        /// <summary>
        /// è¡Œä¸ºåç§°
        /// </summary>
        [DisplayName("行为名称")]
        public string ACT_NAME { get; set; }
        /// <summary>
        /// å·¥åŽ‚编码
        /// </summary>
        [DisplayName("工厂编码")]
        public string FTY_CODE { get; set; }
        /// <summary>
        /// è½¦é—´ç¼–码
        /// </summary>
        [DisplayName("车间编码")]
        public string WS_CODE { get; set; }
        /// <summary>
        /// äº§çº¿ç¼–码
        /// </summary>
        [DisplayName("产线编码")]
        public string LINE_CODE { get; set; }
        /// <summary>
        /// å²—位编码
        /// </summary>
        [DisplayName("岗位编码")]
        public string POST_CODE { get; set; }
        /// <summary>
        /// å·¥åºç¼–码
        /// </summary>
        [DisplayName("工序编码")]
        public string OPER_CODE { get; set; }
        /// <summary>
        /// åŠ å·¥æ®µ
        /// </summary>
        [DisplayName("加工段")]
        public string SEGMENT { get; set; }
        /// <summary>
        /// åŽ‚内流转条码
        /// </summary>
        [DisplayName("厂内流转条码")]
        public string FLOW_SN { get; set; }
        /// <summary>
        /// æ‰˜ç›˜/载具条码
        /// </summary>
        [DisplayName("托盘/载具条码")]
        public string TRAY_SN { get; set; }
        /// <summary>
        /// å†…包装条码
        /// </summary>
        [DisplayName("内包装条码")]
        public string INNER_SN { get; set; }
        /// <summary>
        /// å¤–箱条码
        /// </summary>
        [DisplayName("外箱条码")]
        public string CARTON_SN { get; set; }
        /// <summary>
        /// æ ˆæ¿æ¡ç 
        /// </summary>
        [DisplayName("栈板条码")]
        public string PALLET_SN { get; set; }
        /// <summary>
        /// å½“前操作时间
        /// </summary>
        [DisplayName("当前操作时间")]
        public DateTime OPERATION_TIME { get; set; } = DateTime.MinValue;
        /// <summary>
        /// ç­åˆ¶ç¼–码
        /// </summary>
        [DisplayName("班制编码")]
        public string SFTS_CODE { get; set; }
        /// <summary>
        /// ç­æ¬¡ç¼–码
        /// </summary>
        [DisplayName("班次编码")]
        public string SFT_CODE { get; set; }
        /// <summary>
        /// æ—¶æ®µç¼–码
        /// </summary>
        [DisplayName("时段编码")]
        public string PRD_CODE { get; set; }
        /// <summary>
        /// è¡Œä¸ºå˜é‡ç¼–码
        /// </summary>
        [DisplayName("行为变量编码")]
        public string VAR_CODE { get; set; }
        /// <summary>
        /// è¡Œä¸ºå˜é‡åç§°
        /// </summary>
        [DisplayName("行为变量名称")]
        public string VAR_NAME { get; set; }
        /// <summary>
        /// å˜é‡çš„控件
        /// </summary>
        [DisplayName("变量的控件")]
        public string VAR_CONTROL { get; set; }
        /// <summary>
        /// å˜é‡å€¼ç±»åž‹(0String字符串|1Integer整形|2Float浮点型|3DateTime日期时间)
        /// </summary>
        [DisplayName("变量值类型(0String字符串|1Integer整形|2Float浮点型|3DateTime日期时间)")]
        public int VALUE_TYPE { get; set; }
        /// <summary>
        /// è¾“入值
        /// </summary>
        [DisplayName("输入值")]
        public string INPUT_VALUE { get; set; }
        /// <summary>
        /// æ“ä½œå€¼1
        /// </summary>
        [DisplayName("操作值1")]
        public string VALUE_1 { get; set; }
        /// <summary>
        /// æ“ä½œå€¼2
        /// </summary>
        [DisplayName("操作值2")]
        public string VALUE_2 { get; set; }
        /// <summary>
        /// æ“ä½œå€¼3
        /// </summary>
        [DisplayName("操作值3")]
        public string VALUE_3 { get; set; }
        /// <summary>
        /// æ“ä½œå€¼4
        /// </summary>
        [DisplayName("操作值4")]
        public string VALUE_4 { get; set; }
        /// <summary>
        /// æ“ä½œå€¼5
        /// </summary>
        [DisplayName("操作值5")]
        public string VALUE_5 { get; set; }
        /// <summary>
        /// å¤‡æ³¨
        /// </summary>
        [DisplayName("备注")]
        public string REMARK { get; set; }
        /// <summary>
        /// è¿½æº¯ä¿¡æ¯
        /// </summary>
        [DisplayName("追溯信息")]
        public string TRACE_INFO { get; set; }
        #endregion

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

        #region å¤–键属性
        /*例子
        //一对一外键导航
        [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是MES_WIP_ACT_VAR类里面的外键ID字段
        public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
        //一对多外键导航
        [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_WIP_ACT_VARId))]//ClassA表中的MES_WIP_ACT_VARId
        public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
        //多对多外键导航
        [Navigate(typeof(MappingClass), nameof(MappingClass.MES_WIP_ACT_VARId), nameof(MappingClass.ClassAId))]//注意顺序
        public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
        */
        #endregion

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

        /// <summary>
        /// æžšä¸¾ï¼šå˜é‡å€¼ç±»åž‹(0String字符串|1Integer整形|2Float浮点型|3DateTime日期时间)
        /// </summary>
        public enum VALUE_TYPEs
        {
            [Description("字符串")]
            String = 0,
            [Description("整形")]
            Integer = 1,
            [Description("浮点型")]
            Float = 2,
            [Description("日期时间")]
            DateTime = 3,
        }
        #endregion

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

        #endregion

    }//endClass
}

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

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

namespace Tiger.Model
{
    /// <summary>
    /// å®žä½“：工单行为变量
    /// </summary>
    [Description("Primary:ID")]
    [DisplayName("工单行为变量")]
    [Serializable]
    [SugarTable("MES_WO_ACT_VAR")]
    public class MES_WO_ACT_VAR : DbEntityWithAuth
    {
        #region æž„造函数
        /// <summary>
        /// å®žä½“：工单行为变量
        /// </summary>
        public MES_WO_ACT_VAR() {}
        #endregion

        #region å…¬å…±å±žæ€§
        /// <summary>
        /// å…³è”工单号
        /// </summary>
        [DisplayName("关联工单号")]
        public string WORK_ORDER { get; set; }
        /// <summary>
        /// äº§å“ç¼–码
        /// </summary>
        [DisplayName("产品编码")]
        public string PROD_CODE { get; set; }
        /// <summary>
        /// å®¢æˆ·ç¼–码
        /// </summary>
        [DisplayName("客户编码")]
        public string CUST_CODE { get; set; }
        /// <summary>
        /// å·¥å•è¡Œä¸ºèŠ‚点ID
        /// </summary>
        [DisplayName("工单行为节点ID")]
        public string ACT_ID { get; set; }
        /// <summary>
        /// è¡Œä¸ºå˜é‡ç¼–码
        /// </summary>
        [DisplayName("行为变量编码")]
        public string VAR_CODE { get; set; }
        /// <summary>
        /// è¡Œä¸ºå˜é‡åç§°
        /// </summary>
        [DisplayName("行为变量名称")]
        public string VAR_NAME { get; set; }
        /// <summary>
        /// å˜é‡çš„控件
        /// </summary>
        [DisplayName("变量的控件")]
        public string VAR_CONTROL { get; set; }
        /// <summary>
        /// å˜é‡å€¼ç±»åž‹(0String字符串|1Integer整形|2Float浮点型|3DateTime日期时间)
        /// </summary>
        [DisplayName("变量值类型(0String字符串|1Integer整形|2Float浮点型|3DateTime日期时间)")]
        public int VALUE_TYPE { get; set; }
        /// <summary>
        /// æ˜¯å¦åªè¯»(Y/N)
        /// </summary>
        [DisplayName("是否只读(Y/N)")]
        public string READONLY { get; set; }
        /// <summary>
        /// æ˜¯å¦æ˜¾ç¤º(Y/N)
        /// </summary>
        [DisplayName("是否显示(Y/N)")]
        public string VISIABLE { get; set; }
        /// <summary>
        /// é»˜è®¤å€¼
        /// </summary>
        [DisplayName("默认值")]
        public string DEFAULT { get; set; }
        /// <summary>
        /// è®¾ç½®å€¼1
        /// </summary>
        [DisplayName("设置值1")]
        public string OPTION_1 { get; set; }
        /// <summary>
        /// è®¾ç½®å€¼2
        /// </summary>
        [DisplayName("设置值2")]
        public string OPTION_2 { get; set; }
        /// <summary>
        /// è®¾ç½®å€¼3
        /// </summary>
        [DisplayName("设置值3")]
        public string OPTION_3 { get; set; }
        /// <summary>
        /// è®¾ç½®å€¼4
        /// </summary>
        [DisplayName("设置值4")]
        public string OPTION_4 { get; set; }
        /// <summary>
        /// è®¾ç½®å€¼5
        /// </summary>
        [DisplayName("设置值5")]
        public string OPTION_5 { get; set; }
        /// <summary>
        /// å¤‡æ³¨
        /// </summary>
        [DisplayName("备注")]
        public string REMARK { get; set; }
        #endregion

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

        #region å¤–键属性
        /*例子
        //一对一外键导航
        [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是MES_WO_ACT_VAR类里面的外键ID字段
        public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
        //一对多外键导航
        [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_WO_ACT_VARId))]//ClassA表中的MES_WO_ACT_VARId
        public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
        //多对多外键导航
        [Navigate(typeof(MappingClass), nameof(MappingClass.MES_WO_ACT_VARId), nameof(MappingClass.ClassAId))]//注意顺序
        public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
        */
        #endregion

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

        /// <summary>
        /// æžšä¸¾ï¼šå˜é‡å€¼ç±»åž‹(0String字符串|1Integer整形|2Float浮点型|3DateTime日期时间)
        /// </summary>
        public enum VALUE_TYPEs
        {
            [Description("字符串")]
            String = 0,
            [Description("整形")]
            Integer = 1,
            [Description("浮点型")]
            Float = 2,
            [Description("日期时间")]
            DateTime = 3,
        }
        #endregion

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

        #endregion

    }//endClass
}

 Tiger.Model.Net/Entitys/WMS/Api/BaseInput.cs

@@ -2,53 +2,6 @@

namespace Tiger.Model
{
    public class BaseInput
    {
        /// <summary>
        ///
        /// </summary>
        public AuthOption AuthOption { get; set; }

        /// <summary>
        /// æ¡ç 
        /// </summary>
        public string SN { get; set; }

        /// <summary>
        /// æµ·å…³å•å·
        /// </summary>
        public string CustomsNo { get; set; }
    }

    public class BasePageInput
    {
        public AuthOption AuthOption { get; set; }
        public int pageIndex { get; set; }
        public int pageSize { get; set; }
        public int total { get; set; }
        public string Code { get; set; }
    }

    public class BasePageOutput<T>
    {
        public List<T> data { get; set; }
        public int total { get; set; }
    }

    public class BaseCodeInput
    {
        public AuthOption AuthOption { get; set; }
        public string Code { get; set; }
    }

    public class OutOthDtlInput : BasePageInput
    {
        public bool IsItemCodeList { get; set; }
    }

    public class OutWoDtlInput : BasePageInput
    {
        public bool IsItemCodeList { get; set; }
    }

}

 Tiger.Model.Net/Entitys/WMS/Api/Input_Entitys.cs

@@ -8,20 +8,62 @@

namespace Tiger.Model
{
    public class ScanShelfInfo
    public class BaseInput
    {
        public string WarehouseCode { get; set; }
        public string RegionCode { get; set; }
        public string ShelfCode { get; set; }
        public string LocationCode { get; set; }
        public string RackCode => ShelfCode;
        public bool IsSmartRack { get; set; }
        public decimal Capacity { get; set; }
        public int LotCount { get; set; }
        public decimal MaxSize { get; set; }
        public int ShelfType { get; set; }
        public bool IsScanShelf { get; set; }
        public WMS_SHELF Shelf { get; set; }
        public WMS_LOCATION Location { get; set; }
        /// <summary>
        /// æ•°æ®åº“授权查询选项
        /// </summary>
        public AuthOption AuthOption { get; set; }
        /// <summary>
        /// å®¢æˆ·ç«¯æ˜¾ç¤ºçš„语言
        /// </summary>
        public string Locale { get; set; }
        /// <summary>
        /// æ“ä½œæŒ‡ä»¤
        /// </summary>
        public string Command { get; set; }
        /// <summary>
        /// æ¡ç 
        /// </summary>
        public string SN { get; set; }
        /// <summary>
        /// å½“前操作需要提交的选项
        /// </summary>
        public Dictionary<string, string> Options { get; set; } = new Dictionary<string, string>();
        /// <summary>
        /// å½“前操作需要提交的数据
        /// </summary>
        public string Data { get; set; }
    }

    public class BasePageInput
    {
        public AuthOption AuthOption { get; set; }
        public int pageIndex { get; set; }
        public int pageSize { get; set; }
        public int total { get; set; }
        public string Code { get; set; }
    }

    public class BasePageOutput<T>
    {
        public List<T> data { get; set; }
        public int total { get; set; }
    }

    public class BaseCodeInput
    {
        public AuthOption AuthOption { get; set; }
        public string Code { get; set; }
    }

    public class OutOthDtlInput : BasePageInput
    {
        public bool IsItemCodeList { get; set; }
    }

    public class OutWoDtlInput : BasePageInput
    {
        public bool IsItemCodeList { get; set; }
    }
}

 Tiger.Model.Net/Entitys/WMS/Api/Output_Entitys.cs

@@ -4,10 +4,49 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Tiger.Model.Entitys.MES.Position;
using Tiger.Model.Minsun;

namespace Tiger.Model
{
    public class ScanOutput<T>
    {
        /// <summary>
        /// æ“ä½œæŒ‡ä»¤
        /// </summary>
        public string Command { get; set; }
        /// <summary>
        /// Mqtt消息
        /// </summary>
        public MQTT.Message MqttMsg { get; set; }
        /// <summary>
        /// å½“前操作返回的数据
        /// </summary>
        public T Data { get; set; }
    }

    public class ScanOutput : ScanOutput<object>
    {

    }

    public class ScanShelfInfo
    {
        public string WarehouseCode { get; set; }
        public string RegionCode { get; set; }
        public string ShelfCode { get; set; }
        public string LocationCode { get; set; }
        public string RackCode => ShelfCode;
        public bool IsSmartRack { get; set; }
        public decimal Capacity { get; set; }
        public int LotCount { get; set; }
        public decimal MaxSize { get; set; }
        public int ShelfType { get; set; }
        public bool IsScanShelf { get; set; }
        public WMS_SHELF Shelf { get; set; }
        public WMS_LOCATION Location { get; set; }
    }

    public class DefaultScanItemOutput
    {
        public int ReqType { get; set; }
@@ -24,7 +63,6 @@
        public string ScanAfCut { get; set; }
        public string Unit { get; set; }
        public DateTime DateCode { get; set; }
        public string Message { get; set; }
    }

    public class DefaultInStoreOutput

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

@@ -80,6 +80,9 @@
    <Compile Include="DTO\MESDTO.cs" />
    <Compile Include="Entitys\MES\ParameterEntity\BizPrintInstoreDocParameter.cs" />
    <Compile Include="Entitys\BAS\BAS_ITEM_DOC.cs" />
    <Compile Include="Entitys\MES\YadaU9\mes_Bin.cs" />
    <Compile Include="Entitys\MES\YadaU9\mes_MaterialBarCode.cs" />
    <Compile Include="Entitys\MES\YadaU9\mes_Wh.cs" />
    <Compile Include="Entitys\MQTTEntity.cs" />
    <Compile Include="Entitys\Api\Base.cs" />
    <Compile Include="Entitys\Automate\SNInfo.cs" />