一些优化

Ben Lin

2024-12-03 6cc05f3689e7616431886ec183948c433a30220c

 Tiger.Business.MES/iERP/MES_U9C.cs

@@ -19,57 +19,184 @@
using System.Diagnostics;
using Tiger.Model.Entitys.MES.U9C;
using Newtonsoft.Json.Linq;
using System.Security.Policy;
using NetTaste;

namespace Tiger.Business.MES
{
    public partial class MES_U9C : IMES_U9C
    {
        public static string U9CAuthLoginUrl { get; set; } = "http://172.16.80.20/U9C/webapi/OAuth2/AuthLogin";
        public static string U9CAuthLoginUrl { get; set; } = Biz.SysParam["U9CAuthLoginUrl_Test", "U9CUrl"].PARAM_VALUE; // "http://172.16.80.20/U9C/webapi/OAuth2/AuthLogin?"; 测试
        //public static string U9CAuthLoginUrl { get; set; } = Biz.SysParam["U9CAuthLoginUrl", "U9CUrl"].PARAM_VALUE; //正式
        public static string secret = "&entcode=02&orgcode=101&clientid=mes&clientsecret=12c8ee7e9bb74ad2a6a0fb3315c8af20";
        public static string RcvRptDocCreateUrl
        { get; set; } = Biz.SysParam["RcvRptDocCreateUrl_Test", "U9CUrl"].PARAM_VALUE;  //"http://172.16.80.20/u9C/webapi/RcvRptDoc/Create"; 测试
        //public static string RcvRptDocCreateUrl
        //{ get; set; } = Biz.SysParam["RcvRptDocCreateUrl", "U9CUrl"].PARAM_VALUE;  //正式

