diff --git a/APP/QMAPP.Web/Web.config b/APP/QMAPP.Web/Web.config index 415d229..c3f7b40 100644 --- a/APP/QMAPP.Web/Web.config +++ b/APP/QMAPP.Web/Web.config @@ -62,10 +62,12 @@ - --> + + --> + - - + + + + - + 查询 添加 diff --git a/APPQ5/QMAPP.FJC.Web/Temp/10dd0d47-944d-4299-919a-05dcf58cf5a9.xlsx b/APPQ5/QMAPP.FJC.Web/Temp/10dd0d47-944d-4299-919a-05dcf58cf5a9.xlsx new file mode 100644 index 0000000..06cb52a Binary files /dev/null and b/APPQ5/QMAPP.FJC.Web/Temp/10dd0d47-944d-4299-919a-05dcf58cf5a9.xlsx differ diff --git a/APPQ5/QMAPP.FJC.Web/Temp/a9859cca-44fa-4a2f-9b58-a8287dd18ef9.xlsx b/APPQ5/QMAPP.FJC.Web/Temp/a9859cca-44fa-4a2f-9b58-a8287dd18ef9.xlsx new file mode 100644 index 0000000..32e7d69 Binary files /dev/null and b/APPQ5/QMAPP.FJC.Web/Temp/a9859cca-44fa-4a2f-9b58-a8287dd18ef9.xlsx differ diff --git a/APPQ5/QMAPP.FJC.Web/Web.config b/APPQ5/QMAPP.FJC.Web/Web.config index 954ff00..f99facc 100644 --- a/APPQ5/QMAPP.FJC.Web/Web.config +++ b/APPQ5/QMAPP.FJC.Web/Web.config @@ -71,8 +71,10 @@ --> - - + + + diff --git a/APPQ5/QMAPP.WinForm/App.config b/APPQ5/QMAPP.WinForm/App.config index 97f4c95..4f0a479 100644 --- a/APPQ5/QMAPP.WinForm/App.config +++ b/APPQ5/QMAPP.WinForm/App.config @@ -12,8 +12,10 @@ - - + + + diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.cs index c004b0b..a954f27 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.cs @@ -288,6 +288,7 @@ namespace QMAPP.WinForm.Forms.TianJin list.Add(new Linese() { NAME = "770B", CODE = "770B" }); list.Add(new Linese() { NAME = "278D", CODE = "278D" }); list.Add(new Linese() { NAME = "493D", CODE = "493D" }); + list.Add(new Linese() { NAME = "304D", CODE = "304D" }); this.Lines.DataSource = list; this.Lines.DisplayMember = "NAME"; this.Lines.ValueMember = "CODE"; diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs index aa211ec..7838598 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs @@ -1221,8 +1221,10 @@ namespace QMAPP.WinForm.Forms.TianJin plan.LINENO = "018D"; else if(mach.Substring(0, 3) == "493") plan.LINENO = "493D"; + else if (mach.Substring(0, 3) == "304") + plan.LINENO = "304D"; - if (plan.LINENO == "770B") + if (plan.LINENO == "770B"|| plan.LINENO == "304D") { foreach (var s in "R,F".Split(',')) { diff --git a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config index a8de4d7..b4055f8 100644 --- a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config +++ b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config @@ -75,9 +75,12 @@ - --> + + --> + + -