收货单增加选择单据

Rodney Chen

2025-04-18 c3bb5047c194a0145caca7681f0df5a8feeaaa9b

收货单增加选择单据

 Tiger.Api/Language.db

Binary files differ

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

@@ -30,7 +30,7 @@
        }

        #region Propertys & Variables
        public string CurOrderNo { get; set; }
        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>
@@ -115,17 +167,18 @@
                        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())
                {
@@ -216,7 +269,7 @@
                    return SetOutPutMqttMsg(action, input.Locale);
                }

                CurOrderNo = receipt.ORDER_NO;
                CurOrder = receipt;

                //执行上架数据处理
                foreach (var item in CurInvItem.Items)
@@ -352,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;
                }

@@ -496,7 +556,7 @@
        public async Task<ApiAction<BIZ_U9_RECEIPT>> GetCurOrder()
        {
            var action = new ApiAction<BIZ_U9_RECEIPT>();
            action.Data = await MainDB.Queryable<BIZ_U9_RECEIPT>().Where(q => q.ORDER_NO == CurOrderNo).IncludesAllFirstLayer().FirstAsync();
            action.Data = CurOrder;
            return action;
        }


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

@@ -1,10 +1,10 @@
using System;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Tiger.Model.Minsun;

namespace Tiger.Model
{
@@ -43,6 +43,35 @@
        /// </summary>
        public string Data { get; set; }
    }


    public class BaseInput<T> : BaseInput
    {
        public BaseInput()
        {
        }

        public BaseInput(BaseInput input)
        {
            if (input != null)
            {
                AuthOption = input.AuthOption;
                Locale = input.Locale;
                Command = input.Command;
                SN = input.SN;
                ItemCode = input.ItemCode;
                OrderNo = input.OrderNo;
                Options = input.Options;
                Data = JsonConvert.DeserializeObject<T>(input.Data);
            }
        }

        /// <summary>
        /// 当前操作需要提交的数据
        /// </summary>
        public new T Data { get; set; }
    }

    public class BaseInputWithPage : BaseInput
    {
        public int pageIndex { get; set; }

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

@@ -61,6 +61,9 @@
    <ErrorReport>prompt</ErrorReport>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
      <HintPath>..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
    </Reference>
    <Reference Include="SqlSugar, Version=5.1.4.170, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>..\packages\SqlSugar.5.1.4.171-preview11\lib\SqlSugar.dll</HintPath>
    </Reference>

 Tiger.Model.Net/packages.config

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net452" />
  <package id="Newtonsoft.Json" version="13.0.2" targetFramework="net48" />
  <package id="SqlSugar" version="5.1.4.171-preview11" targetFramework="net48" />
</packages>