修复了一些已知问题

Rodney Chen

7 天以前 f7e91120bed67bf81f3e873056b147c8df2d68c0

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

@@ -13,7 +13,6 @@
using Tiger.Business.WMS.Sharetronic.Shelf;
using Tiger.Model.Entitys.MES.U9C;
using Tiger.Model.MES.Yada;
using static IronPython.Modules._ast;

namespace Tiger.Business.WMS.Transaction
{
@@ -22,6 +21,7 @@
    /// </summary>
    public class In_BIZ_U9_RECEIPT : WmsTask, IIn_BIZ_U9_RECEIPT
    {

        public IIn_BIZ_U9_RECEIPT Init(string id, string userCode, string apiHost, string orgCode)
        {
            base.Init(id, userCode, apiHost, orgCode);
@@ -30,7 +30,7 @@
        }

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

        #region Functions
@@ -42,23 +42,46 @@
            var action = new ApiAction<ScanOutput>(new ScanOutput());
            try
            {
                if (input.SN.IsNullOrEmpty())
                if (input.Command == "ScanOrder")
                {
                    action.IsSuccessed = false;
                    //action.LocaleMsg = Biz.L("条码不能为空");
                    action.LocaleMsg = Biz.L("WMS.Default.ScanItem.SnEmptyFailure");
                    return SetOutPutMqttMsg(action, input.Locale);
                    var inputOrder = new BaseInput<BIZ_U9_RECEIPT>(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);
                }
                //判断扫描的是否货架
                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))
                else
                {
                    action = await ScanShelf(input.SN, whUnit);
                }
                else//扫描物料并复核
                {
                    action = await ScanItem(input);
                    if (CurOrder.IsNullOrEmpty())
                    {
                        action.IsSuccessed = false;
                        //action.LocaleMsg = Biz.L("上架前请先选择需要上架的收货单");
                        action.LocaleMsg = Biz.L("WMS.In_BIZ_U9_RECEIPT.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 (string.IsNullOrEmpty(CurScanShelf?.ShelfCode))
                    if (!whUnit.IsNullOrEmpty() || string.IsNullOrEmpty(CurScanShelf?.ShelfCode))
                    {
                        action = await ScanShelf(input.SN, whUnit);
                    }
                    else//扫描物料并复核
                    {
                        action = await ScanItem(input);
                    }
                }
            }
            catch (Exception ex)
@@ -69,6 +92,35 @@
                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_RECEIPT> input)
        {
            var action = new ApiAction<ScanOutput>(new ScanOutput());
            try
            {
                var receipt = await MainDB.Queryable<BIZ_U9_RECEIPT>().Where(q => q.ORDER_NO == input.Data.ORDER_NO).Includes(q => q.Details, d => d._ItemInfos).IncludesAllFirstLayer().FirstAsync();
                if (receipt.IsNullOrEmpty())
                {
                    action.IsSuccessed = false;
                    //action.LocaleMsg = Biz.L("找不到收货单[{0}]的信息，请重新选择正确的收货单");
                    action.LocaleMsg = Biz.L("WMS.In_BIZ_U9_RECEIPT.ScanOrder.ReceiptNotExists", input.Data.ORDER_NO);
                    return SetOutPutMqttMsg(action, input.Locale);
                }
                action.Data.Command = "Normal";
                action.Data.Data = CurOrder = receipt;
            }
            catch (Exception ex)
            {
                //取消当前操作
                ResetTrans();
                //action.CatchExceptionWithLog(ex, $"选择收货单异常(Data: {0})");
                action.CatchExceptionWithLog(ex, Biz.L("WMS.In_BIZ_U9_RECEIPT.ScanOrderException", input?.Data));
            }
            return action;
        }

        /// <summary>
@@ -111,21 +163,22 @@
                    if (!inv.ItemInfo.DEFAULT_LOCATION.IsNullOrEmpty() && inv.ItemInfo.DEFAULT_LOCATION != CurScanShelf.LocationCode)
                    {
                       action.IsSuccessed = false;
                       //action.LocaleMsg = Biz.L("物料[{0}]只允许上架到储位[{0}]，请重新扫描储位");
                       //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 (CurInvItem.Items.First().TRANS_NO != CurOrder.ORDER_NO)
                    {
                        action.IsSuccessed = false;
                        //action.LocaleMsg = Biz.L("条码所属的单据[{0}]不是选择的收货单[{1}]，请重新扫描正确的条码或选择其他收货单");
                        action.LocaleMsg = Biz.L("WMS.In_BIZ_U9_RECEIPT.ScanItem.NotCurOrder", CurInvItem.Items.First().TRANS_NO, CurOrder.ORDER_NO);
                        return SetOutPutMqttMsg(action, input.Locale);
                    }
                    CurInvItem = inv;
                }