        /// <summary>
        /// 入库单接口
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        public async Task<ApiAction> RcvRptDocCreate(RcvRptDocCreateInput input)
        public async Task<ApiAction<RcvRptDocCreateInput>> RcvRptDocCreate(RcvRptDocCreateInput input)
        {
            Logger.Interface.Info($"/**\r\n *进入入库单接口....\r\n */\r\n"); //固定写法
            var action = new ApiAction();
            var action = new ApiAction<RcvRptDocCreateInput>();
            try
            {
                JObject json = new JObject();
                json["CompleteList"] = new JArray(); // 创建一个空的JArray
                JObject moKey = new JObject();
                moKey["DocNo"] = input.WorkOrder;
                JObject Wh = new JObject();
                Wh["Code"] = input.WhCode;
                json["CompleteList"]["Wh"] = Wh;
                JObject DescFlexField = new JObject();
                DescFlexField["PrivateDescSeg1"] = input.PkgQty;
                json["CompleteList"]["DescFlexField"] = DescFlexField;
                JObject Item = new JObject();
                Item["Code"] = input.ItemCode;
                json["CompleteList"]["Item"] = Item;
                json["CompleteList"]["CompleteQty"] = input.CompleteQty;
                json["CompleteList"]["OutputType"] = input.OutputType;
                json["CompleteList"]["StorageType"] = input.StorageType;
                json["CompleteList"]["DocState"] = input.DocState;

                var response = await HttpHelper.PostAsync(U9CAuthLoginUrl, json);
                var result = JsonConvert.DeserializeObject<U9CReturnData>(response.Message);
                Logger.Interface.Info($"生成入库单接口提交Json: {json}，返回Json: {response.Message}");
                //先保存数据
                bool IsSuccessed = true;
                var db = Biz.Db;
                var dbTran = db.UseTran(() =>
                {


                    var s = db.Storageable(input.ErpProdInBths, "U9C_RcvRptDocCreate")
                                .WhereColumns(t => new { t.ORDER_NO, t.WORK_ORDER, t.GHOST_ROW })
                                .ToStorage();
                    s.AsInsertable.ExecuteCommand();
                    s.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
                });
                if (!dbTran.IsSuccess)
                {
                    action.CatchExceptionWithLog(dbTran.ErrorException, $"数据处理失败");
                    Logger.Interface.Error(action.Message);
                    IsSuccessed = false;
                }
                Logger.Interface.Info($"生成入库单成功");

                //保存成功，调用U9C接口-测试用
                //int i = 1;
                //List<BIZ_ERP_PROD_IN_BTH> ErpProdInBths = new List<BIZ_ERP_PROD_IN_BTH>();
                //foreach (var item in input.RcvRptDocBases.Where(q => q.Status != "Y"))
                //{
                //    var ErpProdInBth = Biz.Db.Queryable<BIZ_ERP_PROD_IN_BTH>().Where(q => q.WORK_ORDER == item.WorkOrder).First();
                //    item.Status = "Y";
                //    if (!ErpProdInBth.IsNullOrEmpty())
                //    {
                //        ErpProdInBth.ORDER_NO = $"XX001-{i}";
                //        ErpProdInBth.IS_HANDLED = "Y";
                //        ErpProdInBth.HANDLED_DATE = DateTime.Now;
                //        ErpProdInBths.Add(ErpProdInBth);
                //    }
                //    foreach (var p in input.PrintJsons)
                //    {
                //        var d = p.Items.Where(q => q.WORK_ORDER == item.WorkOrder).FirstOrDefault();
                //        if (!d.IsNullOrEmpty())
                //        {
                //            d.ORDER_NO = $"XX001-{i}";
                //            d.STATUS = "Y";
                //        }
                //    }
                //    i++;
                //}
                //var _db = Biz.Db;
                //var _dbTran = _db.UseTran(() =>
                //{
                //    _db.Updateable(ErpProdInBths, "U9C_RcvRptDocCreate").UpdateColumns(x => new { x.ORDER_NO, x.REMARK, x.IS_HANDLED, x.HANDLED_DATE }).ExecuteCommand();
                //});
                //if (!dbTran.IsSuccess)
                //{
                //    action.CatchExceptionWithLog(dbTran.ErrorException, $"数据处理失败");
                //    Logger.Interface.Error(action.Message);
                //    IsSuccessed = false;
                //}
                //input.ErpProdInBths = ErpProdInBths;

                //保存成功，调用U9C接口
                if (IsSuccessed)
                {
                    var u9CLoginResult = await HttpHelper.GetAsync<U9CLoginResult>($"{U9CAuthLoginUrl}userCode=admin{secret}");
                    if (u9CLoginResult.Success)
                    {
                        var token = u9CLoginResult.Data;
                        Logger.Interface.Info($"U9C登录token: {token}");
                        List<BIZ_ERP_PROD_IN_BTH> ErpProdInBths = new List<BIZ_ERP_PROD_IN_BTH>();
                        foreach (var item in input.RcvRptDocBases.Where(q => q.Status != "Y"))
                        {
                            List<RcvRptDocCreateParam> param = new() {
                                new() {
                                    CompleteList = new(){
                                       new CompleteList
                                       {
                                            MOKey = new MOKey { DocNo = item.WorkOrder },
                                            Wh = new Wh { Code = item.WhCode },
                                            DescFlexField = new DescFlexField { PrivateDescSeg1 = item.PkgQty.ToString() },
                                            Item = new Item { Code = item.ItemCode },
                                            CompleteQty = item.CompleteQty,
                                            OutputType = item.OutputType,
                                            StorageType = item.StorageType,
                                            DocState = item.DocState,
                                       }
                                    }
                                }
                            };
                            var response = await HttpHelper.PostAsync(RcvRptDocCreateUrl, JsonConvert.SerializeObject(param), new Dictionary<string, string>() { { "token", token } });
                            var result = JsonConvert.DeserializeObject<U9CResult>(response.Message);
                            var ErpProdInBth = Biz.Db.Queryable<BIZ_ERP_PROD_IN_BTH>().Where(q => q.WORK_ORDER == item.WorkOrder).First();
                            if (result != null)
                            {
                                if (result.Success && result.Data[0].m_isSucess)
                                {
                                    Logger.Interface.Info($"生成入库单接口提交Json: {JsonConvert.SerializeObject(param)}，返回Json: {response.Message}");
                                    item.Status = "Y";
                                    if (!ErpProdInBth.IsNullOrEmpty())
                                    {
                                        ErpProdInBth.ORDER_NO = result.Data[0].m_code;
                                        ErpProdInBth.IS_HANDLED = "Y";
                                        ErpProdInBth.HANDLED_DATE = DateTime.Now;
                                        ErpProdInBths.Add(ErpProdInBth);
                                    }
                                    foreach (var p in input.PrintJsons)
                                    {
                                        var d = p.Items.Where(q => q.WORK_ORDER == item.WorkOrder && q.STATUS !="P").FirstOrDefault();
                                        if (!d.IsNullOrEmpty())
                                        {
                                            d.ORDER_NO = result.Data[0].m_code;
                                            d.STATUS = "Y";
                                        }
                                    }
                                    Logger.Interface.Info($"生成入库单成功");
                                }
                                else
                                {
                                    action.IsSuccessed = false;
                                    action.LocaleMsg = new($"{action.Message}; {result.Data[0].m_errorMsg}");
                                    item.Status = "F";
                                    if (!ErpProdInBth.IsNullOrEmpty())
                                    {
                                        ErpProdInBth.REMARK = result.Data[0].m_errorMsg;
                                        ErpProdInBth.IS_HANDLED = "F";
                                        ErpProdInBth.HANDLED_DATE = DateTime.Now;
                                        ErpProdInBths.Add(ErpProdInBth);
                                    }
                                    foreach (var p in input.PrintJsons)
                                    {
                                        var d = p.Items.Where(q => q.WORK_ORDER == item.WorkOrder && q.STATUS != "P").FirstOrDefault();
                                        if (!d.IsNullOrEmpty())
                                        {
                                            d.ORDER_NO = result.Data[0].m_code;
                                            d.STATUS = "F";
                                        }
                                    }
                                    Logger.Interface.Info($"生成入库单失败:{result.Data[0].m_errorMsg}");
                                }
                            }
                        }
                        var _db = Biz.Db;
                        var _dbTran = _db.UseTran(() =>
                        {
                            _db.Updateable(ErpProdInBths, "U9C_RcvRptDocCreate").UpdateColumns(x => new { x.ORDER_NO, x.REMARK, x.IS_HANDLED, x.HANDLED_DATE }).ExecuteCommand();
                        });
                        if (!dbTran.IsSuccess)
                        {
                            action.CatchExceptionWithLog(dbTran.ErrorException, $"数据处理失败");
                            Logger.Interface.Error(action.Message);
                            IsSuccessed = false;
                        }
                        input.ErpProdInBths = ErpProdInBths;
                    }
                }
                input.labels = GetLabels(input.PrintJsons);
                action.Data = input;
            }
            catch (System.Exception ex)
            {
@@ -78,5 +205,77 @@
            Logger.Interface.Info($"/* 入库单接口结束 */\r\n"); //固定写法
            return action;
        }

        private List<BAS_LABEL_TEMP> GetLabels(List<InStorePrintJson> printJsons) {
            List<BAS_LABEL_TEMP> labels = new List<BAS_LABEL_TEMP>();
            int i = 1;
            int j = 1;
            foreach (var p in printJsons)
            {
                BAS_LABEL_TEMP label = Biz.Db.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == "InstoreTemplate").First();
                foreach (var item in label.Variables.OrderBy(q => q.VAR_TYPE == BAS_LABEL_VAR.VAR_TYPEs.BarcodeGenerate.GetValue() ? 0 : 1))
                {
                    foreach (var v in p.Items.Where(q=>q.STATUS !="F" && q.STATUS !="P"))
                    {
                        if (item.VAR_NAME.StartsWith("RcvDoc"))
                        {
                            item.Value = v.ORDER_NO;
                        }
                        if (item.VAR_NAME.StartsWith("SoDoc"))
                        {
                            item.Value = v.SALES_ORDER;
                        }
                        if (item.VAR_NAME.StartsWith("MoDoc"))
                        {
                            item.Value = v.WORK_ORDER;
                        }
                        if (item.VAR_NAME.StartsWith("ItemCode"))
                        {
                            item.Value = v.ITEM_CODE;
                        }
                        if (item.VAR_NAME.StartsWith("Description"))
                        {
                            item.Value = v.ITEM_NAME;
                        }
                        if (item.VAR_NAME.StartsWith("BoxQty"))
                        {
                            item.Value = v.PLAN_QTY.ToString();
                        }
                        if (item.VAR_NAME.StartsWith("InQty"))
                        {
                            item.Value = v.SCAN_QTY.ToString();
                        }
                        if (item.VAR_NAME.StartsWith("RcvQrCode"))
                        {
                            item.Value = v.ORDER_NO.ToString();
                        }
                        if (item.VAR_NAME.StartsWith("SapCode"))
                        {
                            item.Value = v.SapCode;
                        }
                        if (item.VAR_NAME.StartsWith("Seq"))
                        {
                            item.Value = i.ToString();
                        }
                        i++;
                    }
                    if (item.VAR_NAME == "PageNum")
                    {
                        item.Value = j.ToString();
                    }
                    if (item.VAR_NAME == "PageSize")
                    {
                        item.Value = printJsons.Count.ToString();
                    }
                    if (item.VAR_NAME == "BusinessDate")
                    {
                        item.Value = DateTime.Now.ToString("yyyyy.MM.dd");
                    }
                }
                labels.Add(label);
                j++;
            }
            return labels;
        }
    }
}