退料单(U9)上架事务

Rodney Chen

昨天 21cce90e8d660954f0b89bfe25b9f5218dcbaacd

退料单(U9)上架事务

 Tiger.Api/Language.db

Binary files differ

 Tiger.Business.WMS/Transaction/Yada/In_BIZ_U9_RECEIPT.cs

@@ -70,7 +70,7 @@
                        action.LocaleMsg = Biz.L("WMS.Default.ScanItem.SnEmptyFailure");
                        return SetOutPutMqttMsg(action, input.Locale);
                    }
                    //判断扫描的是否货架
                    //判断扫描的是否货架/储位
                    var whUnit = await MainDB.Queryable<V_WH_UNIT>().Where(t => (t.SHELF_CODE.ToUpper() == input.SN || t.LOCATION_CODE.ToUpper() == input.SN) && t.AUTH_ORG == OrgCode).IncludesAllFirstLayer().FirstAsync();
                    //if (string.IsNullOrEmpty(CurScanShelf?.ShelfCode))
                    if (!whUnit.IsNullOrEmpty() || string.IsNullOrEmpty(CurScanShelf?.ShelfCode))

 Tiger.Business.WMS/Transaction/Yada/In_BIZ_U9_RETURN.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,543 @@
using Rhea.Common;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Tiger.Model;
using Tiger.IBusiness;
using Tiger.Model.Sharetronic.Shelf;
using Tiger.Business.WMS.Sharetronic.Shelf;

namespace Tiger.Business.WMS.Transaction
{
    /// <summary>
    /// é€€æ–™å•(U9)上架事务
    /// </summary>
    public class In_BIZ_U9_RETURN : WmsTask, IIn_BIZ_U9_RETURN
    {
        public IIn_BIZ_U9_RETURN Init(string id, string userCode, string apiHost, string orgCode)
        {
            base.Init(id, userCode, apiHost, orgCode);
            Logger.Console.Info($"Start {this.GetType().Name} Transaction[ID: {TransID}]");
            return this;
        }

        #region Propertys & Variables
        public BIZ_U9_RETURN CurOrder { get; set; }
        #endregion

        #region Functions
        /// <summary>
        /// æ‰«æå…¥å£
        /// </summary>
        public async Task<ApiAction<ScanOutput>> Scan(BaseInput input)
        {
            var action = new ApiAction<ScanOutput>(new ScanOutput());
            try
            {
                if (input.Command == "ScanOrder")
                {
                    var inputOrder = new BaseInput<BIZ_U9_RETURN>(input);
                    if (inputOrder.Data?.ORDER_NO == null)
                    {
                        action.IsSuccessed = false;
                        //action.LocaleMsg = Biz.L("选择的单号不能为空");
                        action.LocaleMsg = Biz.L("WMS.Default.ScanOrder.OrderNoEmptyFailure");
                        return SetOutPutMqttMsg(action, input.Locale);
                    }
                    action = await ScanOrder(inputOrder);
                }
                else
                {
                    if (CurOrder.IsNullOrEmpty())
                    {
                        action.IsSuccessed = false;
                        //action.LocaleMsg = Biz.L("上架前请先选择需要上架的退料单");
                        action.LocaleMsg = Biz.L("WMS.In_BIZ_U9_RETURN.ScanItem.NoScanOrder");
                        action.Data.Command = "ScanOrder";
                        return SetOutPutMqttMsg(action, input.Locale);
                    }
                    if (input.SN.IsNullOrEmpty())
                    {
                        action.IsSuccessed = false;
                        //action.LocaleMsg = Biz.L("条码不能为空");
                        action.LocaleMsg = Biz.L("WMS.Default.ScanItem.SnEmptyFailure");
                        return SetOutPutMqttMsg(action, input.Locale);
                    }
                    //判断扫描的是否货架/储位
                    var whUnit = await MainDB.Queryable<V_WH_UNIT>().Where(t => (t.SHELF_CODE.ToUpper() == input.SN || t.LOCATION_CODE.ToUpper() == input.SN) && t.AUTH_ORG == OrgCode).IncludesAllFirstLayer().FirstAsync();
                    if (!whUnit.IsNullOrEmpty() || string.IsNullOrEmpty(CurScanShelf?.ShelfCode))
                    {
                        action = await ScanShelf(input.SN, whUnit);
                    }
                    else//扫描物料并复核
                    {
                        action = await ScanItem(input);
                    }
                }
            }
            catch (Exception ex)
            {
                //取消当前操作
                ResetTrans();
                //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>> ScanOrder(BaseInput<BIZ_U9_RETURN> input)
        {
            var action = new ApiAction<ScanOutput>(new ScanOutput());
            try
            {
                var returnOrder = await MainDB.Queryable<BIZ_U9_RETURN>().Where(q => q.ORDER_NO == input.Data.ORDER_NO).Includes(q => q.Details, d => d._ItemInfos).IncludesAllFirstLayer().FirstAsync();
                if (returnOrder.IsNullOrEmpty())
                {
                    action.IsSuccessed = false;
                    //action.LocaleMsg = Biz.L("找不到退料单[{0}]的信息，请重新选择正确的退料单");
                    action.LocaleMsg = Biz.L("WMS.In_BIZ_U9_RETURN.ScanOrder.ReturnNotExists", input.Data.ORDER_NO);
                    return SetOutPutMqttMsg(action, input.Locale);
                }
                action.Data.Command = "Normal";
                action.Data.Data = CurOrder = returnOrder;
            }
            catch (Exception ex)
            {
                //取消当前操作
                ResetTrans();
                //action.CatchExceptionWithLog(ex, $"选择退料单异常(Data: {0})");
                action.CatchExceptionWithLog(ex, Biz.L("WMS.In_BIZ_U9_RETURN.ScanOrderException", input?.Data));
            }
            return action;
        }

        /// <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 = GetInventory(input.SN, input.AuthOption, true);
                    if (!result.IsSuccessed)
                    {
                        action.IsSuccessed = false;
                        action.LocaleMsg = result.LocaleMsg;
                        return SetOutPutMqttMsg(action, input.Locale);
                    }
                    var inv = result.Data as Inventory;

                    //验证条码是否正确
                    if (!inv.isNormalStatus || inv.Status != WMS_ITEM.STATUSs.WaitIn)
                    {
                        action.IsSuccessed = false;
                        //action.LocaleMsg = Biz.L("状态[{0}]异常，请重新扫描");
                        action.LocaleMsg = Biz.L("WMS.Default.ScanItem.StatusException", string.Join(',', inv.StatusList.Select(q => q.GetDesc())));
                        return SetOutPutMqttMsg(action, input.Locale);
                    }
                    //物料验证
                    if (inv.ItemInfo.IsNullOrEmpty() || inv.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));
                        return SetOutPutMqttMsg(action, input.Locale);
                    }
                    //默认储位验证
                    if (!inv.ItemInfo.DEFAULT_LOCATION.IsNullOrEmpty() && inv.ItemInfo.DEFAULT_LOCATION != CurScanShelf.LocationCode)
                    {
                        action.IsSuccessed = false;
                        //action.LocaleMsg = Biz.L("物料[{0}]只允许上架到储位[{1}]，请重新扫描储位");
                        action.LocaleMsg = Biz.L("WMS.Default.ScanItem.DefaultLocationError", inv.ItemInfo.ITEM_CODE, inv.ItemInfo.DEFAULT_LOCATION);
                        return SetOutPutMqttMsg(action, input.Locale);
                    }
                    //判断当前条码是否属于当前退料单
                    if (inv.Items.First().TRANS_NO != CurOrder.ORDER_NO)
                    {
                        action.IsSuccessed = false;
                        //action.LocaleMsg = Biz.L("条码所属的单据[{0}]不是选择的退料单[{1}]，请重新扫描正确的条码或选择其他退料单");
                        action.LocaleMsg = Biz.L("WMS.In_BIZ_U9_RETURN.ScanItem.NotCurOrder", CurInvItem.Items.First().TRANS_NO, CurOrder.ORDER_NO);
                        return SetOutPutMqttMsg(action, input.Locale);
                    }
                    CurInvItem = inv;
                }

