diff --git a/Controller/CK.SCP.Controller.csproj b/Controller/CK.SCP.Controller.csproj
index 38d55c9..985d838 100644
--- a/Controller/CK.SCP.Controller.csproj
+++ b/Controller/CK.SCP.Controller.csproj
@@ -32,7 +32,7 @@
- D:\连接orlcor\ChangKeTec.Utils.dll
+ ..\DLL\ChangKeTec.Utils.dll
..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll
@@ -62,7 +62,7 @@
False
- C:\Users\Administrator\Desktop\Z.EntityFramework.Extensions.dll
+ ..\DLL\Z.EntityFramework.Extensions.dll
diff --git a/DLL/Z.EntityFramework.Extensions.dll b/DLL/Z.EntityFramework.Extensions.dll
new file mode 100644
index 0000000..8159bb1
Binary files /dev/null and b/DLL/Z.EntityFramework.Extensions.dll differ
diff --git a/Models/CK.SCP.Models.csproj b/Models/CK.SCP.Models.csproj
index e6cfa8a..9cf6d20 100644
--- a/Models/CK.SCP.Models.csproj
+++ b/Models/CK.SCP.Models.csproj
@@ -56,7 +56,7 @@
- ..\UniApiGroup\bin\Debug\Z.EntityFramework.Extensions.dll
+ ..\DLL\Z.EntityFramework.Extensions.dll
diff --git a/SCP/Properties/AssemblyInfo.cs b/SCP/Properties/AssemblyInfo.cs
index 532507f..4b6f073 100644
--- a/SCP/Properties/AssemblyInfo.cs
+++ b/SCP/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
//
// 可以指定所有值，也可以使用“修订号”和“内部版本号”的默认值，
// 方法是按如下所示使用 "*":
-[assembly: AssemblyVersion("1.21.0204.1")]
-[assembly: AssemblyFileVersion("1.21.0204.1")]
+[assembly: AssemblyVersion("1.23.1023.1")]
+[assembly: AssemblyFileVersion("1.23.1023.1")]
diff --git a/SCP/Properties/PublishProfiles/COM.pubxml b/SCP/Properties/PublishProfiles/COM.pubxml
index bd35602..0dac688 100644
--- a/SCP/Properties/PublishProfiles/COM.pubxml
+++ b/SCP/Properties/PublishProfiles/COM.pubxml
@@ -11,7 +11,7 @@
True
False
- D:\SCP20201106
+ D:\Workspace\Publish\FWCYJ
False
True
True
diff --git a/SCP/SCP.csproj b/SCP/SCP.csproj
index f03f718..a49b638 100644
--- a/SCP/SCP.csproj
+++ b/SCP/SCP.csproj
@@ -2899,7 +2899,9 @@
-
+
+ Always
+
@@ -4568,16 +4570,16 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -5286,6 +5288,7 @@
Global.asax
+ Always
BarCode.ashx
@@ -6017,74 +6020,74 @@
SCP_RECEIVE_DETAIL.aspx
-
+
SCP_MAXPO_INCOMPLETE.aspx
ASPXCodeBehind
-
+
SCP_MAXPO_INCOMPLETE.aspx
-
+
SCP_MAXPO_INCOMPLETE_DETAIL.aspx
ASPXCodeBehind
-
+
SCP_MAXPO_INCOMPLETE_DETAIL.aspx
-
+
SCP_PO.aspx
ASPXCodeBehind
-
+
SCP_PO.aspx
-
+
SCP_PO_EXTEND.aspx
ASPXCodeBehind
-
+
SCP_PO_EXTEND.aspx
-
+
SCP_PO_MAX.aspx
ASPXCodeBehind
-
+
SCP_PO_MAX.aspx
-
+
SCP_PO_MAX_DETAIL.aspx
ASPXCodeBehind
-
+
SCP_PO_MAX_DETAIL.aspx
-
+
SCP_PO_QH.aspx
ASPXCodeBehind
-
+
SCP_PO_QH.aspx
-
+
SCP_PO_QH_DETAIL.aspx
ASPXCodeBehind
-
+
SCP_PO_QH_DETAIL.aspx
-
+
SCP_PO_SUBDETAIL.aspx
ASPXCodeBehind
-
+
SCP_PO_SUBDETAIL.aspx
-
+
SCP_PO_SUBPART.aspx
ASPXCodeBehind
-
+
SCP_PO_SUBPART.aspx
diff --git a/SCP/Views/富维冲插件/SCP_MAXPO_INCOMPLETE.aspx b/SCP/Views/富维冲压件/SCP_MAXPO_INCOMPLETE.aspx
similarity index 99%
rename from SCP/Views/富维冲插件/SCP_MAXPO_INCOMPLETE.aspx
rename to SCP/Views/富维冲压件/SCP_MAXPO_INCOMPLETE.aspx
index 6ca88e5..27344e5 100644
--- a/SCP/Views/富维冲插件/SCP_MAXPO_INCOMPLETE.aspx
+++ b/SCP/Views/富维冲压件/SCP_MAXPO_INCOMPLETE.aspx
@@ -1,4 +1,4 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SCP_MAXPO_INCOMPLETE.aspx.cs" Inherits="SCP.Views.富维冲插件.SCP_MAXPO_INCOMPLETE" %>
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SCP_MAXPO_INCOMPLETE.aspx.cs" Inherits="SCP.Views.富维冲压件.SCP_MAXPO_INCOMPLETE" %>
diff --git a/SCP/Views/富维冲插件/SCP_MAXPO_INCOMPLETE.aspx.cs b/SCP/Views/富维冲压件/SCP_MAXPO_INCOMPLETE.aspx.cs
similarity index 98%
rename from SCP/Views/富维冲插件/SCP_MAXPO_INCOMPLETE.aspx.cs
rename to SCP/Views/富维冲压件/SCP_MAXPO_INCOMPLETE.aspx.cs
index 8164c7c..48992ca 100644
--- a/SCP/Views/富维冲插件/SCP_MAXPO_INCOMPLETE.aspx.cs
+++ b/SCP/Views/富维冲压件/SCP_MAXPO_INCOMPLETE.aspx.cs
@@ -9,7 +9,7 @@ using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
-namespace SCP.Views.富维冲插件
+namespace SCP.Views.富维冲压件
{
public partial class SCP_MAXPO_INCOMPLETE : PageBase
{
@@ -95,7 +95,7 @@ namespace SCP.Views.富维冲插件
string PoBillNum = String.Join(",", _PoList);
string PartCode = String.Join(",", _PartList);
- PageContext.RegisterStartupScript(Window1.GetShowReference(string.Format("../富维冲插件/SCP_MAXPO_INCOMPLETE_DETAIL.aspx?PoBillNum={0}&&PartCode={1}", PoBillNum, PartCode)));
+ PageContext.RegisterStartupScript(Window1.GetShowReference(string.Format("../富维冲压件/SCP_MAXPO_INCOMPLETE_DETAIL.aspx?PoBillNum={0}&&PartCode={1}", PoBillNum, PartCode)));
}
diff --git a/SCP/Views/富维冲插件/SCP_MAXPO_INCOMPLETE.aspx.designer.cs b/SCP/Views/富维冲压件/SCP_MAXPO_INCOMPLETE.aspx.designer.cs
similarity index 99%
rename from SCP/Views/富维冲插件/SCP_MAXPO_INCOMPLETE.aspx.designer.cs
rename to SCP/Views/富维冲压件/SCP_MAXPO_INCOMPLETE.aspx.designer.cs
index a007501..97cc2a4 100644
--- a/SCP/Views/富维冲插件/SCP_MAXPO_INCOMPLETE.aspx.designer.cs
+++ b/SCP/Views/富维冲压件/SCP_MAXPO_INCOMPLETE.aspx.designer.cs
@@ -7,7 +7,7 @@
//
//------------------------------------------------------------------------------
-namespace SCP.Views.富维冲插件
+namespace SCP.Views.富维冲压件
{
diff --git a/SCP/Views/富维冲插件/SCP_MAXPO_INCOMPLETE_DETAIL.aspx b/SCP/Views/富维冲压件/SCP_MAXPO_INCOMPLETE_DETAIL.aspx
similarity index 97%
rename from SCP/Views/富维冲插件/SCP_MAXPO_INCOMPLETE_DETAIL.aspx
rename to SCP/Views/富维冲压件/SCP_MAXPO_INCOMPLETE_DETAIL.aspx
index e6b6146..51036d7 100644
--- a/SCP/Views/富维冲插件/SCP_MAXPO_INCOMPLETE_DETAIL.aspx
+++ b/SCP/Views/富维冲压件/SCP_MAXPO_INCOMPLETE_DETAIL.aspx
@@ -1,4 +1,4 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SCP_MAXPO_INCOMPLETE_DETAIL.aspx.cs" Inherits="SCP.Views.富维冲插件.SCP_MAXPO_INCOMPLETE_DETAIL" %>
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SCP_MAXPO_INCOMPLETE_DETAIL.aspx.cs" Inherits="SCP.Views.富维冲压件.SCP_MAXPO_INCOMPLETE_DETAIL" %>
diff --git a/SCP/Views/富维冲插件/SCP_MAXPO_INCOMPLETE_DETAIL.aspx.cs b/SCP/Views/富维冲压件/SCP_MAXPO_INCOMPLETE_DETAIL.aspx.cs
similarity index 99%
rename from SCP/Views/富维冲插件/SCP_MAXPO_INCOMPLETE_DETAIL.aspx.cs
rename to SCP/Views/富维冲压件/SCP_MAXPO_INCOMPLETE_DETAIL.aspx.cs
index b66870b..1c6c1ff 100644
--- a/SCP/Views/富维冲插件/SCP_MAXPO_INCOMPLETE_DETAIL.aspx.cs
+++ b/SCP/Views/富维冲压件/SCP_MAXPO_INCOMPLETE_DETAIL.aspx.cs
@@ -9,7 +9,7 @@ using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
-namespace SCP.Views.富维冲插件
+namespace SCP.Views.富维冲压件
{
public partial class SCP_MAXPO_INCOMPLETE_DETAIL : PageBase
{
diff --git a/SCP/Views/富维冲插件/SCP_MAXPO_INCOMPLETE_DETAIL.aspx.designer.cs b/SCP/Views/富维冲压件/SCP_MAXPO_INCOMPLETE_DETAIL.aspx.designer.cs
similarity index 99%
rename from SCP/Views/富维冲插件/SCP_MAXPO_INCOMPLETE_DETAIL.aspx.designer.cs
rename to SCP/Views/富维冲压件/SCP_MAXPO_INCOMPLETE_DETAIL.aspx.designer.cs
index 1f2ea2b..0db89a9 100644
--- a/SCP/Views/富维冲插件/SCP_MAXPO_INCOMPLETE_DETAIL.aspx.designer.cs
+++ b/SCP/Views/富维冲压件/SCP_MAXPO_INCOMPLETE_DETAIL.aspx.designer.cs
@@ -7,7 +7,7 @@
//
//------------------------------------------------------------------------------
-namespace SCP.Views.富维冲插件
+namespace SCP.Views.富维冲压件
{
diff --git a/SCP/Views/富维冲插件/SCP_PO.aspx b/SCP/Views/富维冲压件/SCP_PO.aspx
similarity index 99%
rename from SCP/Views/富维冲插件/SCP_PO.aspx
rename to SCP/Views/富维冲压件/SCP_PO.aspx
index 1a31a2f..4804da1 100644
--- a/SCP/Views/富维冲插件/SCP_PO.aspx
+++ b/SCP/Views/富维冲压件/SCP_PO.aspx
@@ -1,4 +1,4 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SCP_PO.aspx.cs" Inherits="SCP.Views.富维冲插件.SCP_PO" %>
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SCP_PO.aspx.cs" Inherits="SCP.Views.富维冲压件.SCP_PO" %>
diff --git a/SCP/Views/富维冲插件/SCP_PO.aspx.cs b/SCP/Views/富维冲压件/SCP_PO.aspx.cs
similarity index 99%
rename from SCP/Views/富维冲插件/SCP_PO.aspx.cs
rename to SCP/Views/富维冲压件/SCP_PO.aspx.cs
index f5d57ac..bb2afaf 100644
--- a/SCP/Views/富维冲插件/SCP_PO.aspx.cs
+++ b/SCP/Views/富维冲压件/SCP_PO.aspx.cs
@@ -17,7 +17,7 @@ using CK.SCP.Common;
using System.Text;
using CK.SCP.Models.ScpEntity.ExcelExportEnttity;
-namespace SCP.Views.富维冲插件
+namespace SCP.Views.富维冲压件
{
public partial class SCP_PO : PageBase
{
diff --git a/SCP/Views/富维冲插件/SCP_PO.aspx.designer.cs b/SCP/Views/富维冲压件/SCP_PO.aspx.designer.cs
similarity index 99%
rename from SCP/Views/富维冲插件/SCP_PO.aspx.designer.cs
rename to SCP/Views/富维冲压件/SCP_PO.aspx.designer.cs
index 43b00ec..715d1c6 100644
--- a/SCP/Views/富维冲插件/SCP_PO.aspx.designer.cs
+++ b/SCP/Views/富维冲压件/SCP_PO.aspx.designer.cs
@@ -7,7 +7,7 @@
//
//------------------------------------------------------------------------------
-namespace SCP.Views.富维冲插件
+namespace SCP.Views.富维冲压件
{
diff --git a/SCP/Views/富维冲插件/SCP_PO_EXTEND.aspx b/SCP/Views/富维冲压件/SCP_PO_EXTEND.aspx
similarity index 99%
rename from SCP/Views/富维冲插件/SCP_PO_EXTEND.aspx
rename to SCP/Views/富维冲压件/SCP_PO_EXTEND.aspx
index 1f0f3de..732bc54 100644
--- a/SCP/Views/富维冲插件/SCP_PO_EXTEND.aspx
+++ b/SCP/Views/富维冲压件/SCP_PO_EXTEND.aspx
@@ -1,4 +1,4 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SCP_PO_EXTEND.aspx.cs" Inherits="SCP.Views.富维冲插件.SCP_PO_EXTEND" %>
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SCP_PO_EXTEND.aspx.cs" Inherits="SCP.Views.富维冲压件.SCP_PO_EXTEND" %>
diff --git a/SCP/Views/富维冲插件/SCP_PO_EXTEND.aspx.cs b/SCP/Views/富维冲压件/SCP_PO_EXTEND.aspx.cs
similarity index 98%
rename from SCP/Views/富维冲插件/SCP_PO_EXTEND.aspx.cs
rename to SCP/Views/富维冲压件/SCP_PO_EXTEND.aspx.cs
index fe9b3ea..9440dd8 100644
--- a/SCP/Views/富维冲插件/SCP_PO_EXTEND.aspx.cs
+++ b/SCP/Views/富维冲压件/SCP_PO_EXTEND.aspx.cs
@@ -21,7 +21,7 @@ using ChangKeTec.Wms.Models.Wms;
using CK.SCP.Models;
using static CK.SCP.UniApi.Controller.MailController;
-namespace SCP.Views.富维冲插件
+namespace SCP.Views.富维冲压件
{
public partial class SCP_PO_EXTEND : PageBase
{
@@ -215,7 +215,7 @@ namespace SCP.Views.富维冲插件
if (rowDataKeys != null)
{
string PoBillNum = rowDataKeys[1] as string;
- PageContext.RegisterStartupScript(Window1.GetShowReference(string.Format("../富维冲插件/SCP_PO_SUBDETAIL.aspx?PoBillNum={0}", PoBillNum)));
+ PageContext.RegisterStartupScript(Window1.GetShowReference(string.Format("../富维冲压件/SCP_PO_SUBDETAIL.aspx?PoBillNum={0}", PoBillNum)));
}
}
@@ -316,7 +316,7 @@ namespace SCP.Views.富维冲插件
Session["stream"] = _stream;
Session["datatable"] = _dt;
- PageContext.RegisterStartupScript(Window1.GetShowReference(string.Format("../富维冲插件/SCP_PO_SUBPART.aspx?")));
+ PageContext.RegisterStartupScript(Window1.GetShowReference(string.Format("../富维冲压件/SCP_PO_SUBPART.aspx?")));
BindOrder();
}
diff --git a/SCP/Views/富维冲插件/SCP_PO_EXTEND.aspx.designer.cs b/SCP/Views/富维冲压件/SCP_PO_EXTEND.aspx.designer.cs
similarity index 99%
rename from SCP/Views/富维冲插件/SCP_PO_EXTEND.aspx.designer.cs
rename to SCP/Views/富维冲压件/SCP_PO_EXTEND.aspx.designer.cs
index 00b8547..cd34232 100644
--- a/SCP/Views/富维冲插件/SCP_PO_EXTEND.aspx.designer.cs
+++ b/SCP/Views/富维冲压件/SCP_PO_EXTEND.aspx.designer.cs
@@ -7,7 +7,7 @@
//
//------------------------------------------------------------------------------
-namespace SCP.Views.富维冲插件
+namespace SCP.Views.富维冲压件
{
diff --git a/SCP/Views/富维冲插件/SCP_PO_EXTEND_DETAIL.aspx b/SCP/Views/富维冲压件/SCP_PO_EXTEND_DETAIL.aspx
similarity index 100%
rename from SCP/Views/富维冲插件/SCP_PO_EXTEND_DETAIL.aspx
rename to SCP/Views/富维冲压件/SCP_PO_EXTEND_DETAIL.aspx
diff --git a/SCP/Views/富维冲插件/SCP_PO_EXTEND_DETAIL.aspx.cs b/SCP/Views/富维冲压件/SCP_PO_EXTEND_DETAIL.aspx.cs
similarity index 100%
rename from SCP/Views/富维冲插件/SCP_PO_EXTEND_DETAIL.aspx.cs
rename to SCP/Views/富维冲压件/SCP_PO_EXTEND_DETAIL.aspx.cs
diff --git a/SCP/Views/富维冲插件/SCP_PO_EXTEND_DETAIL.aspx.designer.cs b/SCP/Views/富维冲压件/SCP_PO_EXTEND_DETAIL.aspx.designer.cs
similarity index 100%
rename from SCP/Views/富维冲插件/SCP_PO_EXTEND_DETAIL.aspx.designer.cs
rename to SCP/Views/富维冲压件/SCP_PO_EXTEND_DETAIL.aspx.designer.cs
diff --git a/SCP/Views/富维冲插件/SCP_PO_MAX.aspx b/SCP/Views/富维冲压件/SCP_PO_MAX.aspx
similarity index 99%
rename from SCP/Views/富维冲插件/SCP_PO_MAX.aspx
rename to SCP/Views/富维冲压件/SCP_PO_MAX.aspx
index 06e0968..3fb37aa 100644
--- a/SCP/Views/富维冲插件/SCP_PO_MAX.aspx
+++ b/SCP/Views/富维冲压件/SCP_PO_MAX.aspx
@@ -1,4 +1,4 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SCP_PO_MAX.aspx.cs" Inherits="SCP.Views.富维冲插件.SCP_PO_MAX" %>
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SCP_PO_MAX.aspx.cs" Inherits="SCP.Views.富维冲压件.SCP_PO_MAX" %>
diff --git a/SCP/Views/富维冲插件/SCP_PO_MAX.aspx.cs b/SCP/Views/富维冲压件/SCP_PO_MAX.aspx.cs
similarity index 98%
rename from SCP/Views/富维冲插件/SCP_PO_MAX.aspx.cs
rename to SCP/Views/富维冲压件/SCP_PO_MAX.aspx.cs
index 363d851..df24aeb 100644
--- a/SCP/Views/富维冲插件/SCP_PO_MAX.aspx.cs
+++ b/SCP/Views/富维冲压件/SCP_PO_MAX.aspx.cs
@@ -21,7 +21,7 @@ using ChangKeTec.Wms.Models.Wms;
using CK.SCP.Models;
using static CK.SCP.UniApi.Controller.MailController;
-namespace SCP.Views.富维冲插件
+namespace SCP.Views.富维冲压件
{
public partial class SCP_PO_MAX : PageBase
{
@@ -95,7 +95,7 @@ namespace SCP.Views.富维冲插件
string PoBillNum = rowDataKeys[1] as string;
- PageContext.RegisterStartupScript(Window1.GetShowReference(string.Format("../富维冲插件/SCP_PO_MAX_DETAIL.aspx?PoBillNum={0}", PoBillNum)));
+ PageContext.RegisterStartupScript(Window1.GetShowReference(string.Format("../富维冲压件/SCP_PO_MAX_DETAIL.aspx?PoBillNum={0}", PoBillNum)));
}
protected void btnDetail_Click(object sender, EventArgs e)
{
@@ -109,7 +109,7 @@ namespace SCP.Views.富维冲插件
{
string PoBillNum = rowDataKeys[1] as string;
- PageContext.RegisterStartupScript(Window1.GetShowReference(string.Format("../富维冲插件/SCP_PO_MAX_DETAIL.aspx?PoBillNum={0}", PoBillNum)));
+ PageContext.RegisterStartupScript(Window1.GetShowReference(string.Format("../富维冲压件/SCP_PO_MAX_DETAIL.aspx?PoBillNum={0}", PoBillNum)));
}
}
protected void Grid_V_TB_MAXPO_PageIndexChange(object sender, FineUI.GridPageEventArgs e)
diff --git a/SCP/Views/富维冲插件/SCP_PO_MAX.aspx.designer.cs b/SCP/Views/富维冲压件/SCP_PO_MAX.aspx.designer.cs
similarity index 99%
rename from SCP/Views/富维冲插件/SCP_PO_MAX.aspx.designer.cs
rename to SCP/Views/富维冲压件/SCP_PO_MAX.aspx.designer.cs
index 2007181..69e220f 100644
--- a/SCP/Views/富维冲插件/SCP_PO_MAX.aspx.designer.cs
+++ b/SCP/Views/富维冲压件/SCP_PO_MAX.aspx.designer.cs
@@ -7,7 +7,7 @@
//
//------------------------------------------------------------------------------
-namespace SCP.Views.富维冲插件
+namespace SCP.Views.富维冲压件
{
diff --git a/SCP/Views/富维冲插件/SCP_PO_MAX_DETAIL.aspx b/SCP/Views/富维冲压件/SCP_PO_MAX_DETAIL.aspx
similarity index 99%
rename from SCP/Views/富维冲插件/SCP_PO_MAX_DETAIL.aspx
rename to SCP/Views/富维冲压件/SCP_PO_MAX_DETAIL.aspx
index 99c08a2..b96d925 100644
--- a/SCP/Views/富维冲插件/SCP_PO_MAX_DETAIL.aspx
+++ b/SCP/Views/富维冲压件/SCP_PO_MAX_DETAIL.aspx
@@ -1,4 +1,4 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SCP_PO_MAX_DETAIL.aspx.cs" Inherits="SCP.Views.富维冲插件.SCP_PO_MAX_DETAIL" %>
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SCP_PO_MAX_DETAIL.aspx.cs" Inherits="SCP.Views.富维冲压件.SCP_PO_MAX_DETAIL" %>
diff --git a/SCP/Views/富维冲插件/SCP_PO_MAX_DETAIL.aspx.cs b/SCP/Views/富维冲压件/SCP_PO_MAX_DETAIL.aspx.cs
similarity index 99%
rename from SCP/Views/富维冲插件/SCP_PO_MAX_DETAIL.aspx.cs
rename to SCP/Views/富维冲压件/SCP_PO_MAX_DETAIL.aspx.cs
index 518c30a..38b559f 100644
--- a/SCP/Views/富维冲插件/SCP_PO_MAX_DETAIL.aspx.cs
+++ b/SCP/Views/富维冲压件/SCP_PO_MAX_DETAIL.aspx.cs
@@ -10,7 +10,7 @@ using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
-namespace SCP.Views.富维冲插件
+namespace SCP.Views.富维冲压件
{
public partial class SCP_PO_MAX_DETAIL : PageBase
{
diff --git a/SCP/Views/富维冲插件/SCP_PO_MAX_DETAIL.aspx.designer.cs b/SCP/Views/富维冲压件/SCP_PO_MAX_DETAIL.aspx.designer.cs
similarity index 99%
rename from SCP/Views/富维冲插件/SCP_PO_MAX_DETAIL.aspx.designer.cs
rename to SCP/Views/富维冲压件/SCP_PO_MAX_DETAIL.aspx.designer.cs
index a927d47..b1ff83c 100644
--- a/SCP/Views/富维冲插件/SCP_PO_MAX_DETAIL.aspx.designer.cs
+++ b/SCP/Views/富维冲压件/SCP_PO_MAX_DETAIL.aspx.designer.cs
@@ -7,7 +7,7 @@
//
//------------------------------------------------------------------------------
-namespace SCP.Views.富维冲插件
+namespace SCP.Views.富维冲压件
{
diff --git a/SCP/Views/富维冲插件/SCP_PO_QH.aspx b/SCP/Views/富维冲压件/SCP_PO_QH.aspx
similarity index 99%
rename from SCP/Views/富维冲插件/SCP_PO_QH.aspx
rename to SCP/Views/富维冲压件/SCP_PO_QH.aspx
index 4d81ad5..eb57a5c 100644
--- a/SCP/Views/富维冲插件/SCP_PO_QH.aspx
+++ b/SCP/Views/富维冲压件/SCP_PO_QH.aspx
@@ -1,4 +1,4 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SCP_PO_QH.aspx.cs" Inherits="SCP.Views.富维冲插件.SCP_PO_QH" %>
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SCP_PO_QH.aspx.cs" Inherits="SCP.Views.富维冲压件.SCP_PO_QH" %>
diff --git a/SCP/Views/富维冲插件/SCP_PO_QH.aspx.cs b/SCP/Views/富维冲压件/SCP_PO_QH.aspx.cs
similarity index 98%
rename from SCP/Views/富维冲插件/SCP_PO_QH.aspx.cs
rename to SCP/Views/富维冲压件/SCP_PO_QH.aspx.cs
index 009a760..7f82529 100644
--- a/SCP/Views/富维冲插件/SCP_PO_QH.aspx.cs
+++ b/SCP/Views/富维冲压件/SCP_PO_QH.aspx.cs
@@ -17,7 +17,7 @@ using CK.SCP.Common;
using System.Text;
using CK.SCP.Models.ScpEntity.ExcelExportEnttity;
-namespace SCP.Views.富维冲插件
+namespace SCP.Views.富维冲压件
{
public partial class SCP_PO_QH : PageBase
{
@@ -121,7 +121,7 @@ namespace SCP.Views.富维冲插件
object[] rowDataKeys = Grid_V_TB_PO.DataKeys[e.RowIndex];
string PoBillNum = rowDataKeys[1] as string;
string VendID = rowDataKeys[3] as string;
- PageContext.RegisterStartupScript(Window1.GetShowReference(string.Format("../富维冲插件/SCP_PO_QH_DETAIL.aspx?PoBillNum={0}", PoBillNum)));
+ PageContext.RegisterStartupScript(Window1.GetShowReference(string.Format("../富维冲压件/SCP_PO_QH_DETAIL.aspx?PoBillNum={0}", PoBillNum)));
}
protected void Grid_V_TB_PO_PageIndexChange(object sender, FineUI.GridPageEventArgs e)
@@ -186,7 +186,7 @@ namespace SCP.Views.富维冲插件
{
string PoBillNum = rowDataKeys[1] as string;
string VendID = rowDataKeys[3] as string;
- PageContext.RegisterStartupScript(Window1.GetShowReference(string.Format("../富维冲插件/SCP_PO_QH_DETAIL.aspx?PoBillNum={0}", PoBillNum)));
+ PageContext.RegisterStartupScript(Window1.GetShowReference(string.Format("../富维冲压件/SCP_PO_QH_DETAIL.aspx?PoBillNum={0}", PoBillNum)));
}
}
diff --git a/SCP/Views/富维冲插件/SCP_PO_QH.aspx.designer.cs b/SCP/Views/富维冲压件/SCP_PO_QH.aspx.designer.cs
similarity index 99%
rename from SCP/Views/富维冲插件/SCP_PO_QH.aspx.designer.cs
rename to SCP/Views/富维冲压件/SCP_PO_QH.aspx.designer.cs
index 8672e98..7375dfb 100644
--- a/SCP/Views/富维冲插件/SCP_PO_QH.aspx.designer.cs
+++ b/SCP/Views/富维冲压件/SCP_PO_QH.aspx.designer.cs
@@ -7,7 +7,7 @@
//
//------------------------------------------------------------------------------
-namespace SCP.Views.富维冲插件
+namespace SCP.Views.富维冲压件
{
diff --git a/SCP/Views/富维冲插件/SCP_PO_QH_DETAIL.aspx b/SCP/Views/富维冲压件/SCP_PO_QH_DETAIL.aspx
similarity index 99%
rename from SCP/Views/富维冲插件/SCP_PO_QH_DETAIL.aspx
rename to SCP/Views/富维冲压件/SCP_PO_QH_DETAIL.aspx
index a7213bb..7fc99ac 100644
--- a/SCP/Views/富维冲插件/SCP_PO_QH_DETAIL.aspx
+++ b/SCP/Views/富维冲压件/SCP_PO_QH_DETAIL.aspx
@@ -1,4 +1,4 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SCP_PO_QH_DETAIL.aspx.cs" Inherits="SCP.Views.富维冲插件.SCP_PO_QH_DETAIL" %>
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SCP_PO_QH_DETAIL.aspx.cs" Inherits="SCP.Views.富维冲压件.SCP_PO_QH_DETAIL" %>
diff --git a/SCP/Views/富维冲插件/SCP_PO_QH_DETAIL.aspx.cs b/SCP/Views/富维冲压件/SCP_PO_QH_DETAIL.aspx.cs
similarity index 99%
rename from SCP/Views/富维冲插件/SCP_PO_QH_DETAIL.aspx.cs
rename to SCP/Views/富维冲压件/SCP_PO_QH_DETAIL.aspx.cs
index cd8f97b..6f0f20e 100644
--- a/SCP/Views/富维冲插件/SCP_PO_QH_DETAIL.aspx.cs
+++ b/SCP/Views/富维冲压件/SCP_PO_QH_DETAIL.aspx.cs
@@ -10,7 +10,7 @@ using CK.SCP.Utils;
using CK.SCP.Controller;
using FineUI;
-namespace SCP.Views.富维冲插件
+namespace SCP.Views.富维冲压件
{
public partial class SCP_PO_QH_DETAIL : PageBase
{
diff --git a/SCP/Views/富维冲插件/SCP_PO_QH_DETAIL.aspx.designer.cs b/SCP/Views/富维冲压件/SCP_PO_QH_DETAIL.aspx.designer.cs
similarity index 99%
rename from SCP/Views/富维冲插件/SCP_PO_QH_DETAIL.aspx.designer.cs
rename to SCP/Views/富维冲压件/SCP_PO_QH_DETAIL.aspx.designer.cs
index 2ed88b5..8a13145 100644
--- a/SCP/Views/富维冲插件/SCP_PO_QH_DETAIL.aspx.designer.cs
+++ b/SCP/Views/富维冲压件/SCP_PO_QH_DETAIL.aspx.designer.cs
@@ -7,7 +7,7 @@
//
//------------------------------------------------------------------------------
-namespace SCP.Views.富维冲插件
+namespace SCP.Views.富维冲压件
{
diff --git a/SCP/Views/富维冲插件/SCP_PO_SUBDETAIL.aspx b/SCP/Views/富维冲压件/SCP_PO_SUBDETAIL.aspx
similarity index 98%
rename from SCP/Views/富维冲插件/SCP_PO_SUBDETAIL.aspx
rename to SCP/Views/富维冲压件/SCP_PO_SUBDETAIL.aspx
index edecdb6..cf537a5 100644
--- a/SCP/Views/富维冲插件/SCP_PO_SUBDETAIL.aspx
+++ b/SCP/Views/富维冲压件/SCP_PO_SUBDETAIL.aspx
@@ -1,4 +1,4 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SCP_PO_SUBDETAIL.aspx.cs" Inherits="SCP.Views.富维冲插件.SCP_PO_SUBDETAIL" %>
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SCP_PO_SUBDETAIL.aspx.cs" Inherits="SCP.Views.富维冲压件.SCP_PO_SUBDETAIL" %>
diff --git a/SCP/Views/富维冲插件/SCP_PO_SUBDETAIL.aspx.cs b/SCP/Views/富维冲压件/SCP_PO_SUBDETAIL.aspx.cs
similarity index 97%
rename from SCP/Views/富维冲插件/SCP_PO_SUBDETAIL.aspx.cs
rename to SCP/Views/富维冲压件/SCP_PO_SUBDETAIL.aspx.cs
index 0d02c73..cab66a2 100644
--- a/SCP/Views/富维冲插件/SCP_PO_SUBDETAIL.aspx.cs
+++ b/SCP/Views/富维冲压件/SCP_PO_SUBDETAIL.aspx.cs
@@ -7,7 +7,7 @@ using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
-namespace SCP.Views.富维冲插件
+namespace SCP.Views.富维冲压件
{
public partial class SCP_PO_SUBDETAIL :PageBase
{
diff --git a/SCP/Views/富维冲插件/SCP_PO_SUBDETAIL.aspx.designer.cs b/SCP/Views/富维冲压件/SCP_PO_SUBDETAIL.aspx.designer.cs
similarity index 99%
rename from SCP/Views/富维冲插件/SCP_PO_SUBDETAIL.aspx.designer.cs
rename to SCP/Views/富维冲压件/SCP_PO_SUBDETAIL.aspx.designer.cs
index 4e54da9..6dccaf4 100644
--- a/SCP/Views/富维冲插件/SCP_PO_SUBDETAIL.aspx.designer.cs
+++ b/SCP/Views/富维冲压件/SCP_PO_SUBDETAIL.aspx.designer.cs
@@ -7,7 +7,7 @@
//
//------------------------------------------------------------------------------
-namespace SCP.Views.富维冲插件
+namespace SCP.Views.富维冲压件
{
diff --git a/SCP/Views/富维冲插件/SCP_PO_SUBPART.aspx b/SCP/Views/富维冲压件/SCP_PO_SUBPART.aspx
similarity index 97%
rename from SCP/Views/富维冲插件/SCP_PO_SUBPART.aspx
rename to SCP/Views/富维冲压件/SCP_PO_SUBPART.aspx
index 3a4809f..0468e53 100644
--- a/SCP/Views/富维冲插件/SCP_PO_SUBPART.aspx
+++ b/SCP/Views/富维冲压件/SCP_PO_SUBPART.aspx
@@ -1,4 +1,4 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SCP_PO_SUBPART.aspx.cs" Inherits="SCP.Views.富维冲插件.SCP_PO_SUBPART" %>
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SCP_PO_SUBPART.aspx.cs" Inherits="SCP.Views.富维冲压件.SCP_PO_SUBPART" %>
diff --git a/SCP/Views/富维冲插件/SCP_PO_SUBPART.aspx.cs b/SCP/Views/富维冲压件/SCP_PO_SUBPART.aspx.cs
similarity index 98%
rename from SCP/Views/富维冲插件/SCP_PO_SUBPART.aspx.cs
rename to SCP/Views/富维冲压件/SCP_PO_SUBPART.aspx.cs
index 79fdbfa..b3d157d 100644
--- a/SCP/Views/富维冲插件/SCP_PO_SUBPART.aspx.cs
+++ b/SCP/Views/富维冲压件/SCP_PO_SUBPART.aspx.cs
@@ -12,7 +12,7 @@ using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
-namespace SCP.Views.富维冲插件
+namespace SCP.Views.富维冲压件
{
public partial class SCP_PO_SUBPART : PageBase
{
diff --git a/SCP/Views/富维冲插件/SCP_PO_SUBPART.aspx.designer.cs b/SCP/Views/富维冲压件/SCP_PO_SUBPART.aspx.designer.cs
similarity index 98%
rename from SCP/Views/富维冲插件/SCP_PO_SUBPART.aspx.designer.cs
rename to SCP/Views/富维冲压件/SCP_PO_SUBPART.aspx.designer.cs
index c561b9a..293fc8e 100644
--- a/SCP/Views/富维冲插件/SCP_PO_SUBPART.aspx.designer.cs
+++ b/SCP/Views/富维冲压件/SCP_PO_SUBPART.aspx.designer.cs
@@ -7,7 +7,7 @@
//
//------------------------------------------------------------------------------
-namespace SCP.Views.富维冲插件
+namespace SCP.Views.富维冲压件
{
diff --git a/UniApiGroup/CK.SCP.GrupUniApi.csproj b/UniApiGroup/CK.SCP.GrupUniApi.csproj
index 47b3c46..3b501ed 100644
--- a/UniApiGroup/CK.SCP.GrupUniApi.csproj
+++ b/UniApiGroup/CK.SCP.GrupUniApi.csproj
@@ -49,7 +49,7 @@
- D:\连接orlcor\ChangKeTec.Utils.dll
+ ..\DLL\ChangKeTec.Utils.dll
False
@@ -87,7 +87,7 @@
False
- bin\Debug\Z.EntityFramework.Extensions.dll
+ ..\DLL\Z.EntityFramework.Extensions.dll