From cb7729d9926dc612e3c7b15ecb70f347ec70da62 Mon Sep 17 00:00:00 2001 From: qian Date: Fri, 12 Jan 2024 15:18:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E9=9B=B6=E4=BB=B6?= =?UTF-8?q?=E5=8F=AF=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/SCP_DC_UNI_CONTROLLER.cs | 6 +- 北京北汽/Controller/SCP_PO_CONTROLLER.cs | 2 +- .../SCP/Views/PlanData/SCP_PO.aspx.cs | 70 +++++++++++-------- 3 files changed, 45 insertions(+), 33 deletions(-) diff --git a/北京北汽/Controller/SCP_DC_UNI_CONTROLLER.cs b/北京北汽/Controller/SCP_DC_UNI_CONTROLLER.cs index f59e66e..28000db 100644 --- a/北京北汽/Controller/SCP_DC_UNI_CONTROLLER.cs +++ b/北京北汽/Controller/SCP_DC_UNI_CONTROLLER.cs @@ -2636,7 +2636,7 @@ namespace CK.SCP.Controller _PO_Detail.Scheduledays = string.IsNullOrEmpty(itm.日程天数) ? 7 : int.Parse(itm.日程天数); _PO_Detail.Scheduleweeks = string.IsNullOrEmpty(itm.日程周数) ? 2 : int.Parse(itm.日程周数); _PO_Detail.Schedulemonth = string.IsNullOrEmpty(itm.日程月数) ? 1 : int.Parse(itm.日程月数); - _PO_Detail.Supplieritem = itm.供应商零件.Trim(); + _PO_Detail.Supplieritem = itm.供应商零件; _PO_Detail.Dliverypatterncode = itm.发货样式; _PO_Detail.Deliverytimecode = itm.发货时间样式; _PO_Detail.Transportdays = string.IsNullOrEmpty(itm.运输周期) ? 0 : int.Parse(itm.运输周期); @@ -2760,7 +2760,7 @@ namespace CK.SCP.Controller _PO_Detail.Scheduledays = string.IsNullOrEmpty(itm.日程天数) ? 7 : int.Parse(itm.日程天数); _PO_Detail.Scheduleweeks = string.IsNullOrEmpty(itm.日程周数) ? 2 : int.Parse(itm.日程周数); _PO_Detail.Schedulemonth = string.IsNullOrEmpty(itm.日程月数) ? 1 : int.Parse(itm.日程月数); - _PO_Detail.Supplieritem = itm.供应商零件.Trim(); + _PO_Detail.Supplieritem = itm.供应商零件; _PO_Detail.Dliverypatterncode = itm.发货样式; _PO_Detail.Deliverytimecode = itm.发货时间样式; _PO_Detail.Transportdays = string.IsNullOrEmpty(itm.运输周期) ? 0 : int.Parse(itm.运输周期); @@ -2863,7 +2863,7 @@ namespace CK.SCP.Controller _ret.State = ReturnStatus.Failed; LogHelper.Writlog(LogHelper.LogType.Error, typeof(TEA_TASK_SUB), "InsterPo", e.Message); _ret.Result = false; - _ret.Message = e.InnerException.Message; + _ret.Message = e.InnerException != null? e.Message+ e.InnerException.Message:e.Message; scope.Dispose(); } diff --git a/北京北汽/Controller/SCP_PO_CONTROLLER.cs b/北京北汽/Controller/SCP_PO_CONTROLLER.cs index a35bc2b..7079050 100644 --- a/北京北汽/Controller/SCP_PO_CONTROLLER.cs +++ b/北京北汽/Controller/SCP_PO_CONTROLLER.cs @@ -4014,7 +4014,7 @@ namespace CK.SCP.Controller _PO_Detail.Scheduledays = string.IsNullOrEmpty(itm.日程天数) ? 7 : int.Parse(itm.日程天数); _PO_Detail.Scheduleweeks = string.IsNullOrEmpty(itm.日程周数) ? 2 : int.Parse(itm.日程周数); _PO_Detail.Schedulemonth = string.IsNullOrEmpty(itm.日程月数) ? 1 : int.Parse(itm.日程月数); - _PO_Detail.Supplieritem = itm.供应商零件.Trim().ToUpper(); + _PO_Detail.Supplieritem = itm.供应商零件.ToUpper(); _PO_Detail.Dliverypatterncode = itm.发货样式; _PO_Detail.Deliverytimecode = itm.发货时间样式; _PO_Detail.Transportdays = string.IsNullOrEmpty(itm.运输周期) ? 0 : int.Parse(itm.运输周期); diff --git a/北京北汽/SCP/Views/PlanData/SCP_PO.aspx.cs b/北京北汽/SCP/Views/PlanData/SCP_PO.aspx.cs index 09119db..0c43149 100644 --- a/北京北汽/SCP/Views/PlanData/SCP_PO.aspx.cs +++ b/北京北汽/SCP/Views/PlanData/SCP_PO.aspx.cs @@ -220,28 +220,52 @@ namespace SCP.PlanData return; } List list1 = new List(); - list1 = CheckPartCode(partCodeList); - if (list1.Count()>0) + try { - Alert.Show(string.Format("导入文件中有不存在的零件，如{0}", list1.FirstOrDefault())); - FileUp.Reset(); - return; + list1 = CheckPartCode(partCodeList); + if (list1.Count() > 0) + { + Alert.Show(string.Format("导入文件中有不存在的零件，如{0}", list1.FirstOrDefault())); + FileUp.Reset(); + return; + } + var checkret = SCP_PO_CONTROLLER.Check_EXCEL_PO_MOD(list, p_modtype, CurrentUser.FactoryList[0], CurrentUser.SubSiteList[0]); + if (checkret.State == ReturnStatus.Failed && checkret.Result == false) + { + Alert.Show(string.Join("
", checkret.MessageList)); + FileUp.Reset(); + return; + } + if (CurrentUser.ConfigList.ContainsKey("数据中心接口")) + { + saveret = SCP_DC_UNI_CONTROLLER.WritePo(list, CurrentUser.FactoryList[0], CurrentUser.Name, DateTime.Now, p_modtype, CurrentUser.SubSiteList[0], CurrentUser.ChineseName, CurrentUser.CellPhone); + } + else + { + saveret = SCP_PO_CONTROLLER.Save_EXCEL_PO_MOD(list, CurrentUser.FactoryList[0], CurrentUser.Name, DateTime.Now, p_modtype, CurrentUser.SubSiteList[0], CurrentUser.ChineseName, CurrentUser.CellPhone); + } + if (saveret.State == ReturnStatus.Succeed && saveret.Result == true) + { + BindOrder(); + Alert.Show("订单编号" + saveret.Message + "导入成功！"); + return; + } + else + { + //Alert.Show(string.Join("
", saveret.MessageList)); + Alert.Show(saveret.Message); + FileUp.Reset(); + return; + } } - var checkret = SCP_PO_CONTROLLER.Check_EXCEL_PO_MOD(list, p_modtype, CurrentUser.FactoryList[0], CurrentUser.SubSiteList[0]); - if (checkret.State == ReturnStatus.Failed && checkret.Result == false) + catch(Exception ex) { - Alert.Show(string.Join("
", checkret.MessageList)); + Alert.Show(ex.Message); + LogHelper.Writlog(LogHelper.LogType.Error, typeof(TEA_TASK_SUB), "InsterPo", ex.Message); FileUp.Reset(); return; } - if (CurrentUser.ConfigList.ContainsKey("数据中心接口")) - { - saveret = SCP_DC_UNI_CONTROLLER.WritePo(list, CurrentUser.FactoryList[0], CurrentUser.Name, DateTime.Now, p_modtype, CurrentUser.SubSiteList[0], CurrentUser.ChineseName, CurrentUser.CellPhone); - } - else - { - saveret = SCP_PO_CONTROLLER.Save_EXCEL_PO_MOD(list, CurrentUser.FactoryList[0], CurrentUser.Name, DateTime.Now, p_modtype, CurrentUser.SubSiteList[0], CurrentUser.ChineseName, CurrentUser.CellPhone); - } + //if (CurrentUser.ConfigList.ContainsKey("数据中心接口")) //{ // var apiret = SCP_DC_UNI_CONTROLLER.InsterPo(list, CurrentUser.FactoryList[0], CurrentUser.Name, DateTime.Now, p_modtype, CurrentUser.SubSiteList[0]); @@ -252,19 +276,7 @@ namespace SCP.PlanData // } //} //var saveret = SCP_PO_CONTROLLER.Save_EXCEL_PO_MOD(list, CurrentUser.FactoryList[0], CurrentUser.Name, DateTime.Now, p_modtype, CurrentUser.SubSiteList[0], CurrentUser.ChineseName, CurrentUser.CellPhone); - if (saveret.State == ReturnStatus.Succeed && saveret.Result == true) - { - BindOrder(); - Alert.Show("订单编号" + saveret.Message + "导入成功！"); - return; - } - else - { - //Alert.Show(string.Join("
", saveret.MessageList)); - Alert.Show(saveret.Message); - FileUp.Reset(); - return; - } + } protected void BTN_CREATE_Click(object sender, EventArgs e) {