                var returnOrder = await MainDB.Queryable<BIZ_U9_RETURN>().Where(q => q.ORDER_NO == CurOrder.ORDER_NO).Includes(q => q.Details, d => d._ItemInfos).IncludesAllFirstLayer().FirstAsync();
                var returnDtl = returnOrder.Details.First(q => q.LINE_NO == CurInvItem.Items.First().TRANS_LINE);
                if (returnDtl.STATUS > BIZ_U9_RETURN.STATUSs.Storing.GetValue())
                {
                    action.IsSuccessed = false;
                    //action.LocaleMsg = Biz.L("退料单中行[{0}]状态[{1}]异常，请扫描正确的条码");
                    action.LocaleMsg = Biz.L("WMS.In_BIZ_U9_RETURN.ScanItem.ReturnDtlStatusException", returnDtl.LINE_NO, returnDtl.STATUS.GetEnumDesc<BIZ_U9_RETURN.STATUSs>());
                    return SetOutPutMqttMsg(action, input.Locale);
                }
                var returnSn = returnOrder.SnList.Where(q => CurInvItem.Items.Any(i => i.SN == q.SN)).ToList();
                if (returnSn.Any(q => q.STATUS != WMS_ITEM.STATUSs.WaitIn.GetValue()))
                {
                    action.IsSuccessed = false;
                    //action.LocaleMsg = Biz.L("退料单中条码[{0}]状态[{1}]异常，请扫描正确的条码");
                    action.LocaleMsg = Biz.L("WMS.In_BIZ_U9_RETURN.ScanItem.ReturnSnStatusException", CurInvItem.SN, returnSn.First(q => q.STATUS != WMS_ITEM.STATUSs.WaitIn.GetValue()).STATUS.GetEnumDesc<WMS_ITEM.STATUSs>());
                    return SetOutPutMqttMsg(action, input.Locale);
                }

                var nLocation = new WMS_LOCATION();
                // åˆ¤æ–­æ˜¯å¦æ™ºèƒ½è´§æž¶
                if (CurScanShelf.Shelf.IsLightShelf)
                {
                    ShelfApiResult shelfApiResult = await Share.Shelf.PutOn(TransID, CurScanShelf.Shelf, CurInvItem.Items[0]);
                    if (!shelfApiResult.IsSuccess)
                    {
                        action.IsSuccessed = false;
                        action.LocaleMsg = Biz.L(shelfApiResult.GetData<string>());
                        return SetOutPutMqttMsg(action, input.Locale);
                    }
                    var reaultShelf = shelfApiResult.GetData<ShelfChangeModel>();

                    nLocation = reaultShelf.GetLocation();
                    if (nLocation == null)
                    {
                        action.IsSuccessed = false;
                        //action.LocaleMsg = Biz.L($"货架[{0}]中不存在id为[{1}]的储位，请先维护货架信息");
                        action.LocaleMsg = Biz.L("WMS.Default.ScanItem.LocationNotExistsInShelf", CurScanShelf.Shelf.SHELF_CODE, reaultShelf.ledAddr);
                        return SetOutPutMqttMsg(action, input.Locale);
                    }
                    var locationData = MainDB.Queryable<WMS_ITEM>().Where(q => q.LOCATION_ID == nLocation.ID).First();
                    if (!locationData.IsNullOrEmpty())
                    {
                        action.IsSuccessed = false;
                        //action.LocaleMsg = Biz.L("储位[{0}]已存有物料[{1}]，请检查系统库存信息");
                        action.LocaleMsg = Biz.L($"WMS.Default.ScanShelf.ItemAlreadyExistsInLocation", nLocation.LOCATION_CODE, locationData.SN);
                        return SetOutPutMqttMsg(action, input.Locale);
                    }
                    CurScanShelf.Location = nLocation;
                    CurScanShelf.LocationCode = nLocation.LOCATION_CODE;
                }
                else
                {
                    if (CurScanShelf.LocationCode.IsNullOrEmpty() || CurScanShelf.WarehouseCode.IsNullOrEmpty())
                    {
                        action.IsSuccessed = false;
                        //action.LocaleMsg = Biz.L("请输入或扫描有效的货架/储位码");
                        action.LocaleMsg = Biz.L("WMS.Default.ScanShelf.ShelfCanNotEmpty");
                        return SetOutPutMqttMsg(action, input.Locale);
                    }

                    nLocation = await MainDB.Queryable<WMS_LOCATION>().Where(t => t.LOCATION_CODE == CurScanShelf.LocationCode && t.AUTH_ORG == OrgCode).FirstAsync();
                }

