来料打印更新

Ben Lin

2 天以前 fe4a8ec610b23d33c697dbb76c298ff3b2e31ef1

 Tiger.Business.MES/iERP/MES_U9C.cs

@@ -32,10 +32,13 @@
        public static string RcvRptDocCreateUrl
        { get; set; } = ApiConfig.IsTestServer ? Cache.SysParam["RcvRptDocCreateUrl_Test", "U9CUrl"].PARAM_VALUE : Cache.SysParam["RcvRptDocCreateUrl", "U9CUrl"].PARAM_VALUE;  //"http://172.16.80.20/u9C/webapi/RcvRptDoc/Create"; 测试
        //public static string RcvRptDocCreateUrl
        //{ get; set; } = Cache.SysParam["RcvRptDocCreateUrl", "U9CUrl"].PARAM_VALUE;  //正式
        //{ get; set; } = Cache.SysParam["RcvRptDocCreateUrl", "U9CUrl"].PARAM_VALUE;  //正式 

        public static string U9CBarcodeCreateUrl
        { get; set; } = ApiConfig.IsTestServer ? Cache.SysParam["U9CBarcodeCreateUrl_Test", "U9CUrl"].PARAM_VALUE : Cache.SysParam["U9CBarcodeCreateUrl", "U9CUrl"].PARAM_VALUE;

        public static string CreateBarCodeByAssignQtyUrl
        { get; set; } = ApiConfig.IsTestServer ? Cache.SysParam["CreateBarCodeByAssignQty_Test", "U9CUrl"].PARAM_VALUE : Cache.SysParam["CreateBarCodeByAssignQty", "U9CUrl"].PARAM_VALUE;

        /// <summary>
        /// 入库单接口
@@ -56,10 +59,29 @@
                //    item.Status = "Y";
                //    if (!ErpProdInBth.IsNullOrEmpty())
                //    {
                //        ErpProdInBth.ORDER_NO = $"YDRKD24120000{5+i}";
                //        ErpProdInBth.ORDER_NO = $"YDRKD24120000{5 + i}";
                //        ErpProdInBth.IS_HANDLED = "Y";
                //        ErpProdInBth.HANDLED_DATE = DateTime.Now;
                //    }
                //    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,
                //                           }
                //                        },
                //                        Remark = "接口生成",
                //                        BusinessDate = DateTime.Now,
                //                    }
                //                };
                //    foreach (var p in input.PrintJsons)
                //    {
                //        var d = p.Items.Where(q => q.WORK_ORDER == item.WorkOrder).FirstOrDefault();
@@ -80,7 +102,7 @@
                //{
                //    action.CatchExceptionWithLog(_dbTran.ErrorException, $"数据处理失败");
                //    Logger.Interface.Error(action.Message);
                //    IsSuccessed = false;
                //    //IsSuccessed = false;
                //}

                //保存成功，调用U9C接口
@@ -137,13 +159,14 @@
                                Logger.Interface.Info($"生成入库单成功");

                                //条码主档
                                BarcodeCreateInput barcodeCreateInput = new() { 
                                BarcodeCreateInput barcodeCreateInput = new()
                                {
                                    RevDocId = result.Data[0].m_iD,
                                    userId = input.userId,
                                    token = token,
                                    IsLogin = false,
                                };
                                U9CBarcodeCreate(barcodeCreateInput);
                                await U9CBarcodeCreate(barcodeCreateInput);
                            }
                            else
                            {
@@ -250,6 +273,65 @@
            return action;
        }

        /// <summary>
        /// 半成品生成条码接口
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        public async Task<ApiAction<List<string>>> U9CCreateBarCodeByAssignQty(BarcodeCreateByAssignQtyInput input)
        {
            Logger.Interface.Info($"/**\r\n *进入半成品生成条码接口....\r\n */\r\n"); //固定写法
            var action = new ApiAction<List<string>>(new List<string>());
            try
            {
                if (input.IsLogin)
                {
                    var u9CLoginResult = await HttpHelper.GetAsync<U9CLoginResult>($"{U9CAuthLoginUrl}userCode={input.userId}{secret}");
                    if (u9CLoginResult.Success)
                    {
                        input.token = u9CLoginResult.Data;
                        Logger.Interface.Info($"U9C登录token: {input.token}");
                    }
                }
                List<BarcodeCreateByAssignQtyParam> param = new() {
                     new() {
                        CreateBarCodeEntitys = new(){
                                           new CreateBarCodeEntitys
                                           {
                                                EntityID = input.RevDocLineId, //入库单ID
                                                EntityType="UFIDA.U9.Complete.RCVRpt.RcvRptDocLine"
                                           }
                                        },
                        BarCodeRuleID = "1002308220305008",
                        CreateBarCodeItemQty = input.CreateBarCodeItemQty,
                        LabelQty = input.LabelQty,
                     }
                };
                var response = await HttpHelper.PostAsync(CreateBarCodeByAssignQtyUrl, JsonConvert.SerializeObject(param), new Dictionary<string, string>() { { "token", input.token } });
                var result = JsonConvert.DeserializeObject<BarcodeCreateByAssignQtyResult>(response.Message);
                if (result != null)
                {
                    if (result.Success && result.Data.IsSuccess)
                    {
                        Logger.Interface.Info($"半成品生成条码接口提交Json: {JsonConvert.SerializeObject(param)}，返回Json: {response.Message}");
                        action.Data = result.Data.Data;
                    }
                    else
                    {
                        action.IsSuccessed = false;
                        action.LocaleMsg = new($"{action.Message}; {result.Data.ErrorMessage}");
                        Logger.Interface.Info($"半成品生成条码失败:{result.Data.ErrorMessage}");
                    }
                }
            }
            catch (System.Exception ex)
            {
                action.CatchExceptionWithLog(ex, "半成品生成条码异常");
            }
            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>();