diff --git a/APP/QMAPP.Web/Web.config b/APP/QMAPP.Web/Web.config index cd2b3d9..a4244a0 100644 --- a/APP/QMAPP.Web/Web.config +++ b/APP/QMAPP.Web/Web.config @@ -40,7 +40,7 @@ - + - - + diff --git a/APPQ5/QMAPP.FJC.BLL/FIS/DoorPlankPlanBLL.cs b/APPQ5/QMAPP.FJC.BLL/FIS/DoorPlankPlanBLL.cs index 41291c0..b4efa1d 100644 --- a/APPQ5/QMAPP.FJC.BLL/FIS/DoorPlankPlanBLL.cs +++ b/APPQ5/QMAPP.FJC.BLL/FIS/DoorPlankPlanBLL.cs @@ -921,7 +921,7 @@ namespace QMAPP.FJC.BLL.FIS // return null; //} - if ((info.MATERIAL_CODE.Substring(0,4) == "018D"&& info.MATERIAL_CODE.Length > 10)|| (info.MATERIAL_CODE.Substring(0, 3) == "770" && info.MATERIAL_CODE.Length > 7)|| info.MATERIAL_CODE.Length>=14) + if (((info.MATERIAL_CODE.Substring(0,4) == "018D"|| info.MATERIAL_CODE.Substring(0, 4) == "278D") && info.MATERIAL_CODE.Length > 10)|| (info.MATERIAL_CODE.Substring(0, 3) == "770" && info.MATERIAL_CODE.Length > 7)|| info.MATERIAL_CODE.Length>=14) { string pbomcode = info.MATERIAL_CODE; List list = workCelldal.GetFirstWorkCell(pbomcode); diff --git a/APPQ5/QMAPP.FJC.Web/Temp/9ef5623b-a1f2-4480-8433-e9bf8f1e495a.xlsx b/APPQ5/QMAPP.FJC.Web/Temp/9ef5623b-a1f2-4480-8433-e9bf8f1e495a.xlsx new file mode 100644 index 0000000..de66b72 Binary files /dev/null and b/APPQ5/QMAPP.FJC.Web/Temp/9ef5623b-a1f2-4480-8433-e9bf8f1e495a.xlsx differ diff --git a/APPQ5/QMAPP.FJC.Web/Temp/d8f1416e-b152-48f8-9c96-ccc7273be267.xlsx b/APPQ5/QMAPP.FJC.Web/Temp/d8f1416e-b152-48f8-9c96-ccc7273be267.xlsx new file mode 100644 index 0000000..de66b72 Binary files /dev/null and b/APPQ5/QMAPP.FJC.Web/Temp/d8f1416e-b152-48f8-9c96-ccc7273be267.xlsx differ diff --git a/APPQ5/QMAPP.FJC.Web/Web.config b/APPQ5/QMAPP.FJC.Web/Web.config index d0e42d0..bccd268 100644 --- a/APPQ5/QMAPP.FJC.Web/Web.config +++ b/APPQ5/QMAPP.FJC.Web/Web.config @@ -31,7 +31,7 @@ - + + - + --> diff --git a/APPQ5/QMAPP.WinForm/App.config b/APPQ5/QMAPP.WinForm/App.config index 25c28b4..442a620 100644 --- a/APPQ5/QMAPP.WinForm/App.config +++ b/APPQ5/QMAPP.WinForm/App.config @@ -7,8 +7,8 @@ - - + @@ -18,10 +18,12 @@ --> + --> + + - @@ -231,6 +233,12 @@ --> + + + + diff --git a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config index c9ff77c..877c4c7 100644 --- a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config +++ b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config @@ -63,10 +63,10 @@ - + @@ -88,7 +88,7 @@ - +