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

Rodney Chen

9 天以前 531f16f2f15bf792e3e719e00abb57a95356dedd

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

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

@@ -537,13 +537,13 @@
            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).ToPage(input.pageIndex, input.pageSize);
                                    .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.data.Select(o => o.DocNo).Contains(q.ORDER_NO)).ToPageAsync(input.pageIndex, input.pageSize);
            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.data.FirstOrDefault(q => q.DocNo == order.ORDER_NO)?.Status.ToString();
                order.ERP_STATUS_NAME = query.data.FirstOrDefault(q => q.DocNo == order.ORDER_NO)?.StatusName;
                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;

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

@@ -44,6 +44,7 @@
        private List<BIZ_U9_ASN_SN> CurSn = new();
        List<string> SnList = new();
        private string rcvDocType = "RCV03"; //默认无单
        private string CurReqType = "0"; 
        #endregion

        #region Functions
@@ -140,9 +141,9 @@
            var action = new ApiAction<ScanOutput>(new ScanOutput());
            try
            {
                var reqType = input.Options["reqType"].ToString();
                CurReqType = input.Options["reqType"].ToString();
                rcvDocType = "RCV01";
                if (reqType != "1")
                if (CurReqType != "1")
                {
                    action.IsSuccessed = false;
                    action.LocaleMsg = Biz.L($"不是随单赠品，不用扫描条码");
@@ -166,17 +167,17 @@
                if (CurSn.Count > 0 && _sns.Any())
                {
                    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)
                    CurOrder = 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 (CurOrder == null)
                    {
                        action.IsSuccessed = false;
                        action.LocaleMsg = Biz.L($"查不到ASN单[{_Order.ORDER_NO}]的数据");
                        action.LocaleMsg = Biz.L($"查不到ASN单[{CurOrder.ORDER_NO}]的数据");
                        return action;
                    }
                    _Order.Details = _Order.Details.Where(q => _sns[0].LINE_NO == q.LINE_NO).ToList();
                    CurOrder.Details = CurOrder.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;
                    CurOrder.BarcodeList = SnList;
                    action.Data.Data = CurOrder;
                    return action;
                }
                if (CurSn.Any(q=> q.ORDER_NO == AsnSn.ORDER_NO && q.LINE_NO == AsnSn.LINE_NO))
@@ -186,11 +187,14 @@
                    return action;
                }
                CurSn.Add(AsnSn);
                var _order = CurOrder.Clone();
                if (!CurOrder.ORDER_NO.StartsWith("WASN"))
                {
                CurOrder.ORDER_NO = $"WASN{DateTime.Now.ToString("yyyyMMddHHmmss")}";
                _order.Details = _order.Details.Where(q => CurSn.Any(s => s.LINE_NO == q.LINE_NO)).ToList();
                    CurOrder.STATUS = BIZ_U9_ASN.STATUSs.Arrived.GetValue();
                }
                CurOrder.Details = CurOrder.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;
                action.Data.Data = CurOrder;
            }
            catch (Exception ex)
            {
@@ -212,14 +216,26 @@
            try
            {
                var reqType = input.Options["reqType"].ToString();
                //如果类型不一样，则清除CurOrder
                if (CurReqType != reqType) {
                    CurOrder = null;
                    CurReqType = reqType;
                }
                var dtl = input.Options["record"].ToString().JsonToObject<BIZ_U9_ASN_DTL>();
                CurOrder = CurOrder??new() { 
                    ORDER_NO= $"WASN{DateTime.Now.ToString("yyyyMMddHHmmss")}",
                    SUPP_CODE = dtl.SUPP_CODE,
                    DELIVERY_DATE = DateTime.Now,
                    PLANARRIVED_DATE = DateTime.Now,
                    AUTH_ORG = OrgCode,
                };
                CurOrder.ORDER_NO = $"WASN{DateTime.Now.ToString("yyyyMMddHHmmss")}";
                if (!CurOrder.ORDER_NO.IsNullOrEmpty() && CurOrder.ORDER_NO.StartsWith("WASN") && CurOrder.STATUS == BIZ_U9_ASN.STATUSs.Counting.GetValue())
                {
                    action.IsSuccessed = false;
                    action.LocaleMsg = Biz.L($"已经生成ASN单[{CurOrder.ORDER_NO}]，请继续下一步操作");
                    return action;
                }

                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;
@@ -244,6 +260,7 @@
                _dtl.ID = Guid.NewGuid().ToString("N");
                _dtl.IS_GIFT = reqType == "1" ? "Y" : "N";
                _dtl.AUTH_ORG = CurOrder.AUTH_ORG;
                _dtl.LINE_NO = _dtl.LINE_NO ?? "10";
                input.Options["record"] = _dtl.ToJson();
                var _Asn = Asn.Clone();
                AddCommitAction("GenerateASN", () =>
@@ -282,10 +299,12 @@
                var dtl = input.Options["record"].ToString().JsonToObject<BIZ_U9_ASN_DTL>();
                action.LocaleMsg = Biz.L($"成功提交ASN单[{dtl.ORDER_NO}]行数据，请点击打印按钮打印标签");

                if (MainDB.Queryable<BIZ_U9_ASN_SN>().Where(q => q.ORDER_NO == dtl.ORDER_NO && q.LINE_NO == dtl.LINE_NO && (q.STATUS == WMS_ITEM.STATUSs.Counted.GetValue() || q.STATUS == WMS_ITEM.STATUSs.Rejected.GetValue())).Sum(q => q.QTY) == dtl.QTY)
                var asnSn = MainDB.Queryable<BIZ_U9_ASN_SN>().Where(q => q.ORDER_NO == dtl.ORDER_NO && q.LINE_NO == dtl.LINE_NO && (q.STATUS == WMS_ITEM.STATUSs.Counted.GetValue() || q.STATUS == WMS_ITEM.STATUSs.Rejected.GetValue())).ToList();
                if (asnSn.Count>0 && asnSn.Sum(q => q.QTY) == dtl.QTY)
                {
                    action.IsSuccessed = false;
                    action.LocaleMsg = dtl.ORDER_NO.IsNullOrEmpty() ? Biz.L($"数据不存在！") : Biz.L($"ASN单[{dtl.ORDER_NO}]行[{dtl.LINE_NO}]数据已全部提交完成，如果未打印标签请点击打印按钮打印标签");
                    SnList.AddRange(asnSn.Select(q=>q.SN));
                    return action;
                }
                List<BIZ_U9_ASN_SN> sns = new();
@@ -296,7 +315,8 @@
                SnList.Clear();
                foreach (var sn in snlist)
                {
                    var metaSn = DI.Resolve<ICodeRuleCache>()["NoSourceBarcode"]?.Generate($"{sn.SN}").Data.ToString() ?? "";
                    var strs = sn.SN.Split('/');
                    var metaSn = reqType == "2" ? $"{DI.Resolve<ICodeRuleCache>()["SampleBarcode"]?.Generate(strs[0],"/", strs[1], "/").Data.ToString() ?? ""}" : DI.Resolve<ICodeRuleCache>()["NoSourceBarcode"]?.Generate($"{sn.SN}").Data.ToString() ?? "";
                    SnList.Add(metaSn);
                    var barcode = new Barcode(metaSn);
                    BIZ_U9_ASN_SN info = new()
@@ -364,6 +384,7 @@
                {
                    sn.STATUS = WMS_ITEM.STATUSs.Counted.GetValue();
                }
                CurOrder.STATUS = BIZ_U9_ASN.STATUSs.Counting.GetValue();

                AddCommitAction("CountedAndPrint", () =>
                {
@@ -404,7 +425,7 @@
        public async Task<ApiAction> GenerateReceipt(BaseInput input)
        {
            var action = new ApiAction();
            var orderNo = input.Data;
            var orderNo = CurOrder.ORDER_NO;
            try
            {
                var reqType = input.Options["reqType"].ToString();
@@ -614,6 +635,8 @@
                    order.STATUS = BIZ_U9_ASN.STATUSs.Finished.GetValue();
                    order.RECEIVER = UserCode;
                    order.RECEIVE_DATE = DateTime.Now;
                    order.UPDATE_USER = UserCode;
                    order.REMARK = "";
                }

                //使用统一的事务DB对象
@@ -665,7 +688,7 @@
            doAfterSave?.Invoke();

            // 返回数据
            action.Data.Data = SnList;
            action.Data.Data = new { OrderNo = CurOrder.ORDER_NO, Sns = SnList };

            //action.LocaleMsg = Biz.L($"条码[{0}]清点成功！");
            //action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.CountSuccess", string.Join(",", SnList));