                //判断储位是否单放
                if (nLocation.IS_SINGLE == "Y" && CurInvItem.Items.Count > 1)
                {
                    action.IsSuccessed = false;
                    //action.LocaleMsg = Biz.L("储位[{0}]只能存放一个物料");
                    action.LocaleMsg = Biz.L("WMS.Default.ScanItem.LocationSingleFailure", nLocation.LOCATION_CODE);
                    ResetTrans();
                    return SetOutPutMqttMsg(action, input.Locale);
                }

                CurOrder = returnOrder;

                //执行上架数据处理
                foreach (var item in CurInvItem.Items)
                {
                    item.IS_LOCKED = "Y";
                    item.SOURCE_CODE = item.TRANS_CODE;
                    item.SOURCE_ORDER = item.TRANS_NO;
                    item.SOURCE_LINE = item.TRANS_LINE;
                    item.TRANS_CODE = nameof(BIZ_U9_RETURN);
                    item.TRANS_NO = returnOrder.ORDER_NO;
                    item.TRANS_LINE = returnDtl.LINE_NO;
                    item.PROD_DATE = item.PROD_DATE < new DateTime(2000, 1, 1) ? DateTime.Now : item.PROD_DATE;
                    item.FIRST_IN_DATE = item.FIRST_IN_DATE < new DateTime(2000, 1, 1) ? DateTime.Now : item.FIRST_IN_DATE;
                }
                foreach (var item in CurInvItem.Packages)
                {
                    item.SOURCE_CODE = item.TRANS_CODE;
                    item.SOURCE_ORDER = item.TRANS_NO;
                    item.SOURCE_LINE = item.TRANS_LINE;
                    item.TRANS_CODE = nameof(BIZ_U9_RETURN);
                    item.TRANS_NO = returnOrder.ORDER_NO;
                    item.TRANS_LINE = returnDtl.LINE_NO;
                }
                Result putonResult = PutOn(input.AuthOption, nLocation.LOCATION_CODE);
                if (!putonResult.IsSuccessed)
                {
                    action.IsSuccessed = false;
                    action.LocaleMsg = putonResult.LocaleMsg;
                    ResetTrans();
                    return SetOutPutMqttMsg(action, input.Locale);
                }

                //更新单据信息
                foreach (var sn in returnSn)
                {
                    sn.STATUS = WMS_ITEM.STATUSs.InStore.GetValue();
                    sn.IS_IN = "Y";
                }
                //如果当前行上架完成标记为待审核
                returnDtl.QTY_IN = returnOrder.SnList.Where(q => q.LINE_NO == returnDtl.LINE_NO && q.STATUS == WMS_ITEM.STATUSs.InStore.GetValue()).Sum(q => q.QTY);
                if (returnDtl.QTY_IN == returnDtl.QTY)
                {
                    returnDtl.STATUS = BIZ_U9_RETURN.STATUSs.Review.GetValue();
                    //当前单据明细行已经全部上架完成，可以调用U9审核接口，如果审核失败则报错，最后一个上架失败
                    //var iInput = new SubmitLineInput
                    //{
                    //    userId = UserCode,
                    //    IsLogin = true,
                    //    param = new()
                    //    {
                    //        RcvLineID = receiptDtl.ID,
                    //        RcvDocNo = receiptDtl.ORDER_NO,
                    //        DocLineNo = receiptDtl.LINE_NO,
                    //        OrgCode = receiptDtl.AUTH_ORG,
                    //    }
                    //};
                    //var result = await DI.Resolve<IWMS_U9C>().ReceivementApproveLine(iInput);
                    //if (!result.IsSuccessed)
                    //{
                    //    action.IsSuccessed = false;
                    //    action.LocaleMsg = result.LocaleMsg;
                    //    return SetOutPutMqttMsg(action, input.Locale);
                    //}
                    //else
                    //{
                    //    receiptDtl.STATUS = BIZ_U9_RECEIPT.STATUSs.Finished.GetValue();
                    //}
                }
                else
                {
                    returnDtl.STATUS = BIZ_U9_RETURN.STATUSs.Storing.GetValue();
                }
                //更新单据状态
                if (returnOrder.Details.Any(q => q.STATUS < BIZ_U9_RETURN.STATUSs.Review.GetValue()))
                {
                    returnOrder.STATUS = BIZ_U9_RETURN.STATUSs.Storing.GetValue();
                }
                else if (returnOrder.Details.Any(q => q.STATUS < BIZ_U9_RETURN.STATUSs.Finished.GetValue()))
                {
                    returnOrder.STATUS = BIZ_U9_RETURN.STATUSs.Review.GetValue();
                }
                else
                {
                    returnOrder.STATUS = BIZ_U9_RETURN.STATUSs.Finished.GetValue();
                }