                var receipt = await MainDB.Queryable<BIZ_U9_RECEIPT>().Where(q => q.ORDER_NO == CurInvItem.Items.First().TRANS_NO).IncludesAllFirstLayer().FirstAsync();
                if (receipt.IsNullOrEmpty())
                {
                    action.IsSuccessed = false;
                    //action.LocaleMsg = Biz.L("收货单中找不到条码所属的单据[{0}]信息，请重新扫描收货单的条码或选择正确的功能上架");
                    action.LocaleMsg = Biz.L("WMS.In_BIZ_U9_RECEIPT.ScanItem.ReceiptNotExists", CurInvItem.Items.First().TRANS_NO);
                    return SetOutPutMqttMsg(action, input.Locale);
                }
                var receipt = await MainDB.Queryable<BIZ_U9_RECEIPT>().Where(q => q.ORDER_NO == CurOrder.ORDER_NO).Includes(q => q.Details, d => d._ItemInfos).IncludesAllFirstLayer().FirstAsync();
                var receiptDtl = receipt.Details.First(q => q.LINE_NO == CurInvItem.Items.First().TRANS_LINE);
                if (receiptDtl.STATUS > BIZ_U9_RECEIPT.STATUSs.Storing.GetValue())
                {
@@ -215,6 +268,8 @@
                    ResetTrans();
                    return SetOutPutMqttMsg(action, input.Locale);
                }

                CurOrder = receipt;

                //执行上架数据处理
                foreach (var item in CurInvItem.Items)
@@ -314,13 +369,18 @@
                });

                //完成所有处理后使用事务保存数据
                action = DoIfFinish(action, input.Locale, () => {
                action = DoIfFinish(action, input.Locale, () =>
                {
                    //设置当前物料的默认储位
                    if (CurInvItem.ItemInfo.DEFAULT_LOCATION.IsNullOrEmpty())
                    {
                        SetDefaultLocation(MainDB, CurInvItem.ItemInfo, nLocation);
                    }
                });
                //if (!action.Data.Data.IsNullOrEmpty() && action.Data.Data is DefaultInStoreOutput)
                //{
                //    (action.Data.Data as DefaultInStoreOutput).OrderInfo = receipt;
                //}
            }
            catch (Exception ex)
            {
@@ -345,6 +405,13 @@
                    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_RECEIPT.ScanShelf.NoContainLocation", Code, string.Join(", ", CurOrder.Details.Select(q => q.ItemInfo.DEFAULT_LOCATION)));
                    return action;
                }

@@ -461,6 +528,38 @@
            return SetOutPutMqttMsg(action, locale);
        }

        /// <summary>
        ///  获取需要上架的收货单列表（带分页）
        /// </summary>
        /// <returns></returns>
        public async Task<ApiAction<PageAble<BIZ_U9_RECEIPT>>> GetOrderList(BaseInputWithPage input)
        {
            var action = new ApiAction<PageAble<BIZ_U9_RECEIPT>>();
            var query = Biz.DataSource["YadaU9C"].Client.Queryable<mes_ReturnedDocInfo>().Where(q => q.Status == 3)
                                    .WhereIF(!input.OrderNo.IsNullOrEmpty(), q => q.DocNo.Contains(input.OrderNo) || SqlFunc.Subqueryable<mes_AsnDocInfo>().Where(a => a.AsnId == q.SrcASNDocId && q.DocNo.Contains(input.OrderNo)).Any())
                                    .OrderBy(q => q.DocNo).Select(q => new { q.DocNo, q.Status, q.StatusName }).Distinct().ToList();

            action.Data = await MainDB.Queryable<BIZ_U9_RECEIPT>().Where(q => query.Select(o => o.DocNo).Contains(q.ORDER_NO)).ToPageAsync(input.pageIndex, input.pageSize);
            foreach (var order in action.Data.data)
            {
                order.ERP_STATUS_CODE = query.FirstOrDefault(q => q.DocNo == order.ORDER_NO)?.Status.ToString();
                order.ERP_STATUS_NAME = query.FirstOrDefault(q => q.DocNo == order.ORDER_NO)?.StatusName;
            }
            MainDB.Updateable(action.Data.data, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.ERP_STATUS_CODE, q.ERP_STATUS_NAME }).ExecuteCommand();
            return action;
        }

        /// <summary>
        ///  获取当前收货单信息
        /// </summary>
        /// <returns></returns>
        public async Task<ApiAction<BIZ_U9_RECEIPT>> GetCurOrder()
        {
            var action = new ApiAction<BIZ_U9_RECEIPT>();
            action.Data = CurOrder;
            return action;
        }

        #endregion

        /// <summary>