Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Serve...

YangYuGang

10 天以前 2abf4959b71e7dd6ee6ee8a349ecc5c2f7b20fce

Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024

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

@@ -20,6 +20,7 @@
using Tiger.Model.Minsun;
using static IronPython.Runtime.Profiler;
using static Microsoft.CodeAnalysis.CSharp.SyntaxTokenParser;
using Microsoft.Scripting.Utils;

namespace Tiger.Business.WMS.Transaction
{
@@ -32,18 +33,28 @@
        {
            base.Init(id, userCode, apiHost, orgCode);
            Logger.Console.Info($"Start {this.GetType().Name} Transaction[ID: {TransID}]");
            LoadData();
            return this;
        }

        #region Propertys & Variables
        //private List<WmsOrder<BIZ_U9_ASN>> _OrderList { get; set; } = new();
        private List<string> OrderList = new();
        private BIZ_U9_ASN order = new();
        private BIZ_U9_ASN CurOrder = new();
        private List<BIZ_U9_ASN_SN> CurSn = new();
        List<string> SnList = new();
        private string rcvDocType = "RCV03"; //默认无单
        #endregion

        #region Functions
        /// <summary>
        /// 初始化清点数据
        /// </summary>
        private void LoadData()
        {
            var _Sns = MainDB.Queryable<BIZ_U9_ASN_SN>().Where(q => q.ORDER_NO == SqlFunc.Subqueryable<BIZ_U9_ASN_DTL>().Where(s => SqlFunc.StartsWith(s.UPDATE_USER, $"GenerateASN_{UserCode}")).Select(s => s.ORDER_NO)).ToList();
            CurSn.AddRange(_Sns);
        }
        /// <summary>
        /// 扫描入口
        /// </summary>
@@ -100,15 +111,15 @@
            var action = new ApiAction<ScanOutput>($"成功获取ASN单[{input.SN}]信息", new ScanOutput());
            try
            {
                order = await MainDB.Queryable<BIZ_U9_ASN>().Where(q => q.ORDER_NO == input.SN && q.STATUS < BIZ_U9_ASN.STATUSs.Finished.GetValue()).Includes(q => q.Details, d => d._ItemInfos).IncludesAllFirstLayer().FirstAsync();
                if (order == null)
                CurOrder = await MainDB.Queryable<BIZ_U9_ASN>().Where(q => q.ORDER_NO == input.SN && q.STATUS < BIZ_U9_ASN.STATUSs.Finished.GetValue()).Includes(q => q.Details, d => d._ItemInfos).IncludesAllFirstLayer().FirstAsync();
                if (CurOrder == null)
                {
                    action.IsSuccessed = false;
                    action.LocaleMsg = Biz.L($"查不到ASN单[{input.SN}]的数据");
                    return action;
                }
                action.LocaleMsg = order.STATUS == BIZ_U9_ASN.STATUSs.Counting.GetValue() ? Biz.L($"ASN单[{input.SN}]状态为[{BIZ_U9_ASN.STATUSs.Counting.GetDesc()}]，请继续未完成的操作") : action.LocaleMsg;
                action.Data.Data = order;
                action.LocaleMsg = CurOrder.STATUS == BIZ_U9_ASN.STATUSs.Counting.GetValue() ? Biz.L($"ASN单[{input.SN}]状态为[{BIZ_U9_ASN.STATUSs.Counting.GetDesc()}]，请继续未完成的操作") : action.LocaleMsg;
                action.Data.Data = CurOrder;
            }
            catch (Exception ex)
            {
@@ -129,6 +140,14 @@
            var action = new ApiAction<ScanOutput>(new ScanOutput());
            try
            {
                var reqType = input.Options["reqType"].ToString();
                rcvDocType = "RCV01";
                if (reqType != "1")
                {
                    action.IsSuccessed = false;
                    action.LocaleMsg = Biz.L($"不是随单赠品，不用扫描条码");
                    return action;
                }
                var AsnSn = await MainDB.Queryable<BIZ_U9_ASN_SN>().Where(q => q.SN == input.SN).FirstAsync();
                if (AsnSn == null)
                {
@@ -136,26 +155,39 @@
                    action.LocaleMsg = Biz.L($"查不到条码[{input.SN}]的数据");
                    return action;
                }
                if (CurSn.Count > 0 && CurSn.Any(q => q.LOTNO == AsnSn.LOTNO && q.STATUS <= WMS_ITEM.STATUSs.Counted.GetValue()))
                {
                    action.IsSuccessed = false;
                    action.LocaleMsg = Biz.L($"已经存在的批次[{AsnSn.LOTNO}]未完成操作，请先完成此批次");
                    return action;
                }
                order = await MainDB.Queryable<BIZ_U9_ASN>().Where(q => q.ORDER_NO == AsnSn.ORDER_NO).Includes(q => q.Details, d => d._ItemInfos).IncludesAllFirstLayer().FirstAsync();
                if (order == null)
                CurOrder = await MainDB.Queryable<BIZ_U9_ASN>().Where(q => q.ORDER_NO == AsnSn.ORDER_NO).Includes(q => q.Details, d => d._ItemInfos).IncludesAllFirstLayer().FirstAsync();
                if (CurOrder == null)
                {
                    action.IsSuccessed = false;
                    action.LocaleMsg = Biz.L($"查不到ASN单[{input.SN}]的数据");
                    return action;
                }
                //如果是第一次扫描，生成单号
                if (CurSn.Count == 0)
                var _sns = CurSn.Where(q => q.LOTNO == AsnSn.LOTNO && q.STATUS <= WMS_ITEM.STATUSs.Counted.GetValue()).ToList();
                if (CurSn.Count > 0 && _sns.Any())
                {
                    action.Data.Command = $"WASN{DateTime.Now.ToString("yyyyMMddHHmmss")}";
                    action.LocaleMsg = Biz.L($"批次[{AsnSn.LOTNO}]已经提交，请继续下一步操作");
                    var _Order = await MainDB.Queryable<BIZ_U9_ASN>().Where(q => q.ORDER_NO == _sns[0].ORDER_NO).Includes(q => q.Details, d => d._ItemInfos).IncludesAllFirstLayer().FirstAsync();
                    if (_Order == null)
                    {
                        action.IsSuccessed = false;
                        action.LocaleMsg = Biz.L($"查不到ASN单[{_Order.ORDER_NO}]的数据");
                        return action;
                    }
                    _Order.Details = _Order.Details.Where(q => _sns[0].LINE_NO == q.LINE_NO).ToList();
                    SnList.AddRange(_sns.Select(q => q.SN).ToList());
                    _Order.BarcodeList = SnList;
                    action.Data.Data = _Order;
                    return action;
                }
                if (CurSn.Any(q=> q.ORDER_NO == AsnSn.ORDER_NO && q.LINE_NO == AsnSn.LINE_NO))
                {
                    action.IsSuccessed = false;
                    action.LocaleMsg = Biz.L($"扫描的条码的ASN单[{AsnSn.ORDER_NO}]的行号[{AsnSn.LINE_NO}]已经存在，请先完成未完成的操作");
                    return action;
                }
                CurSn.Add(AsnSn);
                var _order = order.Clone();
                var _order = CurOrder.Clone();
                CurOrder.ORDER_NO = $"WASN{DateTime.Now.ToString("yyyyMMddHHmmss")}";
                _order.Details = _order.Details.Where(q => CurSn.Any(s => s.LINE_NO == q.LINE_NO)).ToList();
                action.LocaleMsg = Biz.L($"成功获取ASN单[{AsnSn.ORDER_NO}]的信息");
                action.Data.Data = _order;
@@ -181,27 +213,37 @@
            {
                var reqType = input.Options["reqType"].ToString();
                var dtl = input.Options["record"].ToString().JsonToObject<BIZ_U9_ASN_DTL>();
                CurOrder = CurOrder??new() { 
                    SUPP_CODE = dtl.SUPP_CODE,
                    DELIVERY_DATE = DateTime.Now,
                    PLANARRIVED_DATE = DateTime.Now,
                    AUTH_ORG = OrgCode,
                };
                CurOrder.ORDER_NO = $"WASN{DateTime.Now.ToString("yyyyMMddHHmmss")}";
                dtl.UPDATE_USER = $"GenerateASN_{UserCode}";
                dtl.REMARK = CurSn.Where(q => q.ORDER_NO == dtl.ORDER_NO && q.LINE_NO == dtl.LINE_NO).FirstOrDefault()?.SN;
                dtl.ORDER_NO = CurOrder.ORDER_NO;
                BIZ_U9_ASN Asn = new()
                {
                    ID = Guid.NewGuid().ToString("N"),
                    ORDER_NO = dtl.ORDER_NO,
                    ORDER_NO = CurOrder.ORDER_NO,
                    STATUS = BIZ_U9_ASN.STATUSs.Counting.GetValue(),
                    SUPP_CODE = order.SUPP_CODE,
                    SUPP_NAME = order.SUPP_NAME,
                    DELIVERY_DATE = order.DELIVERY_DATE,
                    PLANARRIVED_DATE = order.PLANARRIVED_DATE,
                    SUPP_CODE = CurOrder.SUPP_CODE,
                    SUPP_NAME = CurOrder.SUPP_NAME,
                    DELIVERY_DATE = CurOrder.DELIVERY_DATE,
                    PLANARRIVED_DATE = CurOrder.PLANARRIVED_DATE,
                    ORDER_DATE = DateTime.Now,
                    CREATE_TIME = DateTime.Now,
                    CREATE_USER = $"Print_BIZ_U9_ASN_{UserCode}",
                    UPDATE_TIME = DateTime.Now,
                    UPDATE_USER = $"Print_BIZ_U9_ASN_{UserCode}",
                    AUTH_ORG = order.AUTH_ORG,
                    AUTH_ORG = CurOrder.AUTH_ORG,
                };
                //创建变量克隆对象用于传入DBSubmitAction中保存当前需要暂存的数据值
                var _dtl = dtl.Clone();
                _dtl.ID = Guid.NewGuid().ToString("N");
                _dtl.IS_GIFT = reqType == "1" ? "Y" : "N";
                _dtl.AUTH_ORG = order.AUTH_ORG;
                _dtl.AUTH_ORG = CurOrder.AUTH_ORG;
                input.Options["record"] = _dtl.ToJson();
                var _Asn = Asn.Clone();
                AddCommitAction("GenerateASN", () =>
@@ -210,7 +252,7 @@
                    var db = GetCommitDB();
                    //数据保存逻辑
                    db.Insertable(_Asn, UserCode).ExecuteCommand();
                    var y = db.Storageable(_dtl, UserCode).WhereColumns(t => new { t.ORDER_NO, t.LINE_NO, t.GHOST_ROW }).ToStorage();
                    var y = db.Storageable(_dtl).WhereColumns(t => new { t.ORDER_NO, t.LINE_NO, t.GHOST_ROW }).ToStorage();
                    y.AsInsertable.ExecuteCommand();
                    y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.ITEM_CODE, q.AUTH_ORG, q.QTY, q.STATUS, q.SUPP_CODE, q.SUPP_LOTNO, q.QTY_PACKING, q.QTY_GIFT, q.IS_GIFT, q.UPDATE_TIME, q.UPDATE_USER, }).ExecuteCommand();
                });
@@ -397,7 +439,6 @@
                //如果是随单赠品或者样品
                if (reqType.ToInt32() > 0)
                {
                    var rcvDocType = reqType == "1" ? "RCV01" : "RCV03";
                    var iInput = new CreateReceivementInput
                    {
                        userId = UserCode,
@@ -424,8 +465,8 @@
                                    RcvQtyPU = 0,
                                    EyeballingQtyTU = q.QTY,
                                    RcvProcedure = 0,
                                    RcvLotCode = rcvDocType == "RCV03" ? $"{DateTime.Now.ToString("yyyyMMdd")}" : "",
                                    InvLotCode = rcvDocType == "RCV03"? $"{DateTime.Now.ToString("yyyyMMdd")}": q.LOTNO,
                                    RcvLotCode = q.SUPP_LOTNO,
                                    InvLotCode =  q.LOTNO,
                                }).ToList(),
                            }
                        },
@@ -444,7 +485,7 @@
                    var iInput = new CreateRcvBySrcASNInput
                    {
                        userId = UserCode,
                        IsLogin = false, // true,
                        IsLogin = true,
                        CreateRcvBySrcASNParam = new()
                        {
                            aSNToRcvTransDTOs = finishNotSubmit.Select(q => new ASNToRcvTransDTO

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

@@ -123,6 +123,8 @@
        */
        [SugarColumn(IsIgnore = true)]
        public bool IsFinished { get; set; }
        [SugarColumn(IsIgnore = true)]
        public List<string> BarcodeList { get; set; }
        #endregion

        #region 外键属性