                //创建变量克隆对象用于传入DBSubmitAction中保存当前需要暂存的数据值
                var _returnOrder = returnOrder.Clone();
                AddCommitAction("Return", () =>
                {
                    //使用统一的事务DB对象
                    var db = GetCommitDB();
                    //数据保存逻辑
                    db.Updateable(returnOrder, UserCode).UpdateColumns(q => new { q.STATUS, q.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
                    db.Updateable(returnDtl, UserCode).UpdateColumns(q => new { q.STATUS, q.QTY_IN, q.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
                    db.Updateable(returnSn, UserCode).UpdateColumns(q => new { q.STATUS, q.IS_IN, q.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
                });

                //完成所有处理后使用事务保存数据
                action = DoIfFinish(action, input.Locale);
            }
            catch (Exception ex)
            {
                //取消当前操作
                ResetTrans();
                //action.CatchExceptionWithLog(ex, $"扫描条码[{input.SN}]复核异常");
                action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.ScanItem.ScanException", input.SN));
            }
            return SetOutPutMqttMsg(action, input.Locale);
        }

        /// <summary>
        /// æ‰«æè´§æž¶æˆ–者储位
        /// </summary>
        public async Task<ApiAction<ScanOutput>> ScanShelf(string Code, V_WH_UNIT whUnit)
        {
            var action = new ApiAction<ScanOutput>(new ScanOutput() { Command = Command });
            try
            {
                if (Code.IsNullOrEmpty())
                {
                    action.IsSuccessed = false;
                    //action.LocaleMsg = Biz.L("请输入或扫描有效的货架/储位码");
                    action.LocaleMsg = Biz.L("WMS.Default.ScanShelf.ShelfCanNotEmpty");
                    return action;
                }
                if (!CurOrder.Details.Any(q => q.ItemInfo.DEFAULT_LOCATION.IsNullOrEmpty() || q.ItemInfo.DEFAULT_LOCATION == Code))
                {
                    action.IsSuccessed = false;
                    //action.LocaleMsg = Biz.L("当前储位[{0}]不在退料单需要上架的储位列表中：{1}");
                    action.LocaleMsg = Biz.L("WMS.In_BIZ_U9_RETURN.ScanShelf.NoContainLocation", Code, string.Join(", ", CurOrder.Details.Select(q => q.ItemInfo.DEFAULT_LOCATION)));
                    return action;
                }

                CurScanShelf = new ScanShelfInfo();

                // æŸ¥è¯¢è´§æž¶ä¿¡æ¯
                whUnit = whUnit.IsNullOrEmpty(await MainDB.Queryable<V_WH_UNIT>().Where(t => (t.SHELF_CODE.ToUpper() == Code || t.LOCATION_CODE.ToUpper() == Code) && t.AUTH_ORG == OrgCode).IncludesAllFirstLayer().FirstAsync());

                // æ‰«æè´§æž¶ä»£ç ï¼Œä¸”为智能货架
                if (!whUnit.IsNullOrEmpty() && whUnit.SHELF_CODE  == Code)
                {
                    CurScanShelf.Shelf = whUnit.Shelf;
                    CurScanShelf.WarehouseCode = whUnit.WH_CODE;
                    CurScanShelf.RegionCode = whUnit.REGION_CODE;
                    CurScanShelf.ShelfCode = whUnit.SHELF_CODE;
                    CurScanShelf.ShelfType = whUnit.SHELF_TYPE;
                    CurScanShelf.IsSmartRack = true;
                }
                // æ‰«æåº“位代码
                else if (!whUnit.IsNullOrEmpty() && whUnit.LOCATION_CODE == Code)
                {
                    if (whUnit.IS_ACTIVE == "N")
                    {
                        action.IsSuccessed = false;
                        //action.LocaleMsg = Biz.L("扫描的储位[{0}]未启用");
                        action.LocaleMsg = Biz.L("WMS.Default.ScanShelf.ShelfOrLocationDisabled", Code);
                        return action;
                    }
                    if (whUnit.Shelf.IsLightShelf || whUnit.Location.IS_SINGLE == "Y")
                    {
                        var locationData = MainDB.Queryable<WMS_ITEM>().Where(q => q.LOCATION_ID == whUnit.LOCATION_ID && q.AUTH_ORG == OrgCode).First();
                        if (!locationData.IsNullOrEmpty())
                        {
                            action.IsSuccessed = false;
                            //action.LocaleMsg = Biz.L("储位[{0}]已存有物料[{1}]，请检查系统库存信息");
                            action.LocaleMsg = Biz.L($"WMS.Default.ScanShelf.ItemAlreadyExistsInLocation", Code, locationData.SN);
                            return action;
                        }
                    }
                    CurScanShelf.Shelf = whUnit.Shelf;
                    CurScanShelf.Location = whUnit.Location;
                    CurScanShelf.WarehouseCode = whUnit.WH_CODE;
                    CurScanShelf.RegionCode = whUnit.REGION_CODE;
                    CurScanShelf.ShelfCode = whUnit .SHELF_CODE;
                    CurScanShelf.LocationCode = whUnit.LOCATION_CODE;
                    CurScanShelf.IsSmartRack = false;
                }
                else
                {
                    action.IsSuccessed = false;
                    //action.LocaleMsg = Biz.L("请输入或扫描有效的货架/储位码");
                    action.LocaleMsg = Biz.L("WMS.Default.ScanShelf.ShelfCanNotEmpty");
                    return action;
                }

                CurScanShelf.IsScanShelf = true;
                //action.LocaleMsg = Biz.L("扫描货架/储位[{0}]成功");
                action.LocaleMsg = Biz.L("WMS.Default.ScanShelf.ScanSucceeded", Code);
                action.Data.Data = CurScanShelf;
            }
            catch (Exception ex)
            {
                //取消当前操作
                ResetTrans();
                //action.CatchExceptionWithLog(ex, $"扫描货架/储位[{0}]异常");
                action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.ScanShelf.ScanException", Code));
            }
            return action;
        }

        /// <summary>
        /// å®Œæˆæ‰€æœ‰å¤„理后使用事务保存数据
        /// </summary>
        /// <param name="action"></param>
        /// <param name="locale"></param>
        /// <param name="doAfterSave"></param>
        /// <returns></returns>
        public ApiAction<ScanOutput> DoIfFinish(ApiAction<ScanOutput> action, string locale, Action doAfterSave = null)
        {
            //保存数据库
            SaveCommitListToDB();

            //保存数据成功后执行
            doAfterSave?.Invoke();

            // è¿”回数据
            action.Data.Data = new DefaultInStoreOutput
            {
                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 = CurInvItem.Warehouse.WH_CODE,
                RegionCode = CurInvItem.Region.REGION_CODE,
                ShelfCode = CurInvItem.Shelf.SHELF_CODE,
                LocationCode = CurInvItem.Location.LOCATION_CODE,
            };

            //action.LocaleMsg = Biz.L($"扫描条码[{0}]上架到储位[{1}]成功");
            action.LocaleMsg = Biz.L("WMS.Default.ScanItem.PutOnSucceeded", CurInvItem.SN, CurInvItem.Location.LOCATION_CODE);

            //重置工序
            ResetScan();
            return SetOutPutMqttMsg(action, locale);
        }

        /// <summary>
        ///  èŽ·å–需要上架的退料单列表（带分页）
        /// </summary>
        /// <returns></returns>
        public async Task<ApiAction<PageAble<BIZ_U9_RETURN>>> GetOrderList(BaseInputWithPage input)
        {
            var action = new ApiAction<PageAble<BIZ_U9_RETURN>>();

            action.Data = await MainDB.Queryable<BIZ_U9_RETURN>().Where(q => q.STATUS == BIZ_U9_RETURN.STATUSs.WaitIn.GetValue()).ToPageAsync(input.pageIndex, input.pageSize);

            return action;
        }

        /// <summary>
        ///  èŽ·å–当前退料单信息
        /// </summary>
        /// <returns></returns>
        public async Task<ApiAction<BIZ_U9_RETURN>> GetCurOrder()
        {
            var action = new ApiAction<BIZ_U9_RETURN>();
            action.Data = CurOrder;
            return action;
        }

        #endregion

        /// <summary>
        /// é‡ç½®äº‹åŠ¡æ•°æ®ï¼Œæœ‰éœ€è¦åˆ™é‡å†™æ­¤æ–¹æ³•
        /// </summary>
        public override void ResetTrans()
        {
            ResetScan();
            CurScanShelf = null;
            base.ResetTrans();
        }

        /// <summary>
        /// é‡ç½®æœ¬æ¬¡æ‰«ç ä¿¡æ¯
        /// </summary>
        public override void ResetScan()
        {
            Command = "Normal";
            CurInvItem = null;
            base.ResetScan();
        }

        public override bool Close(bool needSaveHistoryLog = false)
        {
            this.IsFinished = true;
            return IsFinished ? base.Close(needSaveHistoryLog) : IsFinished;
        }

    }//endClass
}

 Tiger.Controllers.WMS/Controllers/WMSController.In_BIZ_U9_RETURN.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,231 @@
using System;
using System.Threading.Tasks;
using Rhea.Common;
using Tiger.Model;
using Tiger.IBusiness;
using Microsoft.AspNetCore.Mvc;
using Autofac;

namespace Tiger.Api.Controllers.WMS
{
    public partial class WMSController : ControllerBase
    {
        /// <summary>
        /// GetTransaction(ApiAction(Data:UserId))
        /// æ ¹æ®ApiAction的id返回一个退料单(U9)上架事务
        /// </summary>
        /// <param name="action"></param>
        /// <returns></returns>
        [HttpPost]
        [Route("api/[controller]/In_U9Return/GetTransaction")]
        public IActionResult In_BIZ_U9_RETURN_GetTransaction([FromBody] ApiAction<USER> action)
        {
            ApiAction response;
            IIn_BIZ_U9_RETURN trans = null;
            try
            {
                if (iBiz.WMS.Context.GetTransDic().ContainsKey(action.ID))
                {
                    trans = iBiz.WMS.Context.GetTransDic()[action.ID] as IIn_BIZ_U9_RETURN;
                }
                else
                {
                    trans = AutoFacContainer.Instance.Resolve<IIn_BIZ_U9_RETURN>().Init(action.ID, action.Data?.USER_CODE, Request.Host.Value, action.Data?.ORG_CODE);
                    iBiz.WMS.Context.NewTransaction(HttpContext, trans);
                }

                response = action.GetResponse();
            }
            catch (System.Exception ex)
            {
                response = action.GetResponse().CatchExceptionWithLog(ex);
            }
            trans?.AddHistory(Request, action);
            return Ok(response);
        }

        /// <summary>
        /// CloseTransaction(ApiAction)
        /// å…³é—­äº‹åŠ¡
        /// </summary>
        /// <param name="action"></param>
        /// <returns></returns>
        [HttpPost]
        [Route("api/[controller]/In_U9Return/CloseTransaction")]
        public IActionResult In_BIZ_U9_RETURN_CloseTransaction([FromBody] ApiAction action)
        {
            ApiAction response;
            IIn_BIZ_U9_RETURN trans = null;
            try
            {
                if (iBiz.WMS.Context.GetTransDic().ContainsKey(action.ID))
                {
                    trans = iBiz.WMS.Context.GetTransDic()[action.ID] as IIn_BIZ_U9_RETURN;
                    if (!trans.IsFinished)
                    {
                        if (action.IsAsync)
                        {
                            response = action.GetResponse(trans.Close());
                        }
                        else
                        {
                            lock (trans.TransLock) { response = action.GetResponse(trans.Close()); }
                        }
                        response.Message = $"退料单(U9)上架事务[ID:{action.ID}]关闭{(response.IsSuccessed ? "成功" : "失败")}";
                    }
                    else
                    {
                        response = action.GetResponse($"Transaction Error: é€€æ–™å•(U9)上架事务[ID:{action.ID}]已经关闭", false);
                    }
                }
                else
                {
                    response = action.GetResponse($"Transaction Error: é€€æ–™å•(U9)上架事务[ID:{action.ID}]已经关闭", false);
                }
            }
            catch (System.Exception ex)
            {
                response = action.GetResponse().CatchExceptionWithLog(ex);
            }
            trans?.AddHistory(Request, action);
            return Ok(response);
        }

        /// <summary>
        /// æ‰«æå…¥å£
        /// </summary>
        /// <param name="action"></param>
        /// <returns></returns>
        [HttpPost]
        [Route("api/[controller]/In_U9Return/Scan")]
        public async Task<IActionResult> In_BIZ_U9_RETURN_ScanAsync([FromBody] ApiAction<BaseInput> action)
        {
            ApiAction response;
            IIn_BIZ_U9_RETURN trans = null;
            try
            {
                if (iBiz.WMS.Context.GetTransDic().ContainsKey(action.ID))
                {
                    trans = iBiz.WMS.Context.GetTransDic()[action.ID] as IIn_BIZ_U9_RETURN;
                    if (!trans.IsFinished)
                    {
                        if (action.IsAsync)
                        {
                            response = action.GetResponse(await trans.Scan(action.Data));
                        }
                        else
                        {
                            lock (trans.TransLock) { response = action.GetResponse(trans.Scan(action.Data).Result); }
                        }
                    }
                    else
                    {
                        response = action.GetResponse($"Transaction Error: é€€æ–™å•(U9)上架事务[ID:{action.ID}]已经关闭，请重新打开退料单(U9)上架功能", false);
                    }
                }
                else
                {
                    response = action.GetResponse($"Transaction Error: é€€æ–™å•(U9)上架事务[ID:{action.ID}]数据丢失，请重新打开退料单(U9)上架功能", false);
                }
            }
            catch (System.Exception ex)
            {
                response = action.GetResponse().CatchExceptionWithLog(ex);
            }
            trans?.AddHistory(Request, action);
            return Ok(response);
        }

        /// <summary>
        /// GetOrderList(ApiAction(BasePageInput))
        ///  èŽ·å–需要上架的退料单列表（带分页）
        /// </summary>
        /// <param name="action"></param>
        /// <returns></returns>
        [HttpPost]
        [Route("api/[controller]/In_U9Return/GetOrderList")]
        public async Task<IActionResult> In_BIZ_U9_RETURN_GetOrderListAsync([FromBody] ApiAction<BaseInputWithPage> action)
        {
            ApiAction response;
            IIn_BIZ_U9_RETURN trans = null;
            try
            {
                if (iBiz.WMS.Context.GetTransDic().ContainsKey(action.ID))
                {
                    trans = iBiz.WMS.Context.GetTransDic()[action.ID] as IIn_BIZ_U9_RETURN;
                    if (!trans.IsFinished)
                    {
                        if (action.IsAsync)
                        {
                            response = action.GetResponse(await trans.GetOrderList(action.Data));
                        }
                        else
                        {
                            lock (trans.TransLock) { response = action.GetResponse(trans.GetOrderList(action.Data).Result); }
                        }
                    }
                    else
                    {
                        response = action.GetResponse($"Transaction Error: é€€æ–™å•(U9)上架事务[ID:{action.ID}]已经关闭，请重新打开退料单(U9)上架功能", false);
                    }
                }
                else
                {
                    response = action.GetResponse($"Transaction Error: é€€æ–™å•(U9)上架事务[ID:{action.ID}]数据丢失，请重新打开退料单(U9)上架功能", false);
                }
            }
            catch (System.Exception ex)
            {
                response = action.GetResponse().CatchExceptionWithLog(ex);
            }
            trans?.AddHistory(Request, action);
            return Ok(response);
        }

        /// <summary>
        /// GetCurOrder(ApiAction)
        /// èŽ·å–当前退料单信息
        /// </summary>
        /// <param name="action"></param>
        /// <returns></returns>
        [HttpPost]
        [Route("api/[controller]/In_U9Return/GetCurOrder")]
        public async Task<IActionResult> In_BIZ_U9_RETURN_GetCurOrderAsync([FromBody] ApiAction<BaseInput> action)
        {
            ApiAction response;
            IIn_BIZ_U9_RETURN trans = null;
            try
            {
                if (iBiz.WMS.Context.GetTransDic().ContainsKey(action.ID))
                {
                    trans = iBiz.WMS.Context.GetTransDic()[action.ID] as IIn_BIZ_U9_RETURN;
                    if (!trans.IsFinished)
                    {
                        if (action.IsAsync)
                        {
                            response = action.GetResponse(await trans.GetCurOrder());
                        }
                        else
                        {
                            lock (trans.TransLock) { response = action.GetResponse(trans.GetCurOrder().Result); }
                        }
                    }
                    else
                    {
                        response = action.GetResponse($"Transaction Error: é€€æ–™å•(U9)上架事务[ID:{action.ID}]已经关闭，请重新打开退料单(U9)上架功能", false);
                    }
                }
                else
                {
                    response = action.GetResponse($"Transaction Error: é€€æ–™å•(U9)上架事务[ID:{action.ID}]数据丢失，请重新打开退料单(U9)上架功能", false);
                }
            }
            catch (System.Exception ex)
            {
                response = action.GetResponse().CatchExceptionWithLog(ex);
            }
            trans?.AddHistory(Request, action);
            return Ok(response);
        }
    }
}

 Tiger.IBusiness.WMS/Transaction/IIn_BIZ_U9_RETURN.cs

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

namespace Tiger.IBusiness
{
    /// <summary>
    /// é€€æ–™å•(U9)上架事务
    /// </summary>
    public interface IIn_BIZ_U9_RETURN : IWmsTask
    {
        public IIn_BIZ_U9_RETURN Init(string id, string userCode, string apiHost, string orgCode);

        /// <summary>
        /// æ‰«æå…¥å£
        /// </summary>
        public Task<ApiAction<ScanOutput>> Scan(BaseInput input);

        /// <summary>
        ///  èŽ·å–需要上架的退料单列表（带分页）
        /// </summary>
        /// <returns></returns>
        public Task<ApiAction<PageAble<BIZ_U9_RETURN>>> GetOrderList(BaseInputWithPage input);

        /// <summary>
        ///  èŽ·å–当前退料单信息
        /// </summary>
        /// <returns></returns>
        public Task<ApiAction<BIZ_U9_RETURN>> GetCurOrder();

        public bool Close(bool needSaveHistoryLog = false);
    }
}

 Tiger.Model.Net/Entitys/WMS/BIZ_U9_RETURN.cs

@@ -29,9 +29,14 @@
        [DisplayName("单据号")]
        public string ORDER_NO { get; set; }
        /// <summary>
        /// çŠ¶æ€(0Init初始化|1Imported已导入|2Counting清点中|3Storing上架中|4Review待审核|5Finished已完成|6Cancel已作废)
        /// çŠ¶æ€(0Production生产退料|1Outsourcing委外退料)
        /// </summary>
        [DisplayName("状态(0Init初始化|1Imported已导入|2Counting清点中|3Storing上架中|4Review待审核|5Finished已完成|6Cancel已作废)")]
        [DisplayName("状态(0Production生产退料|1Outsourcing委外退料)")]
        public int RETURN_TYPE { get; set; }
        /// <summary>
        /// çŠ¶æ€(0Init初始化|1Imported已导入|2Counting清点中|3WaitIn待上架|4Storing上架中|5Review待审核|6Finished已完成|7Cancel已作废)
        /// </summary>
        [DisplayName("状态(0Init初始化|1Imported已导入|2Counting清点中|3WaitIn待上架|4Storing上架中|5Review待审核|6Finished已完成|7Cancel已作废)")]
        public int STATUS { get; set; }
        /// <summary>
        /// æ¥æºå•æ®ç¼–码
@@ -89,7 +94,6 @@
        [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_U9_RETURNId), nameof(MappingClass.ClassAId))]//注意顺序
        public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
        */

