From 48b92ad114d76907ce2e1e6f645c5cd2f0c55fbc Mon Sep 17 00:00:00 2001 From: ch <37327@LLOOCCY> Date: 星期一, 15 八月 2022 19:30:27 +0800 Subject: [PATCH] 新增了了缺料看板相同订单号只显示第一行订单号功能 --- NETERPNoWin/obj/x86/Debug/Interop.gregn6Lib.dll | 0 NETERPNoWin/bin/x86/Debug/Pub_Class.pdb | 0 Kanban/Sc_CJKB.cs | 18 ++++---- NETERPNoWin/bin/x86/Debug/Kanban.dll | 0 NETERPNoWin/bin/x86/Debug/WorkM.dll | 0 NETERPNoWin/bin/x86/Debug/BaseSet.dll | 0 NETERPNoWin/bin/x86/Debug/OAM.pdb | 0 NETERPNoWin/bin/x86/Debug/Pub_Class.dll | 0 NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe | 0 NETERPNoWin/bin/x86/Debug/BaseSet.pdb | 0 NETERPNoWin/bin/x86/Debug/DBUtility.dll | 0 NETERPNoWin/bin/x86/Debug/Kanban.pdb | 0 NETERPNoWin/bin/x86/Debug/BLL.dll | 0 NETERPNoWin/bin/x86/Debug/Pub_Control.dll | 0 NETERPNoWin/bin/x86/Debug/DBUtility.pdb | 0 NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll | 0 NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt | 1 NETERPNoWin/bin/x86/Debug/SQLHelper.dll | 0 WebAPI/Web.config | 6 +- NETERPNoWin/bin/x86/Debug/BLL.pdb | 0 Kanban/Sc_QLKB.cs | 25 ++++++++++-- NETERPNoWin/Program.cs | 10 +++-- NETERPNoWin/bin/x86/Debug/Model.pdb | 0 NETERPNoWin/bin/x86/Debug/DAL.pdb | 0 NETERPNoWin/bin/x86/Debug.zip | 0 NETERPNoWin/bin/x86/Debug/stdole.dll | 0 NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe | 0 NETERPNoWin/bin/x86/Debug/SQLHelper.pdb | 0 NETERPNoWin/bin/x86/Debug/Pub_Control.pdb | 0 NETERPNoWin/obj/x86/Debug/NETERPNoWin.csprojAssemblyReference.cache | 0 NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb | 0 NETERPNoWin/bin/x86/Debug/PlanM.dll | 0 NETERPNoWin/bin/x86/Debug/DAL.dll | 0 NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb | 0 NETERPNoWin/bin/x86/Debug/WarM.pdb | 0 NETERPNoWin/bin/x86/Debug/OAM.dll | 0 NETERPNoWin/bin/x86/Debug/WarM.dll | 0 DBUtility/业务单据/Xt_BaseBillFun.cs | 58 ++++++++++++++++++++++++++++ NETERPNoWin/bin/x86/Debug/WorkM.pdb | 0 NETERPNoWin/bin/x86/Debug/Model.dll | 0 NETERPNoWin/bin/x86/Debug/PlanM.pdb | 0 41 files changed, 97 insertions(+), 21 deletions(-) diff --git "a/DBUtility/\344\270\232\345\212\241\345\215\225\346\215\256/Xt_BaseBillFun.cs" "b/DBUtility/\344\270\232\345\212\241\345\215\225\346\215\256/Xt_BaseBillFun.cs" index 12d414a..82acb8b 100644 --- "a/DBUtility/\344\270\232\345\212\241\345\215\225\346\215\256/Xt_BaseBillFun.cs" +++ "b/DBUtility/\344\270\232\345\212\241\345\215\225\346\215\256/Xt_BaseBillFun.cs" @@ -517,7 +517,50 @@ } } - + + + public static void GraphLine_XB(DataGridView grdMain, int MainIDCol, int SubIDCol, string s, ref long n) + { + long HMainID = 0; + bool b = false; + //循环所有行 + for (int i = 0; i < grdMain.RowCount; i++) + { + if (HMainID == 0) + { + HMainID = ClsPub.isLong(grdMain.Rows[i].Cells[MainIDCol].Value); + n++; + } + else + { + if (HMainID == ClsPub.isLong(grdMain.Rows[i].Cells[MainIDCol].Value)) + { + if (s == "否") + { + //区域性清空 + SetDataGrid(grdMain, i, MainIDCol + 1, i, SubIDCol - 1, ""); + + } + } + else + { + HMainID = ClsPub.isLong(grdMain.Rows[i].Cells[MainIDCol].Value); + b = !b; + n++; + } + } + if (b) + { + grdMain.Rows[i].DefaultCellStyle.BackColor = Color.Black; + } + else + { + grdMain.Rows[i].DefaultCellStyle.BackColor = Color.Black; + } + } + } + + //设置网格 public static void SetDataGrid(DataGridView grdMain, int BRow, int BCol, int ERow, int ECol, string sText) { @@ -531,6 +574,19 @@ } + //设置网格 + public static void SetDataGrid_XB(DataGridView grdMain, int BRow, int BCol, int ERow, int ECol, string sText) + { + for (int i = BRow; i <= ERow; i++) + { + for (int j = BCol; j <= ECol; j++) + { + grdMain.Rows[i].Cells[j].Value = DBNull.Value; + } + } + + } + //画网格下线 /// <summary> /// 画网格下线 diff --git a/Kanban/Sc_CJKB.cs b/Kanban/Sc_CJKB.cs index 384539a..f05b93a 100644 --- a/Kanban/Sc_CJKB.cs +++ b/Kanban/Sc_CJKB.cs @@ -102,15 +102,15 @@ //寮�宸ユ椂闂村皬浜庡綋澶╂椂闂达紝浣嗘槸浠诲姟鍗曠姸鎬佽繕鏄� 寰呯敓浜э紝绯荤粺鑷姩榛勮壊璀︾ず锛� //瀹屽伐鏃堕棿灏忎簬褰撳ぉ鏃堕棿锛屼絾鏄换鍔″崟杩樻槸寰呯敓浜ф垨鑰呭湪鎵ц鐨勶紝绯荤粺鑷姩绾㈣壊璀︾ず锛� - //int HEDateCol = Fun_GetCol("璁″垝瀹屽伐鏃ユ湡"); - //DateTime oNow = DateTime.Today.Date; - //for (int i = 0; i < grdMain.Rows.Count; i++) - //{ - // if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow) - // { - // grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red; - // } - //} + int HEDateCol = Fun_GetCol("璁″垝瀹屽伐鏃ユ湡"); + DateTime oNow = DateTime.Today.Date; + for (int i = 0; i < grdMain.Rows.Count; i++) + { + if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow) + { + grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red; + } + } //璁剧疆鍚堣鍒� string sTotalCol = ""; diff --git a/Kanban/Sc_QLKB.cs b/Kanban/Sc_QLKB.cs index 49a7f84..fd70aad 100644 --- a/Kanban/Sc_QLKB.cs +++ b/Kanban/Sc_QLKB.cs @@ -148,7 +148,7 @@ //ClsIni clsIni = new ClsIni(); //string text = ClsIni.ReadIni("Dept", "DeptID", Pub_Class.ClsPub.AppPath + "\\HXErp_SY.ini"); //this.sDeptID = text; - + string s = ""; ClsCN SubCn = new ClsCN(); string sSql = ""; @@ -156,7 +156,7 @@ ClsIni oIni = new ClsIni(); string sID = ClsIni.ReadIni("Dept", "DeptID", Pub_Class.ClsPub.AppPath + @"\" + "HXErp_SY.ini"); sDeptID = sID; - string procName = "exec h_p_QLKB " + this.sDeptID; + string procName = "exec h_p_QLKB_CS " + this.sDeptID; this.DSet = SubCn.RunProcReturn(procName, this.ViewName, ref Pub_Class.ClsPub.sExeReturnInfo); bool flag = this.DSet == null; if (!flag) @@ -170,7 +170,7 @@ }); this.oSumGrid.BuildTotalCols(cols); int frCol = 10; - string s = "鏄�"; + s = "鍚�"; Xt_BaseBillFun.DisplayGrid(this.grdMain, base.Name, s, frCol); } int HEDateCol = Fun_GetCol("璁″垝寮�宸ユ棩鏈�"); @@ -182,7 +182,13 @@ grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red; } } - } + s = "鍚�"; + int MainIDCol = Fun_GetCol("hmainid"); + int SubIDCol = Fun_GetCol("hsubid"); + long n = 0; + DBUtility.Xt_BaseBillFun.GraphLine_XB(grdMain, MainIDCol, SubIDCol, s, ref n); + + } catch (Exception e) { return; @@ -327,6 +333,17 @@ grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red; } } + + + int MainIDCol = Fun_GetCol("hmainid"); + int SubIDCol = Fun_GetCol("hsubid"); + string s = "鍚�"; + long n = 0; + DBUtility.Xt_BaseBillFun.GraphLine_XB(grdMain, MainIDCol, SubIDCol, s, ref n); + + + + ////-----------棰勮鐘舵�� 灏忎簬绛変簬 鏄剧ず 绾㈣壊锛� 灏忎簬7 姗欒壊锛屽皬浜庣瓑浜�14 榛勮壊 //int HYJDateCol = Fun_GetCol("棰勮鐘舵�侊紙澶╋級"); //int HSumUnDownQtyCol = Fun_GetCol("鎬绘湭涓嬮噰璐噺"); diff --git a/NETERPNoWin/Program.cs b/NETERPNoWin/Program.cs index 4fe6a38..77311bb 100644 --- a/NETERPNoWin/Program.cs +++ b/NETERPNoWin/Program.cs @@ -25,10 +25,12 @@ { if (DBUtility.ClsPub.CheckUpdate()) { - string strFileName = DBUtility.ClsPub.AppPath + @"\HX_Update.exe"; - System.Diagnostics.Process.Start(strFileName); - Application.Exit(); - return; + //string strFileName = DBUtility.ClsPub.AppPath + @"\HX_Update.exe"; + //System.Diagnostics.Process.Start(strFileName); + //Application.Exit(); + //return; + MESMain oMESMain = new MESMain(); + Application.Run(oMESMain); } else { diff --git a/NETERPNoWin/bin/x86/Debug.zip b/NETERPNoWin/bin/x86/Debug.zip index 5916d45..0447197 100644 --- a/NETERPNoWin/bin/x86/Debug.zip +++ b/NETERPNoWin/bin/x86/Debug.zip Binary files differ diff --git a/NETERPNoWin/bin/x86/Debug/BLL.dll b/NETERPNoWin/bin/x86/Debug/BLL.dll index d606545..1c6d6ad 100644 --- a/NETERPNoWin/bin/x86/Debug/BLL.dll +++ b/NETERPNoWin/bin/x86/Debug/BLL.dll Binary files differ diff --git a/NETERPNoWin/bin/x86/Debug/BLL.pdb b/NETERPNoWin/bin/x86/Debug/BLL.pdb index 049b722..c661498 100644 --- a/NETERPNoWin/bin/x86/Debug/BLL.pdb +++ b/NETERPNoWin/bin/x86/Debug/BLL.pdb Binary files differ diff --git a/NETERPNoWin/bin/x86/Debug/BaseSet.dll b/NETERPNoWin/bin/x86/Debug/BaseSet.dll index 37b94d2..189fca5 100644 --- a/NETERPNoWin/bin/x86/Debug/BaseSet.dll +++ b/NETERPNoWin/bin/x86/Debug/BaseSet.dll Binary files differ diff --git a/NETERPNoWin/bin/x86/Debug/BaseSet.pdb b/NETERPNoWin/bin/x86/Debug/BaseSet.pdb index e1cb8a6..b5c7289 100644 --- a/NETERPNoWin/bin/x86/Debug/BaseSet.pdb +++ b/NETERPNoWin/bin/x86/Debug/BaseSet.pdb Binary files differ diff --git a/NETERPNoWin/bin/x86/Debug/DAL.dll b/NETERPNoWin/bin/x86/Debug/DAL.dll index ffbcc5d..97ca775 100644 --- a/NETERPNoWin/bin/x86/Debug/DAL.dll +++ b/NETERPNoWin/bin/x86/Debug/DAL.dll Binary files differ diff --git a/NETERPNoWin/bin/x86/Debug/DAL.pdb b/NETERPNoWin/bin/x86/Debug/DAL.pdb index 248e5b2..cb097e2 100644 --- a/NETERPNoWin/bin/x86/Debug/DAL.pdb +++ b/NETERPNoWin/bin/x86/Debug/DAL.pdb Binary files differ diff --git a/NETERPNoWin/bin/x86/Debug/DBUtility.dll b/NETERPNoWin/bin/x86/Debug/DBUtility.dll index d2e6638..7a8358a 100644 --- a/NETERPNoWin/bin/x86/Debug/DBUtility.dll +++ b/NETERPNoWin/bin/x86/Debug/DBUtility.dll Binary files differ diff --git a/NETERPNoWin/bin/x86/Debug/DBUtility.pdb b/NETERPNoWin/bin/x86/Debug/DBUtility.pdb index d228415..b932c7a 100644 --- a/NETERPNoWin/bin/x86/Debug/DBUtility.pdb +++ b/NETERPNoWin/bin/x86/Debug/DBUtility.pdb Binary files differ diff --git a/NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll b/NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll index d625ca8..ec2ec85 100644 --- a/NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll +++ b/NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll Binary files differ diff --git a/NETERPNoWin/bin/x86/Debug/Kanban.dll b/NETERPNoWin/bin/x86/Debug/Kanban.dll index d605821..6d02981 100644 --- a/NETERPNoWin/bin/x86/Debug/Kanban.dll +++ b/NETERPNoWin/bin/x86/Debug/Kanban.dll Binary files differ diff --git a/NETERPNoWin/bin/x86/Debug/Kanban.pdb b/NETERPNoWin/bin/x86/Debug/Kanban.pdb index 63385c6..611553f 100644 --- a/NETERPNoWin/bin/x86/Debug/Kanban.pdb +++ b/NETERPNoWin/bin/x86/Debug/Kanban.pdb Binary files differ diff --git a/NETERPNoWin/bin/x86/Debug/Model.dll b/NETERPNoWin/bin/x86/Debug/Model.dll index 30a24ed..7faaa0e 100644 --- a/NETERPNoWin/bin/x86/Debug/Model.dll +++ b/NETERPNoWin/bin/x86/Debug/Model.dll Binary files differ diff --git a/NETERPNoWin/bin/x86/Debug/Model.pdb b/NETERPNoWin/bin/x86/Debug/Model.pdb index 05bdb7b..1b7e6ca 100644 --- a/NETERPNoWin/bin/x86/Debug/Model.pdb +++ b/NETERPNoWin/bin/x86/Debug/Model.pdb Binary files differ diff --git a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe index 4aa1843..a0aba5b 100644 --- a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe +++ b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe Binary files differ diff --git a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb index fbb3a51..257118b 100644 --- a/NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb +++ b/NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb Binary files differ diff --git a/NETERPNoWin/bin/x86/Debug/OAM.dll b/NETERPNoWin/bin/x86/Debug/OAM.dll index a07b9c1..40f9f07 100644 --- a/NETERPNoWin/bin/x86/Debug/OAM.dll +++ b/NETERPNoWin/bin/x86/Debug/OAM.dll Binary files differ diff --git a/NETERPNoWin/bin/x86/Debug/OAM.pdb b/NETERPNoWin/bin/x86/Debug/OAM.pdb index 6b4fc0c..cedb5c8 100644 --- a/NETERPNoWin/bin/x86/Debug/OAM.pdb +++ b/NETERPNoWin/bin/x86/Debug/OAM.pdb Binary files differ diff --git a/NETERPNoWin/bin/x86/Debug/PlanM.dll b/NETERPNoWin/bin/x86/Debug/PlanM.dll index 5f95d5d..5e52036 100644 --- a/NETERPNoWin/bin/x86/Debug/PlanM.dll +++ b/NETERPNoWin/bin/x86/Debug/PlanM.dll Binary files differ diff --git a/NETERPNoWin/bin/x86/Debug/PlanM.pdb b/NETERPNoWin/bin/x86/Debug/PlanM.pdb index 92cec6a..66fc933 100644 --- a/NETERPNoWin/bin/x86/Debug/PlanM.pdb +++ b/NETERPNoWin/bin/x86/Debug/PlanM.pdb Binary files differ diff --git a/NETERPNoWin/bin/x86/Debug/Pub_Class.dll b/NETERPNoWin/bin/x86/Debug/Pub_Class.dll index e068e61..2507fa0 100644 --- a/NETERPNoWin/bin/x86/Debug/Pub_Class.dll +++ b/NETERPNoWin/bin/x86/Debug/Pub_Class.dll Binary files differ diff --git a/NETERPNoWin/bin/x86/Debug/Pub_Class.pdb b/NETERPNoWin/bin/x86/Debug/Pub_Class.pdb index 18cf7d7..b6db143 100644 --- a/NETERPNoWin/bin/x86/Debug/Pub_Class.pdb +++ b/NETERPNoWin/bin/x86/Debug/Pub_Class.pdb Binary files differ diff --git a/NETERPNoWin/bin/x86/Debug/Pub_Control.dll b/NETERPNoWin/bin/x86/Debug/Pub_Control.dll index 19b77bb..493480c 100644 --- a/NETERPNoWin/bin/x86/Debug/Pub_Control.dll +++ b/NETERPNoWin/bin/x86/Debug/Pub_Control.dll Binary files differ diff --git a/NETERPNoWin/bin/x86/Debug/Pub_Control.pdb b/NETERPNoWin/bin/x86/Debug/Pub_Control.pdb index f1df76b..b5df9b1 100644 --- a/NETERPNoWin/bin/x86/Debug/Pub_Control.pdb +++ b/NETERPNoWin/bin/x86/Debug/Pub_Control.pdb Binary files differ diff --git a/NETERPNoWin/bin/x86/Debug/SQLHelper.dll b/NETERPNoWin/bin/x86/Debug/SQLHelper.dll index 551218a..67ff7e5 100644 --- a/NETERPNoWin/bin/x86/Debug/SQLHelper.dll +++ b/NETERPNoWin/bin/x86/Debug/SQLHelper.dll Binary files differ diff --git a/NETERPNoWin/bin/x86/Debug/SQLHelper.pdb b/NETERPNoWin/bin/x86/Debug/SQLHelper.pdb index 0b3ac68..5cf7bcc 100644 --- a/NETERPNoWin/bin/x86/Debug/SQLHelper.pdb +++ b/NETERPNoWin/bin/x86/Debug/SQLHelper.pdb Binary files differ diff --git a/NETERPNoWin/bin/x86/Debug/WarM.dll b/NETERPNoWin/bin/x86/Debug/WarM.dll index 8904b9a..40fa317 100644 --- a/NETERPNoWin/bin/x86/Debug/WarM.dll +++ b/NETERPNoWin/bin/x86/Debug/WarM.dll Binary files differ diff --git a/NETERPNoWin/bin/x86/Debug/WarM.pdb b/NETERPNoWin/bin/x86/Debug/WarM.pdb index 2607b3e..d4ea5d8 100644 --- a/NETERPNoWin/bin/x86/Debug/WarM.pdb +++ b/NETERPNoWin/bin/x86/Debug/WarM.pdb Binary files differ diff --git a/NETERPNoWin/bin/x86/Debug/WorkM.dll b/NETERPNoWin/bin/x86/Debug/WorkM.dll index ed2dfb9..7ebb88f 100644 --- a/NETERPNoWin/bin/x86/Debug/WorkM.dll +++ b/NETERPNoWin/bin/x86/Debug/WorkM.dll Binary files differ diff --git a/NETERPNoWin/bin/x86/Debug/WorkM.pdb b/NETERPNoWin/bin/x86/Debug/WorkM.pdb index 1dac6d9..05d3368 100644 --- a/NETERPNoWin/bin/x86/Debug/WorkM.pdb +++ b/NETERPNoWin/bin/x86/Debug/WorkM.pdb Binary files differ diff --git a/NETERPNoWin/bin/x86/Debug/stdole.dll b/NETERPNoWin/bin/x86/Debug/stdole.dll new file mode 100644 index 0000000..9673c81 --- /dev/null +++ b/NETERPNoWin/bin/x86/Debug/stdole.dll Binary files differ diff --git a/NETERPNoWin/obj/x86/Debug/Interop.gregn6Lib.dll b/NETERPNoWin/obj/x86/Debug/Interop.gregn6Lib.dll index d625ca8..ec2ec85 100644 --- a/NETERPNoWin/obj/x86/Debug/Interop.gregn6Lib.dll +++ b/NETERPNoWin/obj/x86/Debug/Interop.gregn6Lib.dll Binary files differ diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt index 47fc74d..61582b9 100644 --- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt +++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt @@ -107,3 +107,4 @@ D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.csproj.CopyComplete D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.exe D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.pdb +D:\Git浠撳簱\MESWMS-API(鏈�鏂�)\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\stdole.dll diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csprojAssemblyReference.cache b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csprojAssemblyReference.cache index 2cedffa..d6d060c 100644 --- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csprojAssemblyReference.cache +++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csprojAssemblyReference.cache Binary files differ diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe index 4aa1843..a0aba5b 100644 --- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe +++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe Binary files differ diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb index fbb3a51..257118b 100644 --- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb +++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb Binary files differ diff --git a/WebAPI/Web.config b/WebAPI/Web.config index c117bfe..14da35d 100644 --- a/WebAPI/Web.config +++ b/WebAPI/Web.config @@ -22,7 +22,7 @@ <!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/> --> <!--<add key="sUrl" value="http://192.168.63.195/WEBS-WMS/WebService1.asmx"/> 棰滃彴寮忔満--> <!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> 澶忓疂--> - <add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx" /> + <add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> <!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/> 鍗氭棩绉戞妧--> <!--<add key="sUrl" value="http://192.168.0.214/WEBS-WMS/WebService1.asmx"/> 鐟炰笌绁�--> <!--<add key="sUrl" value="http://60.191.27.141:8090/WEBS-WMS/WebService1.asmx"/> 妫シ--> @@ -92,7 +92,7 @@ </basicHttpBinding> </bindings> <client> - <endpoint address="http://47.96.97.237/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding" + <endpoint address="http://60.190.4.42:9003/WebService/WebService1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap" name="WebService1Soap" /> </client> @@ -100,7 +100,7 @@ <applicationSettings> <WebAPI.Properties.Settings> <setting name="WebAPI_WebS_WebService1" serializeAs="String"> - <value>http://60.191.27.141:8090/WEBS-WMS/WebService1.asmx</value> + <value>http://60.190.4.42:9003/WebService/WebService1.asmx</value> </setting> </WebAPI.Properties.Settings> </applicationSettings> -- Gitblit v1.9.1