        [Navigate(NavigateType.OneToMany, nameof(BIZ_U9_RETURN_DTL.ORDER_NO), nameof(ORDER_NO), "GHOST_ROW = 0")]//一对一 ClassAId是BIZ_U9_RETURN类里面的外键ID字段
        public List<BIZ_U9_RETURN_DTL> Details { get; set; } //注意禁止手动赋值，只能是null
        [Navigate(NavigateType.OneToMany, nameof(BIZ_U9_RETURN_SN.ORDER_NO), nameof(ORDER_NO), "GHOST_ROW = 0")]//一对一 ClassAId是BIZ_U9_RETURN类里面的外键ID字段
@@ -108,30 +112,43 @@
        */

        /// <summary>
        /// æžšä¸¾ï¼šçŠ¶æ€(0Init初始化|1Imported已导入|2Counting清点中|3Storing上架中|4Review待审核|5Finished已完成|6Cancel已作废)
        /// æžšä¸¾ï¼šçŠ¶æ€(0Production生产退料|1Outsourcing委外退料)
        /// </summary>
        public enum RETURN_TYPEs
        {
            [Description("生产退料")]
            Production = 0,
            [Description("委外退料")]
            Outsourcing = 1,
        }

        /// <summary>
        /// æžšä¸¾ï¼šçŠ¶æ€(0Init初始化|1Imported已导入|2Counting清点中|3WaitIn待上架|4Storing上架中|5Review待审核|6Finished已完成|7Cancel已作废)
        /// </summary>
        public enum STATUSs
        {
            [Description("初始化")]
            Init = 0,
            [Description("已导入")]
            Imported = 1,
            [Description("清点中")]
            Counting = 2,
            [Description("上架中")]
            Storing = 3,
            [Description("待审核")]
            Review = 4,
            [Description("已完成")]
            Finished = 5,
            [Description("已作废")]
            Cancel = 6,
        }
        #endregion
        {
            [Description("初始化")]
            Init = 0,
            [Description("已导入")]
            Imported = 1,
            [Description("清点中")]
            Counting = 2,
            [Description("待上架")]
            WaitIn = 3,
            [Description("上架中")]
            Storing = 4,
            [Description("待审核")]
            Review = 5,
            [Description("已完成")]
            Finished = 6,
            [Description("已作废")]
            Cancel = 7,
        }
        #endregion

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

        #endregion
        #endregion

    }//endClass
    }//endClass
}

 Tiger.Model.Net/Entitys/WMS/BIZ_U9_RETURN_DTL.cs

@@ -7,130 +7,134 @@
namespace Tiger.Model
{
    /// <summary>
    /// å®žä½“：退料单(U9)明细
    /// å®žä½“：退料单(U9)明细
    /// </summary>
    [Description("Primary:ID")]
    [DisplayName("退料单(U9)明细")]
    [DisplayName("退料单(U9)明细")]
    [Serializable]
    [SugarTable("BIZ_U9_RETURN_DTL")]
    public class BIZ_U9_RETURN_DTL : DbEntityWithAuth
    {
        #region æž„造函数
        #region æž„造函数
        /// <summary>
        /// å®žä½“：退料单(U9)明细
        /// å®žä½“：退料单(U9)明细
        /// </summary>
        public BIZ_U9_RETURN_DTL() {}
        #endregion

        #region å…¬å…±å±žæ€§
        #region å…¬å…±å±žæ€§
        /// <summary>
        /// å•æ®å·
        /// å•æ®å·
        /// </summary>
        [DisplayName("单据号")]
        [DisplayName("单据号")]
        public string ORDER_NO { get; set; }
        /// <summary>
        /// å•æ®è¡Œå·
        /// å•æ®è¡Œå·
        /// </summary>
        [DisplayName("单据行号")]
        [DisplayName("单据行号")]
        public string LINE_NO { get; set; }
        /// <summary>
        /// æ¥æºå•æ®ç¼–码
        /// æ¥æºå•æ®ç¼–码
        /// </summary>
        [DisplayName("来源单据编码")]
        [DisplayName("来源单据编码")]
        public string SOURCE_CODE { get; set; }
        /// <summary>
        /// æ¥æºå•å·
        /// æ¥æºå•å·
        /// </summary>
        [DisplayName("来源单号")]
        [DisplayName("来源单号")]
        public string SOURCE_ORDER { get; set; }
        /// <summary>
        /// æ¥æºå•è¡Œå·
        /// æ¥æºå•è¡Œå·
        /// </summary>
        [DisplayName("来源单行号")]
        [DisplayName("来源单行号")]
        public string SOURCE_LINE { get; set; }
        /// <summary>
        /// æ¥æºå•è¡ŒID
        /// æ¥æºå•è¡ŒID
        /// </summary>
        [DisplayName("来源单行ID")]
        [DisplayName("来源单行ID")]
        public string SOURCE_ID { get; set; }
        /// <summary>
        /// çŠ¶æ€(同单据状态)
        /// çŠ¶æ€(同单据状态)
        /// </summary>
        [DisplayName("状态(同单据状态)")]
        [DisplayName("状态(同单据状态)")]
        public int STATUS { get; set; }
        /// <summary>
        /// ç‰©æ–™ç¼–码
        /// ç‰©æ–™ç¼–码
        /// </summary>
        [DisplayName("物料编码")]
        [DisplayName("物料编码")]
        public string ITEM_CODE { get; set; }
        /// <summary>
        /// å•ä½
        /// å•ä½
        /// </summary>
        [DisplayName("单位")]
        [DisplayName("单位")]
        public string UNIT { get; set; }
        /// <summary>
        /// å•æ®æ•°é‡
        /// å•æ®æ•°é‡
        /// </summary>
        [DisplayName("单据数量")]
        [DisplayName("单据数量")]
        public double QTY { get; set; }
        /// <summary>
        /// å…¥åº“数量
        /// å…¥åº“数量
        /// </summary>
        [DisplayName("入库数量")]
        [DisplayName("入库数量")]
        public double QTY_IN { get; set; }
        /// <summary>
        /// æ‰¹æ¬¡å·
        /// æ‰¹æ¬¡å·
        /// </summary>
        [DisplayName("批次号")]
        [DisplayName("批次号")]
        public string LOTNO { get; set; }
        /// <summary>
        /// ERP编码
        /// ERP编码
        /// </summary>
        [DisplayName("ERP编码")]
        [DisplayName("ERP编码")]
        public string ERP_CODE { get; set; }
        /// <summary>
        /// å¤‡æ³¨
        /// å¤‡æ³¨
        /// </summary>
        [DisplayName("备注")]
        [DisplayName("备注")]
        public string REMARK { get; set; }
        #endregion
        #endregion

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

        #region å¤–键属性
        /*例子
        //一对一外键导航
        [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是BIZ_U9_RETURN_DTL类里面的外键ID字段
        public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
        //一对多外键导航
        [Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_U9_RETURN_DTLId))]//ClassA表中的BIZ_U9_RETURN_DTLId
        public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
        //多对多外键导航
        [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_U9_RETURN_DTLId), nameof(MappingClass.ClassAId))]//注意顺序
        public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
        #region å¤–键属性
        /*例子
        //一对一外键导航
        [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是BIZ_U9_RETURN_DTL类里面的外键ID字段
        public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
        //一对多外键导航
        [Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_U9_RETURN_DTLId))]//ClassA表中的BIZ_U9_RETURN_DTLId
        public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
        //多对多外键导航
        [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_U9_RETURN_DTLId), nameof(MappingClass.ClassAId))]//注意顺序
        public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
        */
        #endregion
        [Navigate(NavigateType.OneToMany, nameof(BAS_ITEM.ITEM_CODE), nameof(ITEM_CODE), "GHOST_ROW = 0")]//一对一 ClassAId是BIZ_U9_RETURN_DTL类里面的外键ID字段
        public List<BAS_ITEM> _ItemInfos { get; set; } //注意禁止手动赋值，只能是null
        [SugarColumn(IsIgnore = true)]
        public BAS_ITEM ItemInfo => _ItemInfos?.FirstOrDefault(q => q.AUTH_ORG == AUTH_ORG);
        #endregion

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

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

        #endregion
        #endregion

    }//endClass
    }//endClass
}