Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc

# Conflicts:
#	SRC/MEStc_SXS/MEStc_SXS.csproj
#	SRC/wsSXS/wsSXS.csproj
#	SRC/wsSXS/wsSXS.csproj.user

SRC/MESWin/ENT/ET_Subcontractor/ET_Subcontractor.vbproj

@@ -6,11 +6,16 @@
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
     <ProjectGuid>{D6EE7B96-F10E-44E2-9731-162B70B4C8DD}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <RootNamespace>ET_Subcontractor</RootNamespace>
+<<<<<<< HEAD
-    <AssemblyName>ET_Subcontractor</AssemblyName>
+    <RootNamespace>ET_Subcontractor_21671</RootNamespace>
+    <AssemblyName>ET_Subcontractor_21671</AssemblyName>
+=======
+    <RootNamespace>ET_Subcontractor_21703</RootNamespace>
+    <AssemblyName>ET_Subcontractor_21703</AssemblyName>
+>>>>>>> d89d49780d597d830e98f207bcaf042ea615b374
     <FileAlignment>512</FileAlignment>
     <MyType>Windows</MyType>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <TargetFrameworkProfile />
     <SccProjectName>SAK</SccProjectName>
     <SccLocalPath>SAK</SccLocalPath>
@@ -34,7 +39,11 @@
     <DefineDebug>true</DefineDebug>
     <DefineTrace>true</DefineTrace>
     <OutputPath>..\..\..\MESClient\</OutputPath>
-    <DocumentationFile>ET_Subcontractor.xml</DocumentationFile>
+<<<<<<< HEAD
+    <DocumentationFile>ET_Subcontractor_21671.xml</DocumentationFile>
+=======
+    <DocumentationFile>ET_Subcontractor_21703.xml</DocumentationFile>
+>>>>>>> d89d49780d597d830e98f207bcaf042ea615b374
     <WarningLevel>0</WarningLevel>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
     <DebugType>full</DebugType>
@@ -45,7 +54,11 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <DefineTrace>true</DefineTrace>
     <OutputPath>..\..\..\MESClient\</OutputPath>
-    <DocumentationFile>ET_Subcontractor.xml</DocumentationFile>
+<<<<<<< HEAD
+    <DocumentationFile>ET_Subcontractor_21671.xml</DocumentationFile>
+=======
+    <DocumentationFile>ET_Subcontractor_21703.xml</DocumentationFile>
+>>>>>>> d89d49780d597d830e98f207bcaf042ea615b374
     <Optimize>true</Optimize>
     <WarningLevel>0</WarningLevel>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
@@ -126,6 +139,12 @@
     <Compile Include="..\..\shared file\modConstant.vb">
       <Link>modConstant.vb</Link>
     </Compile>
+    <Compile Include="frmDemo21706.Designer.vb">
+      <DependentUpon>frmDemo21706.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmDemo21706.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="frmSubcontractor.vb">
       <SubType>Form</SubType>
     </Compile>
@@ -139,6 +158,7 @@
     <Compile Include="My Project\Application.Designer.vb">
       <AutoGen>True</AutoGen>
       <DependentUpon>Application.myapp</DependentUpon>
+      <DesignTime>True</DesignTime>
     </Compile>
     <Compile Include="My Project\Resources.Designer.vb">
       <AutoGen>True</AutoGen>
@@ -152,6 +172,9 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="frmDemo21706.resx">
+      <DependentUpon>frmDemo21706.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="frmSubcontractor.resx">
       <DependentUpon>frmSubcontractor.vb</DependentUpon>
     </EmbeddedResource>

SRC/MESWin/ENT/ET_Subcontractor/My Project/Application.Designer.vb

@@ -1,10 +1,10 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
-'     這段程式碼是由工具產生的。
+'     此代码由工具生成。
-'     執行階段版本:4.0.30319.42000
+'     运行时版本:4.0.30319.42000
 '
-'     對這個檔案所做的變更可能會造成錯誤的行為，而且如果重新產生程式碼，
+'     对此文件的更改可能会导致不正确的行为，并且如果
-'     變更將會遺失。
+'     重新生成代码，这些更改将会丢失。
 ' </auto-generated>
 '------------------------------------------------------------------------------
 

SRC/MESWin/ENT/ET_Subcontractor/My Project/BuildIncrementVersionInfo.vb

@@ -1 +1 @@
-<Assembly: Reflection.AssemblyFileVersion("6.0.5.40115")>
+<Assembly: Reflection.AssemblyFileVersion("6.0.5.40116")>

SRC/MESWin/ENT/ET_Subcontractor/My Project/Resources.Designer.vb

@@ -1,10 +1,10 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
-'     這段程式碼是由工具產生的。
+'     此代码由工具生成。
-'     執行階段版本:4.0.30319.42000
+'     运行时版本:4.0.30319.42000
 '
-'     對這個檔案所做的變更可能會造成錯誤的行為，而且如果重新產生程式碼，
+'     对此文件的更改可能会导致不正确的行为，并且如果
-'     變更將會遺失。
+'     重新生成代码，这些更改将会丢失。
 ' </auto-generated>
 '------------------------------------------------------------------------------
 
@@ -15,14 +15,14 @@ Imports System
 
 Namespace My.Resources
     
-    '這個類別是自動產生的，是利用 StronglyTypedResourceBuilder
+    '此类是由 StronglyTypedResourceBuilder
-    '類別透過 ResGen 或 Visual Studio 這類工具。
+    '类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
-    '若要加入或移除成員，請編輯您的 .ResX 檔，然後重新執行 ResGen
+    '若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
-    '(利用 /str 選項)，或重建您的 VS 專案。
+    '(以 /str 作为命令选项)，或重新生成 VS 项目。
     '''<summary>
-    '''  用於查詢當地語系化字串等的強類型資源類別。
+    '''  一个强类型的资源类，用于查找本地化的字符串等。
     '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"),  _
      Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
      Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
      Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
@@ -33,13 +33,17 @@ Namespace My.Resources
         Private resourceCulture As Global.System.Globalization.CultureInfo
         
         '''<summary>
-        '''  傳回這個類別使用的快取的 ResourceManager 執行個體。
+        '''  返回此类使用的缓存的 ResourceManager 实例。
         '''</summary>
         <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
         Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
             Get
                 If Object.ReferenceEquals(resourceMan, Nothing) Then
-                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("ET_Subcontractor.Resources", GetType(Resources).Assembly)
+<<<<<<< HEAD
+                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("ET_Subcontractor_21671.Resources", GetType(Resources).Assembly)
+=======
+                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("ET_Subcontractor_21703.Resources", GetType(Resources).Assembly)
+>>>>>>> d89d49780d597d830e98f207bcaf042ea615b374
                     resourceMan = temp
                 End If
                 Return resourceMan
@@ -47,8 +51,8 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  覆寫目前執行緒的 CurrentUICulture 屬性，對象是所有
+        '''  重写当前线程的 CurrentUICulture 属性，对
-        '''  使用這個強類型資源類別的資源查閱。
+        '''  使用此强类型资源类的所有资源查找执行重写。
         '''</summary>
         <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
         Friend Property Culture() As Global.System.Globalization.CultureInfo

SRC/MESWin/ENT/ET_Subcontractor/My Project/Settings.Designer.vb

@@ -1,10 +1,10 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
-'     這段程式碼是由工具產生的。
+'     此代码由工具生成。
-'     執行階段版本:4.0.30319.42000
+'     运行时版本:4.0.30319.42000
 '
-'     對這個檔案所做的變更可能會造成錯誤的行為，而且如果重新產生程式碼，
+'     对此文件的更改可能会导致不正确的行为，并且如果
-'     變更將會遺失。
+'     重新生成代码，这些更改将会丢失。
 ' </auto-generated>
 '------------------------------------------------------------------------------
 
@@ -15,21 +15,21 @@ Option Explicit On
 Namespace My
     
     <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0"),  _
      Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
     Partial Friend NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase
         
         Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
         
-#Region "My.Settings 自動儲存功能"
+#Region "My.Settings 自动保存功能"
 #If _MyType = "WindowsForms" Then
     Private Shared addedHandler As Boolean
 
     Private Shared addedHandlerLockObject As New Object
 
     <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
-    Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs)
+    Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs)
         If My.Application.SaveMySettingsOnExit Then
             My.Settings.Save()
         End If
@@ -64,9 +64,15 @@ Namespace My
     Friend Module MySettingsProperty
         
         <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
-        Friend ReadOnly Property Settings() As Global.ET_Subcontractor.My.MySettings
+<<<<<<< HEAD
+        Friend ReadOnly Property Settings() As Global.ET_Subcontractor_21671.My.MySettings
             Get
-                Return Global.ET_Subcontractor.My.MySettings.Default
+                Return Global.ET_Subcontractor_21671.My.MySettings.Default
+=======
+        Friend ReadOnly Property Settings() As Global.ET_Subcontractor_21703.My.MySettings
+            Get
+                Return Global.ET_Subcontractor_21703.My.MySettings.Default
+>>>>>>> d89d49780d597d830e98f207bcaf042ea615b374
             End Get
         End Property
     End Module

SRC/MESWin/ENT/ET_Subcontractor/frmSubcontractor.vb

@@ -832,6 +832,12 @@ Public Class frmSubcontractor
                 .Hidden = False
                 .Header.VisiblePosition = 7
             End With
+            With .Bands(0).Columns("AGE")
+                .Header.Caption = "AGE"
+                .Width = 150
+                .Hidden = False
+                .Header.VisiblePosition = 8
+            End With
             With e.Layout.Bands(0).Columns("DataStamp")
                 .Hidden = True
             End With
@@ -933,6 +939,13 @@ Public Class frmSubcontractor
                 .Hidden = False
                 .Header.VisiblePosition = 11
             End With
+            With .Bands(0).Columns("AGE")
+                .Header.Caption = "AGE"
+                .Width = 150
+                .Format = "yyyy/MM/dd HH:mm:ss"
+                .Hidden = False
+                .Header.VisiblePosition = 12
+            End With
             With e.Layout.Bands(0).Columns("DataStamp")
                 .Hidden = True
             End With

SRC/MESWin/ENT/ET_Subcontractor/frmSubcontractorContDef.vb

@@ -18,6 +18,13 @@ Public Class frmSubcontractorContDef
 
     Dim strIdentity As String
     Dim strParameter As String
+
+    Friend WithEvents UltraTextEditor1 As Infragistics.Win.UltraWinEditors.UltraTextEditor
+    Friend WithEvents dll21671 As Label
+
+    Friend WithEvents lblAge As Label
+    Friend WithEvents txtAge As Infragistics.Win.UltraWinEditors.UltraTextEditor
+
     Dim intDataStamp As Integer '紀錄DataStamp
 
 #Region " Windows Form Designer generated code "
@@ -68,6 +75,7 @@ Public Class frmSubcontractorContDef
     <System.Diagnostics.DebuggerStepThrough()> Private Sub InitializeComponent()
         Dim Appearance1 As Infragistics.Win.Appearance = New Infragistics.Win.Appearance()
         Me.gbxSubcontractorContData = New System.Windows.Forms.GroupBox()
+        Me.lblAge = New System.Windows.Forms.Label()
         Me.txtAddress = New Infragistics.Win.UltraWinEditors.UltraTextEditor()
         Me.txtEMail = New Infragistics.Win.UltraWinEditors.UltraTextEditor()
         Me.txtTitle = New Infragistics.Win.UltraWinEditors.UltraTextEditor()
@@ -84,6 +92,12 @@ Public Class frmSubcontractorContDef
         Me.txtSubcontractorNo = New Infragistics.Win.UltraWinEditors.UltraTextEditor()
         Me.txtContactorName = New Infragistics.Win.UltraWinEditors.UltraTextEditor()
         Me.txtTelNo = New Infragistics.Win.UltraWinEditors.UltraTextEditor()
+
+        Me.dll21671 = New System.Windows.Forms.Label()
+        Me.UltraTextEditor1 = New Infragistics.Win.UltraWinEditors.UltraTextEditor()
+
+        Me.txtAge = New Infragistics.Win.UltraWinEditors.UltraTextEditor()
+
         CType(Me.gbxBasisData, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.gbxSubcontractorContData.SuspendLayout()
         CType(Me.txtAddress, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -93,6 +107,11 @@ Public Class frmSubcontractorContDef
         CType(Me.txtSubcontractorNo, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.txtContactorName, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.txtTelNo, System.ComponentModel.ISupportInitialize).BeginInit()
+
+        CType(Me.UltraTextEditor1, System.ComponentModel.ISupportInitialize).BeginInit()
+
+        CType(Me.txtAge, System.ComponentModel.ISupportInitialize).BeginInit()
+
         Me.SuspendLayout()
         '
         'gbxBasisData
@@ -117,6 +136,13 @@ Public Class frmSubcontractorContDef
         Me.gbxSubcontractorContData.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+
+        Me.gbxSubcontractorContData.Controls.Add(Me.UltraTextEditor1)
+        Me.gbxSubcontractorContData.Controls.Add(Me.dll21671)
+
+        Me.gbxSubcontractorContData.Controls.Add(Me.txtAge)
+        Me.gbxSubcontractorContData.Controls.Add(Me.lblAge)
+
         Me.gbxSubcontractorContData.Controls.Add(Me.txtAddress)
         Me.gbxSubcontractorContData.Controls.Add(Me.txtEMail)
         Me.gbxSubcontractorContData.Controls.Add(Me.txtTitle)
@@ -141,32 +167,42 @@ Public Class frmSubcontractorContDef
         Me.gbxSubcontractorContData.TabStop = False
         Me.gbxSubcontractorContData.Text = "ENT Subcontractor Contactor Data"
         '
+        'lblAge
+        '
+        Me.lblAge.Font = New System.Drawing.Font("Times New Roman", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblAge.Location = New System.Drawing.Point(24, 226)
+        Me.lblAge.Name = "lblAge"
+        Me.lblAge.Size = New System.Drawing.Size(86, 18)
+        Me.lblAge.TabIndex = 16
+        Me.lblAge.Text = "Age"
+        Me.lblAge.TextAlign = System.Drawing.ContentAlignment.TopRight
+        '
         'txtAddress
         '
-        Me.txtAddress.Location = New System.Drawing.Point(120, 152)
+        Me.txtAddress.Location = New System.Drawing.Point(116, 152)
         Me.txtAddress.Name = "txtAddress"
-        Me.txtAddress.Size = New System.Drawing.Size(336, 22)
+        Me.txtAddress.Size = New System.Drawing.Size(336, 26)
         Me.txtAddress.TabIndex = 13
         '
         'txtEMail
         '
         Me.txtEMail.Location = New System.Drawing.Point(320, 120)
         Me.txtEMail.Name = "txtEMail"
-        Me.txtEMail.Size = New System.Drawing.Size(136, 22)
+        Me.txtEMail.Size = New System.Drawing.Size(136, 26)
         Me.txtEMail.TabIndex = 11
         '
         'txtTitle
         '
         Me.txtTitle.Location = New System.Drawing.Point(120, 120)
         Me.txtTitle.Name = "txtTitle"
-        Me.txtTitle.Size = New System.Drawing.Size(114, 22)
+        Me.txtTitle.Size = New System.Drawing.Size(114, 26)
         Me.txtTitle.TabIndex = 9
         '
         'txtFaxNo
         '
         Me.txtFaxNo.Location = New System.Drawing.Point(320, 88)
         Me.txtFaxNo.Name = "txtFaxNo"
-        Me.txtFaxNo.Size = New System.Drawing.Size(136, 22)
+        Me.txtFaxNo.Size = New System.Drawing.Size(136, 26)
         Me.txtFaxNo.TabIndex = 7
         '
         'lblAddress
@@ -222,9 +258,13 @@ Public Class frmSubcontractorContDef
         'txtDescription
         '
         Me.txtDescription.Font = New System.Drawing.Font("Times New Roman", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtDescription.Location = New System.Drawing.Point(120, 184)
+        Me.txtDescription.Location = New System.Drawing.Point(116, 190)
         Me.txtDescription.Name = "txtDescription"
-        Me.txtDescription.Size = New System.Drawing.Size(336, 108)
+
+        Me.txtDescription.Size = New System.Drawing.Size(316, 36)
+
+        Me.txtDescription.Size = New System.Drawing.Size(336, 21)
+
         Me.txtDescription.TabIndex = 15
         Me.txtDescription.Text = ""
         '
@@ -263,7 +303,7 @@ Public Class frmSubcontractorContDef
         Me.txtSubcontractorNo.Location = New System.Drawing.Point(120, 24)
         Me.txtSubcontractorNo.Name = "txtSubcontractorNo"
         Me.txtSubcontractorNo.ReadOnly = True
-        Me.txtSubcontractorNo.Size = New System.Drawing.Size(114, 22)
+        Me.txtSubcontractorNo.Size = New System.Drawing.Size(114, 26)
         Me.txtSubcontractorNo.TabIndex = 1
         Me.txtSubcontractorNo.TabStop = False
         '
@@ -274,15 +314,41 @@ Public Class frmSubcontractorContDef
         Me.txtContactorName.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
         Me.txtContactorName.Location = New System.Drawing.Point(120, 56)
         Me.txtContactorName.Name = "txtContactorName"
-        Me.txtContactorName.Size = New System.Drawing.Size(160, 22)
+        Me.txtContactorName.Size = New System.Drawing.Size(160, 26)
         Me.txtContactorName.TabIndex = 3
         '
         'txtTelNo
         '
         Me.txtTelNo.Location = New System.Drawing.Point(120, 88)
         Me.txtTelNo.Name = "txtTelNo"
-        Me.txtTelNo.Size = New System.Drawing.Size(114, 22)
+        Me.txtTelNo.Size = New System.Drawing.Size(114, 26)
         Me.txtTelNo.TabIndex = 5
+        '
+
+        'dll21671
+        '
+        Me.dll21671.Font = New System.Drawing.Font("Times New Roman", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.dll21671.Location = New System.Drawing.Point(14, 236)
+        Me.dll21671.Name = "dll21671"
+        Me.dll21671.Size = New System.Drawing.Size(86, 14)
+        Me.dll21671.TabIndex = 16
+        Me.dll21671.Text = "AGE"
+        Me.dll21671.TextAlign = System.Drawing.ContentAlignment.TopRight
+        '
+        'UltraTextEditor1
+        '
+        Me.UltraTextEditor1.Location = New System.Drawing.Point(116, 232)
+        Me.UltraTextEditor1.Name = "UltraTextEditor1"
+        Me.UltraTextEditor1.Size = New System.Drawing.Size(114, 26)
+        Me.UltraTextEditor1.TabIndex = 17
+
+        'txtAge
+        '
+        Me.txtAge.Location = New System.Drawing.Point(120, 222)
+        Me.txtAge.Name = "txtAge"
+        Me.txtAge.Size = New System.Drawing.Size(336, 22)
+        Me.txtAge.TabIndex = 17
+
         '
         'frmSubcontractorContDef
         '
@@ -308,6 +374,11 @@ Public Class frmSubcontractorContDef
         CType(Me.txtSubcontractorNo, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.txtContactorName, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.txtTelNo, System.ComponentModel.ISupportInitialize).EndInit()
+
+        CType(Me.UltraTextEditor1, System.ComponentModel.ISupportInitialize).EndInit()
+
+        CType(Me.txtAge, System.ComponentModel.ISupportInitialize).EndInit()
+
         Me.ResumeLayout(False)
 
     End Sub
@@ -346,6 +417,11 @@ Public Class frmSubcontractorContDef
             txtTitle.Text = EditDataRow.Item("Title").ToString
             txtAddress.Text = EditDataRow.Item("Address").ToString
             txtEMail.Text = EditDataRow.Item("EMail").ToString
+
+            dll21671.Text = EditDataRow.Item("AGE").ToString
+
+            txtAge.Text = EditDataRow.Item("Age").ToString
+
             'txtDescription是RichTextBox(Control, 因為TextBox無法正常顯示多行換行的資料)
             txtDescription.Text = EditDataRow.Item("Description").ToString
             If DefMode = 1 Then
@@ -608,7 +684,9 @@ Public Class frmSubcontractorContDef
             strParameter = strParameter & CombineXMLParameter("title", "Title", "String", CInput(txtTitle.Text), "")
             strParameter = strParameter & CombineXMLParameter("address", "Address", "String", CInput(txtAddress.Text), "")
             strParameter = strParameter & CombineXMLParameter("email", "EMail", "String", CInput(txtEMail.Text), "")
+            strParameter = strParameter & CombineXMLParameter("age", "Age", "String", txtAge.Text, "")
             strParameter = strParameter & CombineXMLParameter("description", "Description", "String", CInput(txtDescription.Text), "")
+            strParameter = strParameter & CombineXMLParameter("AGE", "AGE", "String", CInput(dll21671.Text), "")
 
 
             If DefMode = 0 Or DefMode = 2 Then      'Add or Copy
@@ -652,5 +730,16 @@ Public Class frmSubcontractorContDef
     Private Sub frmSubcontractorContDef_Closing(ByVal sender As Object, ByVal e As System.ComponentModel.CancelEventArgs) Handles MyBase.Closing
         ' 2016 YF, If Not wsENT Is Nothing Then wsENT.Dispose()
     End Sub
+
+
+    Private Sub UltraTextEditor1_ValueChanged(sender As Object, e As EventArgs) Handles UltraTextEditor1.ValueChanged
+
+    End Sub
+
+    Private Sub DD_Click(sender As Object, e As EventArgs) Handles dll21671.Click
+
+    End Sub
+
+
 End Class
 

SRC/MESWin/ENT/ET_Subcontractor/frmSubcontractorDef.vb

@@ -16,6 +16,13 @@ Public Class frmSubcontractorDef
 
     Dim strIdentity As String
     Dim strParameter As String
+
+    Friend WithEvents RichTextBox1 As RichTextBox
+    Friend WithEvents dll21671_01 As Label
+
+    Friend WithEvents txtAge As RichTextBox
+    Friend WithEvents lblAge As Label
+
     Dim intDataStamp As Integer '紀錄DataStamp
 
 #Region " Windows Form Designer generated code "
@@ -57,12 +64,16 @@ Public Class frmSubcontractorDef
         Dim Appearance1 As Infragistics.Win.Appearance = New Infragistics.Win.Appearance()
         Dim Appearance2 As Infragistics.Win.Appearance = New Infragistics.Win.Appearance()
         Me.gbxSubcontractorData = New System.Windows.Forms.GroupBox()
+        Me.txtAge = New System.Windows.Forms.RichTextBox()
+        Me.lblAge = New System.Windows.Forms.Label()
         Me.txtDescription = New System.Windows.Forms.RichTextBox()
         Me.lblDescription = New System.Windows.Forms.Label()
         Me.lblSubcontractorNo = New System.Windows.Forms.Label()
         Me.lblSubcontractorName = New System.Windows.Forms.Label()
         Me.txtSubcontractorNo = New Infragistics.Win.UltraWinEditors.UltraTextEditor()
         Me.txtSubcontractorName = New Infragistics.Win.UltraWinEditors.UltraTextEditor()
+        Me.dll21671_01 = New System.Windows.Forms.Label()
+        Me.RichTextBox1 = New System.Windows.Forms.RichTextBox()
         CType(Me.gbxBasisData, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.gbxSubcontractorData.SuspendLayout()
         CType(Me.txtSubcontractorNo, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -91,6 +102,13 @@ Public Class frmSubcontractorDef
         Me.gbxSubcontractorData.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+
+        Me.gbxSubcontractorData.Controls.Add(Me.RichTextBox1)
+        Me.gbxSubcontractorData.Controls.Add(Me.dll21671_01)
+
+        Me.gbxSubcontractorData.Controls.Add(Me.txtAge)
+        Me.gbxSubcontractorData.Controls.Add(Me.lblAge)
+
         Me.gbxSubcontractorData.Controls.Add(Me.txtDescription)
         Me.gbxSubcontractorData.Controls.Add(Me.lblDescription)
         Me.gbxSubcontractorData.Controls.Add(Me.lblSubcontractorNo)
@@ -105,12 +123,35 @@ Public Class frmSubcontractorDef
         Me.gbxSubcontractorData.TabStop = False
         Me.gbxSubcontractorData.Text = "Subcontractor Data"
         '
+        'txtAge
+        '
+        Me.txtAge.Font = New System.Drawing.Font("Times New Roman", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtAge.Location = New System.Drawing.Point(126, 122)
+        Me.txtAge.Name = "txtAge"
+        Me.txtAge.Size = New System.Drawing.Size(334, 24)
+        Me.txtAge.TabIndex = 15
+        Me.txtAge.Text = ""
+        '
+        'lblAge
+        '
+        Me.lblAge.Font = New System.Drawing.Font("Times New Roman", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblAge.Location = New System.Drawing.Point(56, 125)
+        Me.lblAge.Name = "lblAge"
+        Me.lblAge.Size = New System.Drawing.Size(64, 21)
+        Me.lblAge.TabIndex = 14
+        Me.lblAge.Text = "Age"
+        Me.lblAge.TextAlign = System.Drawing.ContentAlignment.TopRight
+        '
         'txtDescription
         '
         Me.txtDescription.Font = New System.Drawing.Font("Times New Roman", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.txtDescription.Location = New System.Drawing.Point(128, 86)
         Me.txtDescription.Name = "txtDescription"
-        Me.txtDescription.Size = New System.Drawing.Size(334, 67)
+
+        Me.txtDescription.Size = New System.Drawing.Size(316, 33)
+
+        Me.txtDescription.Size = New System.Drawing.Size(334, 24)
+
         Me.txtDescription.TabIndex = 2
         Me.txtDescription.Text = ""
         '
@@ -151,7 +192,7 @@ Public Class frmSubcontractorDef
         Me.txtSubcontractorNo.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
         Me.txtSubcontractorNo.Location = New System.Drawing.Point(128, 24)
         Me.txtSubcontractorNo.Name = "txtSubcontractorNo"
-        Me.txtSubcontractorNo.Size = New System.Drawing.Size(152, 22)
+        Me.txtSubcontractorNo.Size = New System.Drawing.Size(152, 26)
         Me.txtSubcontractorNo.TabIndex = 0
         '
         'txtSubcontractorName
@@ -161,9 +202,28 @@ Public Class frmSubcontractorDef
         Me.txtSubcontractorName.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
         Me.txtSubcontractorName.Location = New System.Drawing.Point(128, 55)
         Me.txtSubcontractorName.Name = "txtSubcontractorName"
-        Me.txtSubcontractorName.Size = New System.Drawing.Size(334, 22)
+        Me.txtSubcontractorName.Size = New System.Drawing.Size(334, 26)
         Me.txtSubcontractorName.TabIndex = 1
         '
+        'dll21671_01
+        '
+        Me.dll21671_01.Font = New System.Drawing.Font("Times New Roman", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.dll21671_01.Location = New System.Drawing.Point(56, 128)
+        Me.dll21671_01.Name = "dll21671_01"
+        Me.dll21671_01.Size = New System.Drawing.Size(64, 14)
+        Me.dll21671_01.TabIndex = 14
+        Me.dll21671_01.Text = "AGE"
+        Me.dll21671_01.TextAlign = System.Drawing.ContentAlignment.TopRight
+        '
+        'RichTextBox1
+        '
+        Me.RichTextBox1.Font = New System.Drawing.Font("Times New Roman", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.RichTextBox1.Location = New System.Drawing.Point(128, 125)
+        Me.RichTextBox1.Name = "RichTextBox1"
+        Me.RichTextBox1.Size = New System.Drawing.Size(120, 33)
+        Me.RichTextBox1.TabIndex = 15
+        Me.RichTextBox1.Text = ""
+        '
         'frmSubcontractorDef
         '
         Me.ClientSize = New System.Drawing.Size(503, 309)
@@ -215,6 +275,11 @@ Public Class frmSubcontractorDef
             txtSubcontractorName.Text = EditDataRow.Item("SubcontractorName").ToString
             'txtDescription是RichTextBox Control,因為TextBox無法正常顯示多行換行的資料
             txtDescription.Text = EditDataRow.Item("Description").ToString
+
+            dll21671_01.Text = EditDataRow.Item("AGE").ToString
+
+            txtAge.Text = EditDataRow.Item("Age").ToString
+
         End If
 
         If DefMode = 0 Or DefMode = 2 Then    'Add or Copy
@@ -339,6 +404,18 @@ Public Class frmSubcontractorDef
         btnApplyEnabled = True
     End Sub
 
+    Private Sub txtAge_Click(ByVal sender As Object, ByVal e As System.EventArgs) Handles txtAge.Click
+        txtAge.SelectAll()
+    End Sub
+
+    Private Sub txtAge_Enter(ByVal sender As Object, ByVal e As System.EventArgs) Handles txtAge.Enter
+        txtAge.SelectAll()
+    End Sub
+
+    Private Sub txtAge_TextChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles txtAge.TextChanged
+        btnApplyEnabled = True
+    End Sub
+
 #End Region
 
 #Region "Others"
@@ -373,6 +450,10 @@ Public Class frmSubcontractorDef
             strParameter = CombineXMLParameter("subcontractorno", "SubcontractorNo", "String", CInput(txtSubcontractorNo.Text), "")
             strParameter = strParameter & CombineXMLParameter("subcontractorname", "SubcontractorName", "String", CInput(txtSubcontractorName.Text), "")
             strParameter = strParameter & CombineXMLParameter("description", "Description", "String", CInput(txtDescription.Text), "")
+            strParameter = strParameter & CombineXMLParameter("AGE", "AGE", "String", dll21671_01.Text, "")
+
+            strParameter = strParameter & CombineXMLParameter("age", "Age", "String", txtAge.Text, "")
+
 
             If DefMode = 0 Or DefMode = 2 Then      'Add or Copy
                 strParameter = strParameter & CombineXMLParameter("creator", "Creator", "String", gUserNo, "")
@@ -380,7 +461,7 @@ Public Class frmSubcontractorDef
                 InXml = CombineXMLRequest(strIdentity, strParameter)
 
                 ' 2016 YF, OutXml = wsENT.AddSubcontractor(InXml)
-                OutXml = InvokeSrv("wsENT.AddSubcontractor", InXml)
+                OutXml = InvokeSrv("SXS.wsENT.AddSubcontractor", InXml)
 
             Else
                 '修改
@@ -390,7 +471,7 @@ Public Class frmSubcontractorDef
                 InXml = CombineXMLRequest(strIdentity, strParameter)
 
                 ' 2016 YF, OutXml = wsENT.EditSubcontractor(InXml)
-                OutXml = InvokeSrv("wsENT.EditSubcontractor", InXml)
+                OutXml = InvokeSrv("SXS.wsENT.EditSubcontractor", InXml)
 
             End If
 
@@ -415,6 +496,10 @@ Public Class frmSubcontractorDef
 
     End Function
 
+    Private Sub lblDescription_Click(sender As Object, e As EventArgs) Handles lblDescription.Click
+
+    End Sub
+
 #End Region
 
 End Class

SRC/MESWin/Test/My Project/Application.Designer.vb

@@ -1,10 +1,10 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
-'     這段程式碼是由工具產生的。
+'     此代码由工具生成。
-'     執行階段版本:4.0.30319.42000
+'     运行时版本:4.0.30319.42000
 '
-'     對這個檔案所做的變更可能會造成錯誤的行為，而且如果重新產生程式碼，
+'     对此文件的更改可能会导致不正确的行为，并且如果
-'     變更將會遺失。
+'     重新生成代码，这些更改将会丢失。
 ' </auto-generated>
 '------------------------------------------------------------------------------
 

SRC/MESWin/Test/My Project/Resources.Designer.vb

@@ -1,10 +1,10 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
-'     這段程式碼是由工具產生的。
+'     此代码由工具生成。
-'     執行階段版本:4.0.30319.42000
+'     运行时版本:4.0.30319.42000
 '
-'     對這個檔案所做的變更可能會造成錯誤的行為，而且如果重新產生程式碼，
+'     对此文件的更改可能会导致不正确的行为，并且如果
-'     變更將會遺失。
+'     重新生成代码，这些更改将会丢失。
 ' </auto-generated>
 '------------------------------------------------------------------------------
 
@@ -15,14 +15,14 @@ Imports System
 
 Namespace My.Resources
     
-    '這個類別是自動產生的，是利用 StronglyTypedResourceBuilder
+    '此类是由 StronglyTypedResourceBuilder
-    '類別透過 ResGen 或 Visual Studio 這類工具。
+    '类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
-    '若要加入或移除成員，請編輯您的 .ResX 檔，然後重新執行 ResGen
+    '若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
-    '(利用 /str 選項)，或重建您的 VS 專案。
+    '(以 /str 作为命令选项)，或重新生成 VS 项目。
     '''<summary>
-    '''  用於查詢當地語系化字串等的強類型資源類別。
+    '''  一个强类型的资源类，用于查找本地化的字符串等。
     '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"),  _
      Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
      Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
      Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
@@ -33,7 +33,7 @@ Namespace My.Resources
         Private resourceCulture As Global.System.Globalization.CultureInfo
         
         '''<summary>
-        '''  傳回這個類別使用的快取的 ResourceManager 執行個體。
+        '''  返回此类使用的缓存的 ResourceManager 实例。
         '''</summary>
         <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
         Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
@@ -47,8 +47,8 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  覆寫目前執行緒的 CurrentUICulture 屬性，對象是所有
+        '''  重写当前线程的 CurrentUICulture 属性，对
-        '''  使用這個強類型資源類別的資源查閱。
+        '''  使用此强类型资源类的所有资源查找执行重写。
         '''</summary>
         <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
         Friend Property Culture() As Global.System.Globalization.CultureInfo
@@ -61,7 +61,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  查詢類型 System.Byte[] 的當地語系化資源。
+        '''  查找 System.Byte[] 类型的本地化资源。
         '''</summary>
         Friend ReadOnly Property iMES() As Byte()
             Get

SRC/MESWin/Test/My Project/Settings.Designer.vb

@@ -1,10 +1,10 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
-'     這段程式碼是由工具產生的。
+'     此代码由工具生成。
-'     執行階段版本:4.0.30319.42000
+'     运行时版本:4.0.30319.42000
 '
-'     對這個檔案所做的變更可能會造成錯誤的行為，而且如果重新產生程式碼，
+'     对此文件的更改可能会导致不正确的行为，并且如果
-'     變更將會遺失。
+'     重新生成代码，这些更改将会丢失。
 ' </auto-generated>
 '------------------------------------------------------------------------------
 
@@ -15,21 +15,21 @@ Option Explicit On
 Namespace My
     
     <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0"),  _
      Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
     Partial Friend NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase
         
         Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
         
-#Region "My.Settings 自動儲存功能"
+#Region "My.Settings 自动保存功能"
 #If _MyType = "WindowsForms" Then
     Private Shared addedHandler As Boolean
 
     Private Shared addedHandlerLockObject As New Object
 
     <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
-    Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs)
+    Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs)
         If My.Application.SaveMySettingsOnExit Then
             My.Settings.Save()
         End If

SRC/MESWin/Test/Test.vbproj

@@ -10,7 +10,7 @@
     <AssemblyName>Test</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>WindowsFormsWithCustomSubMain</MyType>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <TargetFrameworkProfile />
     <SccProjectName>
     </SccProjectName>
@@ -67,6 +67,29 @@
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>iMES.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
+    <DebugSymbols>true</DebugSymbols>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DocumentationFile>Test.xml</DocumentationFile>
+    <WarningLevel>0</WarningLevel>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\Release\</OutputPath>
+    <DocumentationFile>Test.xml</DocumentationFile>
+    <Optimize>true</Optimize>
+    <WarningLevel>0</WarningLevel>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Infragistics4.Shared.v19.1, Version=19.1.20191.294, Culture=neutral, PublicKeyToken=7dd5c3163f2cd0cb, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

SRC/MESWin/Test/app.config

@@ -25,4 +25,4 @@
             <!--<add name="EventLog" type="System.Diagnostics.EventLogTraceListener" initializeData="APPLICATION_NAME"/> -->
         </sharedListeners>
     </system.diagnostics>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>

SRC/MEStc_SXS/MEStc_SXS.csproj

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build"
+  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -58,17 +59,20 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.VisualBasic" />
-    <Reference Include="data_access_service, Version=6.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference
+      Include="data_access_service, Version=6.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\MES_S_DLL\data_access_service.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="iMESAppSetting, Version=6.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference
+      Include="iMESAppSetting, Version=6.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\MES_S_DLL\iMESAppSetting.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="iMESComSubroutine, Version=6.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference
+      Include="iMESComSubroutine, Version=6.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\MES_S_DLL\iMESComSubroutine.dll</HintPath>
       <Private>False</Private>
@@ -111,6 +115,7 @@
     <Import Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="21684tcENT\clsENT21684.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
 
     <Compile Include="tcENT_21674\clsENT_21674.cs" />
@@ -119,10 +124,20 @@
 
     <Compile Include="tcENT\clsA.cs" />
     <Compile Include="tcENT\clsENT.cs" />
+    <Compile Include="tcENT21687\clsENT687.cs" />
+    <Compile Include="tcENT\clsA.cs" />
+    <Compile Include="tcENT\clsENT.cs" />
+    <Compile Include="tcTEST21706\clsENT21706.cs" />
+
+    <Compile Include="tcTWEST21671\tcTEST_21671.cs" />
+
+    <Compile Include="tcTEST21703\clsTEST_21703.cs" />
+
     <Compile Include="tcENT_21681\clsENT_21681.cs" />
     <Compile Include="tcTest21681\clsTest21681.cs" />
     <Compile Include="tcTEST14278\clsTest_14278.cs" />
 
+
     <Compile Include="tcWIP\clsLot.cs" />
     <Compile Include="tc_21685\clsENT_21685.cs" />
   </ItemGroup>
@@ -137,5 +152,6 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-  <Import Project="..\MESWin\shared file\MakeVersion_CS.targets" Condition="exists('..\MESWin\shared file\MakeVersion_CS.targets')" />
+  <Import Project="..\MESWin\shared file\MakeVersion_CS.targets"
+    Condition="exists('..\MESWin\shared file\MakeVersion_CS.targets')" />
 </Project>

SRC/MEStc_SXS/tcENT/clsENT.cs

@@ -127,7 +127,11 @@ namespace MEStc_SXS
         #region --- Subcontractor 外包商 ---
 
 
-        public string AddSubcontractor(string SubcontractorNo, string SubcontractorName, string Description = defString, string Creator = defString, DateTime CreateDate = default(DateTime), string AdditionalXml = "")
+
+        public string AddSubcontractor(string SubcontractorNo, string SubcontractorName, string Description = defString, string AGE = defString,string Creator = defString, DateTime CreateDate = default(DateTime), string AdditionalXml = "")
+
+        public string AddSubcontractor(string SubcontractorNo, string SubcontractorName, string Description = defString, string Age = defString,string Creator = defString, DateTime CreateDate = default(DateTime), string AdditionalXml = "")
+
         {
             string AddSubcontractorRet = default(string);
             // 此 Function 將新增一筆資料
@@ -139,14 +143,35 @@ namespace MEStc_SXS
 
             try
             {
-                strSQLAddField = "Insert into tblENTSubcontractor (SubcontractorNo, SubcontractorName, IssueState";
+<<<<<<< HEAD
+<<<<<<< HEAD
+                strSQLAddField = "Insert into A_21671main (SubcontractorNo, SubcontractorName, IssueState";
+=======
+                strSQLAddField = "Insert into A_21703MAIN (SubcontractorNo, SubcontractorName, IssueState";
+>>>>>>> d89d49780d597d830e98f207bcaf042ea615b374
+=======
+<<<<<<< .merge_file_APRfoz
+                strSQLAddField = "Insert into tblENTSubcontractor_21706 (SubcontractorNo, SubcontractorName, IssueState";
+=======
+                strSQLAddField = "Insert into A_21703MAIN (SubcontractorNo, SubcontractorName, IssueState";
+>>>>>>> .merge_file_vx44Nb
+>>>>>>> 24c623d98bc11e5948b038d0b561b7316dd293ef
                 strSQLAddValue = " Values ('" + SubcontractorNo + "','" + SubcontractorName + "', 0";
-
+                if ((Age ?? "") != defString)
+                {
+                    strSQLAddField += ",Age";
+                    strSQLAddValue += ",'" + Age + "'";
+                }
                 if ((Description ?? "") != defString)
                 {
                     strSQLAddField += ",Description";
                     strSQLAddValue += ",'" + Description + "'";
                 }
+                if ((AGE ?? "") != defString)
+                {
+                    strSQLAddField += ",AGE";
+                    strSQLAddValue += ",'" + AGE + "'";
+                }
                 if ((Creator ?? "") != defString)
                 {
                     strSQLAddField += ",Creator";
@@ -190,7 +215,88 @@ namespace MEStc_SXS
 
         }
 
+<<<<<<< HEAD
+<<<<<<< HEAD
+        public string EditSubcontractor(string SubcontractorNo, string SubcontractorName = defString, string Description = defString, string AGE = defString, string AdditionalXml = "", int DataStamp = defInteger, string Reviser = defString, DateTime ReviseDate = default(DateTime))
+=======
+        public string EditSubcontractor(string SubcontractorNo, string SubcontractorName = defString, string Description = defString, string Age = defString, string AdditionalXml = "", int DataStamp = defInteger, string Reviser = defString, DateTime ReviseDate = default(DateTime))
+>>>>>>> d89d49780d597d830e98f207bcaf042ea615b374
+=======
+<<<<<<< .merge_file_APRfoz
+        public string AddSubcontractorCustom(string SubcontractorNo, string SubcontractorName, string NotNull, string Description = defString, string Creator = defString, DateTime CreateDate = default(DateTime), string Note21706 = defString, string AdditionalXml = "")
+        {
+            string AddSubcontractorRet = default(string);
+            // 此 Function 为用作练习之自定义 Function
+            // 此 Function 將新增一筆資料
+            // 傳入值: 各欄位新增值
+            // 傳回值: success(成功), fail(失敗)
+
+            if (CreateDate == defDateTime)
+                CreateDate = DateTime.Now;
+
+            try
+            {
+                // 插入供货商编号、供货商名称、签核状态、自定义非空字段
+                strSQLAddField = "Insert into tblENTSubcontractor_21706 (SubcontractorNo, SubcontractorName, IssueState, NotNull";
+                strSQLAddValue = " Values ('" + SubcontractorNo + "','" + SubcontractorName + "', 0, '" + NotNull + "'";
+
+                // 插入描述、创建人、创建日期、自定义字段
+                if ((Description ?? "") != defString)
+                {
+                    strSQLAddField += ",Description";
+                    strSQLAddValue += ",'" + Description + "'";
+                }
+                if ((Creator ?? "") != defString)
+                {
+                    strSQLAddField += ",Creator";
+                    strSQLAddValue += ",'" + Creator + "'";
+                }
+                if (CreateDate != defDateTime)
+                {
+                    strSQLAddField += ",CreateDate";
+                    strSQLAddValue += ", To_Date('" + Strings.Format(Conversions.ToDate(CreateDate), "yyyy/MM/dd H:mm:ss") + "','YYYY/MM/DD HH24:MI:SS')";
+                }
+                if ((Note21706 ?? "") != defString)
+                {
+                    strSQLAddField += ",Note21706";
+                    strSQLAddValue += ",'" + Note21706 + "'";
+                }
+
+                if (string.IsNullOrEmpty(AdditionalXml))
+                {
+                    // 當沒有額外的欄位時,直接給定strSQL
+                    strSQL = strSQLAddField + ")" + strSQLAddValue + ")";
+                }
+                else
+                {
+                    // 加上additional的field & value 後傳回
+                    strSQL = SeparateAddXML_Add(ref strSQLAddField, ref strSQLAddValue, AdditionalXml);
+
+                }
+
+                // //執行SQL指令
+                ExecuteSQLNoneQuery(Conversions.ToString(DataBaseType), strConnectionString, ref strSQL);
+
+                // //Return success
+                AddSubcontractorRet = "success";
+            }
+            catch (Exception e1)
+            {
+                AddSubcontractorRet = "fail";
+                // 發生錯誤時丟回本身的Function Name及系統錯誤訊息
+                throw;
+
+            } // New Exception("kcENT.AddSubcontractor: " & e1.Message)
+
+            return AddSubcontractorRet;
+
+        }
+
         public string EditSubcontractor(string SubcontractorNo, string SubcontractorName = defString, string Description = defString, string AdditionalXml = "", int DataStamp = defInteger, string Reviser = defString, DateTime ReviseDate = default(DateTime))
+=======
+        public string EditSubcontractor(string SubcontractorNo, string SubcontractorName = defString, string Description = defString, string Age = defString, string AdditionalXml = "", int DataStamp = defInteger, string Reviser = defString, DateTime ReviseDate = default(DateTime))
+>>>>>>> .merge_file_vx44Nb
+>>>>>>> 24c623d98bc11e5948b038d0b561b7316dd293ef
         {
             string EditSubcontractorRet = default(string);
             // 此 Function 將修改一筆資料
@@ -200,7 +306,16 @@ namespace MEStc_SXS
             try
             {
                 // 先給定strSQL一定有的欄位
-                strSQL = "Update tblENTSubcontractor Set ";
+<<<<<<< HEAD
+<<<<<<< HEAD
+                strSQL = "Update A_21671main Set ";
+=======
+                strSQL = "Update A_21703MAIN Set ";
+>>>>>>> d89d49780d597d830e98f207bcaf042ea615b374
+=======
+<<<<<<< .merge_file_APRfoz
+                strSQL = "Update tblENTSubcontractor_21706 Set ";
+>>>>>>> 24c623d98bc11e5948b038d0b561b7316dd293ef
 
                 if ((SubcontractorName ?? "") != defString)
                 {
@@ -210,6 +325,10 @@ namespace MEStc_SXS
                 {
                     strSQL += "Description = '" + Description + "',";
                 }
+                if ((AGE ?? "") != defString)
+                {
+                    strSQL += "AGE = '" + AGE + "',";
+                }
 
                 if (Reviser != defString)
                     strSQL = strSQL + "Reviser = '" + Reviser + "',";
@@ -264,6 +383,100 @@ namespace MEStc_SXS
             return EditSubcontractorRet;
 
         }
+
+        public string EditSubcontractorCustom(string SubcontractorNo, string SubcontractorName = defString, string NotNull = defString, string Description = defString, string AdditionalXml = "", int DataStamp = defInteger, string Reviser = defString, DateTime ReviseDate = default(DateTime), string Note21706 = defString)
+        {
+            string EditSubcontractorRet = default(string);
+            // 此 Function 为用作练习之自定义 Function
+            // 此 Function 將修改一筆資料
+            // 傳入值: 各欄位修改值
+            // 傳回值: success(成功), fail(失敗)
+
+            try
+            {
+                // 先給定strSQL一定有的欄位
+                strSQL = "Update tblENTSubcontractor_21706 Set ";
+=======
+                strSQL = "Update A_21703MAIN Set ";
+>>>>>>> .merge_file_vx44Nb
+
+                if ((Age ?? "") != defString)
+                {
+                    strSQL += "Age = '" + Age + "',";
+                }
+                if ((SubcontractorName ?? "") != defString)
+                {
+                    strSQL += "SubcontractorName = '" + SubcontractorName + "',";
+                }
+                if ((Description ?? "") != defString)
+                {
+                    strSQL += "Description = '" + Description + "',";
+                }
+
+                // 以下为自定义字段
+                if ((NotNull ?? "") != defString)
+                {
+                    strSQL += "NotNull = '" + NotNull + "',";
+                }
+                if ((Note21706 ?? "") != defString)
+                {
+                    strSQL += "Note21706 = '" + Note21706 + "',";
+                }
+
+                if (Reviser != defString)
+                    strSQL = strSQL + "Reviser = '" + Reviser + "',";
+
+                if (ReviseDate != defDateTime)
+                    strSQL = strSQL + "ReviseDate = To_Date('" + Strings.Format(ReviseDate, "yyyy/MM/dd H:mm:ss") + "','YYYY/MM/DD HH24:MI:SS'),";
+
+                if (DataStamp != defInteger)
+                    strSQL = strSQL + "DataStamp = DataStamp + 1 ,";
+
+                // 有額外的欄位時再Append進原來的strSQL中
+                if (!string.IsNullOrEmpty(AdditionalXml))
+                {
+                    // 加上additional的field & value
+                    strSQL += SeparateAddXML_Edit(AdditionalXml);
+                }
+
+                // 去除strSQL中最後一個 ","
+                if (Strings.InStr(1, strSQL, ",") != 0)   // 表示有要修改的欄位
+                {
+                    if (Strings.Right(strSQL, 1) == ",")
+                    {
+                        strSQL = Strings.Mid(strSQL, 1, Strings.Len(strSQL) - 1);
+                    }
+
+                    strSQL += " Where SubcontractorNo ='" + SubcontractorNo + "'";
+                    strSQL = strSQL + " And DataStamp = '" + DataStamp + "'";
+
+                    // 有額外的條件式時再Append進原來的strSQL中
+                    if (!string.IsNullOrEmpty(AdditionalXml))
+                    {
+                        // 加上additional的condition
+                        strSQL += SeparateAddXML_Condition(AdditionalXml);
+                    }
+
+                    // 呼叫執行SQL指令
+                    ExecuteSQLNoneQuery(Conversions.ToString(DataBaseType), strConnectionString, ref strSQL, 1, true);
+                }
+
+                // //Return success
+                EditSubcontractorRet = "success";
+            }
+
+            catch (Exception e1)
+            {
+                EditSubcontractorRet = "fail";
+                // 發生錯誤時丟回本身的Function Name及系統錯誤訊息
+                throw;
+
+            } // New Exception("kcENT.EditSubcontractor: " & e1.Message)
+
+            return EditSubcontractorRet;
+
+        }
+
         public string DelSubcontractor(string SubcontractorNo, string AdditionalXml = "")
         {
             string DelSubcontractorRet = default(string);
@@ -275,11 +488,32 @@ namespace MEStc_SXS
             try
             {
                 // 1. 刪除Contactor
-                strSQL = "Delete From tblENTSubcontractorCont " + "Where SubcontractorNo='" + SubcontractorNo + "'";
+<<<<<<< HEAD
+<<<<<<< HEAD
+                strSQL = "Delete From A_21671sub " + "Where SubcontractorNo='" + SubcontractorNo + "'";
                 CollectionSQL.Add(strSQL);
 
                 // 2. 刪除主檔
-                strSQL = "Delete From tblENTSubcontractor " + " Where SubcontractorNo ='" + SubcontractorNo + "'";
+                strSQL = "Delete From A_21671main " + " Where SubcontractorNo ='" + SubcontractorNo + "'";
+=======
+<<<<<<< .merge_file_APRfoz
+                strSQL = "Delete From tblENTSubcontractorCont_21706 " + "Where SubcontractorNo='" + SubcontractorNo + "'";
+                CollectionSQL.Add(strSQL);
+
+                // 2. 刪除主檔
+                strSQL = "Delete From tblENTSubcontractor_21706 " + " Where SubcontractorNo ='" + SubcontractorNo + "'";
+>>>>>>> 24c623d98bc11e5948b038d0b561b7316dd293ef
+=======
+                strSQL = "Delete From A_21703SUB " + "Where SubcontractorNo='" + SubcontractorNo + "'";
+                CollectionSQL.Add(strSQL);
+
+                // 2. 刪除主檔
+                strSQL = "Delete From A_21703MAIN " + " Where SubcontractorNo ='" + SubcontractorNo + "'";
+<<<<<<< HEAD
+>>>>>>> d89d49780d597d830e98f207bcaf042ea615b374
+=======
+>>>>>>> .merge_file_vx44Nb
+>>>>>>> 24c623d98bc11e5948b038d0b561b7316dd293ef
 
                 if (!string.IsNullOrEmpty(AdditionalXml))
                 {
@@ -323,7 +557,19 @@ namespace MEStc_SXS
                 // //Create connection
                 cnnTemp = CreateConnection(strConnectionString);
 
-                strSQL = "Select * From tblENTSubcontractor Where SubcontractorNo Is Not Null";
+<<<<<<< HEAD
+<<<<<<< HEAD
+                strSQL = "Select * From A_21671main Where SubcontractorNo Is Not Null";
+=======
+                strSQL = "Select * From A_21703MAIN Where SubcontractorNo Is Not Null";
+>>>>>>> d89d49780d597d830e98f207bcaf042ea615b374
+=======
+<<<<<<< .merge_file_APRfoz
+                strSQL = "Select * From tblENTSubcontractor_21706 Where SubcontractorNo Is Not Null";
+=======
+                strSQL = "Select * From A_21703MAIN Where SubcontractorNo Is Not Null";
+>>>>>>> .merge_file_vx44Nb
+>>>>>>> 24c623d98bc11e5948b038d0b561b7316dd293ef
 
                 if ((SubcontractorNo ?? "") != defString)
                 {
@@ -342,10 +588,29 @@ namespace MEStc_SXS
 
                 // //Select data
                 dsENT = new DataSet();
-                ExecuteSQLQuery_Adapter(strSQL, dsENT, "tblENTSubcontractor", cnnTemp);
+<<<<<<< HEAD
+<<<<<<< HEAD
+                ExecuteSQLQuery_Adapter(strSQL, dsENT, "A_21671main", cnnTemp);
 
                 // //Combine return value
-                LoadSubcontractorRet = CombineXMLReturnValue("loadSubcontractor", "tblENTSubcontractor", "DataSet", FormatXMLSchema(dsENT.GetXmlSchema()), dsENT.GetXml(), "");
+                LoadSubcontractorRet = CombineXMLReturnValue("loadSubcontractor", "A_21671main", "DataSet", FormatXMLSchema(dsENT.GetXmlSchema()), dsENT.GetXml(), "");
+=======
+<<<<<<< .merge_file_APRfoz
+                ExecuteSQLQuery_Adapter(strSQL, dsENT, "tblENTSubcontractor_21706", cnnTemp);
+
+                // //Combine return value
+                LoadSubcontractorRet = CombineXMLReturnValue("loadSubcontractor", "tblENTSubcontractor_21706", "DataSet", FormatXMLSchema(dsENT.GetXmlSchema()), dsENT.GetXml(), "");
+>>>>>>> 24c623d98bc11e5948b038d0b561b7316dd293ef
+=======
+                ExecuteSQLQuery_Adapter(strSQL, dsENT, "A_21703MAIN", cnnTemp);
+
+                // //Combine return value
+                LoadSubcontractorRet = CombineXMLReturnValue("loadSubcontractor", "A_21703MAIN", "DataSet", FormatXMLSchema(dsENT.GetXmlSchema()), dsENT.GetXml(), "");
+<<<<<<< HEAD
+>>>>>>> d89d49780d597d830e98f207bcaf042ea615b374
+=======
+>>>>>>> .merge_file_vx44Nb
+>>>>>>> 24c623d98bc11e5948b038d0b561b7316dd293ef
             }
 
             catch (Exception e1)
@@ -383,7 +648,19 @@ namespace MEStc_SXS
                 // //Create connection
                 cnnTemp = CreateConnection(strConnectionString);
 
-                strSQL = "Select * From tblENTSubcontractor Where SubcontractorNo Is Not Null";
+<<<<<<< HEAD
+<<<<<<< HEAD
+                strSQL = "Select * From A_21671main Where SubcontractorNo Is Not Null";
+=======
+                strSQL = "Select * From A_21703MAIN Where SubcontractorNo Is Not Null";
+>>>>>>> d89d49780d597d830e98f207bcaf042ea615b374
+=======
+<<<<<<< .merge_file_APRfoz
+                strSQL = "Select * From tblENTSubcontractor_21706 Where SubcontractorNo Is Not Null";
+=======
+                strSQL = "Select * From A_21703MAIN Where SubcontractorNo Is Not Null";
+>>>>>>> .merge_file_vx44Nb
+>>>>>>> 24c623d98bc11e5948b038d0b561b7316dd293ef
 
                 if ((SubcontractorNo ?? "") != defString)
                 {
@@ -402,7 +679,19 @@ namespace MEStc_SXS
 
                 // //Select data
                 dsENT = new DataSet();
-                ExecuteSQLQuery_Adapter(strSQL, dsENT, "tblENTSubcontractor", cnnTemp);
+<<<<<<< HEAD
+<<<<<<< HEAD
+                ExecuteSQLQuery_Adapter(strSQL, dsENT, "A_21671main", cnnTemp);
+=======
+                ExecuteSQLQuery_Adapter(strSQL, dsENT, "A_21703MAIN", cnnTemp);
+>>>>>>> d89d49780d597d830e98f207bcaf042ea615b374
+=======
+<<<<<<< .merge_file_APRfoz
+                ExecuteSQLQuery_Adapter(strSQL, dsENT, "tblENTSubcontractor_21706", cnnTemp);
+=======
+                ExecuteSQLQuery_Adapter(strSQL, dsENT, "A_21703MAIN", cnnTemp);
+>>>>>>> .merge_file_vx44Nb
+>>>>>>> 24c623d98bc11e5948b038d0b561b7316dd293ef
 
                 // //Return data
                 ShowSubcontractorRet = dsENT;
@@ -443,7 +732,19 @@ namespace MEStc_SXS
                 // //Create connection
                 cnnTemp = CreateConnection(strConnectionString);
 
-                strSQL = "Select * From tblENTSubcontractor Where SubcontractorNo Is Not Null";
+<<<<<<< HEAD
+<<<<<<< HEAD
+                strSQL = "Select * From A_21671main Where SubcontractorNo Is Not Null";
+=======
+                strSQL = "Select * From A_21703MAIN Where SubcontractorNo Is Not Null";
+>>>>>>> d89d49780d597d830e98f207bcaf042ea615b374
+=======
+<<<<<<< .merge_file_APRfoz
+                strSQL = "Select * From tblENTSubcontractor_21706 Where SubcontractorNo Is Not Null";
+=======
+                strSQL = "Select * From A_21703MAIN Where SubcontractorNo Is Not Null";
+>>>>>>> .merge_file_vx44Nb
+>>>>>>> 24c623d98bc11e5948b038d0b561b7316dd293ef
 
                 if ((SubcontractorNo ?? "") != defString)
                 {
@@ -462,7 +763,19 @@ namespace MEStc_SXS
 
                 // //Select data
                 dsENT = new DataSet();
-                ExecuteSQLQuery_Adapter(strSQL, dsENT, "tblENTSubcontractor", cnnTemp);
+<<<<<<< HEAD
+<<<<<<< HEAD
+                ExecuteSQLQuery_Adapter(strSQL, dsENT, "A_21671main", cnnTemp);
+=======
+                ExecuteSQLQuery_Adapter(strSQL, dsENT, "A_21703MAIN", cnnTemp);
+>>>>>>> d89d49780d597d830e98f207bcaf042ea615b374
+=======
+<<<<<<< .merge_file_APRfoz
+                ExecuteSQLQuery_Adapter(strSQL, dsENT, "tblENTSubcontractor_21706", cnnTemp);
+=======
+                ExecuteSQLQuery_Adapter(strSQL, dsENT, "A_21703MAIN", cnnTemp);
+>>>>>>> .merge_file_vx44Nb
+>>>>>>> 24c623d98bc11e5948b038d0b561b7316dd293ef
 
                 // //Return data
                 if (dsENT.Tables[0].Rows.Count > 0)
@@ -503,7 +816,19 @@ namespace MEStc_SXS
             try
             {
                 // 先給定strSQL一定有的欄位
-                strSQL = "Update tblENTSubcontractor Set IssueState = " + IssueState + ",";
+<<<<<<< HEAD
+<<<<<<< HEAD
+                strSQL = "Update A_21671main Set IssueState = " + IssueState + ",";
+=======
+                strSQL = "Update A_21703MAIN Set IssueState = " + IssueState + ",";
+>>>>>>> d89d49780d597d830e98f207bcaf042ea615b374
+=======
+<<<<<<< .merge_file_APRfoz
+                strSQL = "Update tblENTSubcontractor_21706 Set IssueState = " + IssueState + ",";
+=======
+                strSQL = "Update A_21703MAIN Set IssueState = " + IssueState + ",";
+>>>>>>> .merge_file_vx44Nb
+>>>>>>> 24c623d98bc11e5948b038d0b561b7316dd293ef
 
                 if (Reviser != defString)
                     strSQL = strSQL + "Reviser = '" + Reviser + "',";
@@ -545,7 +870,11 @@ namespace MEStc_SXS
         }
 
 
-        public string AddSubcontractorCont(string SubcontractorNo, string ContactorName, string TelNo = defString, string FaxNo = defString, string Title = defString, string Address = defString, string EMail = defString, string Description = defString, string AdditionalXml = "", string Creator = defString, DateTime CreateDate = default(DateTime))
+<<<<<<< HEAD
+        public string AddSubcontractorCont(string SubcontractorNo, string ContactorName, string TelNo = defString, string FaxNo = defString, string Title = defString, string Address = defString, string EMail = defString, string AGE = defString, string Description = defString, string AdditionalXml = "", string Creator = defString, DateTime CreateDate = default(DateTime))
+=======
+        public string AddSubcontractorCont(string SubcontractorNo, string ContactorName, string TelNo = defString, string Age = defString, string FaxNo = defString, string Title = defString, string Address = defString, string EMail = defString, string Description = defString, string AdditionalXml = "", string Creator = defString, DateTime CreateDate = default(DateTime))
+>>>>>>> d89d49780d597d830e98f207bcaf042ea615b374
         {
             string AddSubcontractorContRet = default(string);
             // 此 Function 將新增一筆資料
@@ -554,7 +883,16 @@ namespace MEStc_SXS
 
             try
             {
-                strSQLAddField = "Insert into tblENTSubcontractorCont (SubcontractorNo,  ContactorName";
+<<<<<<< HEAD
+<<<<<<< HEAD
+                strSQLAddField = "Insert into A_21671sub (SubcontractorNo,  ContactorName";
+=======
+                strSQLAddField = "Insert into A_21703SUB (SubcontractorNo,  ContactorName";
+>>>>>>> d89d49780d597d830e98f207bcaf042ea615b374
+=======
+<<<<<<< .merge_file_APRfoz
+                strSQLAddField = "Insert into tblENTSubcontractorCont_21706 (SubcontractorNo,  ContactorName";
+>>>>>>> 24c623d98bc11e5948b038d0b561b7316dd293ef
                 strSQLAddValue = " Values ('" + SubcontractorNo + "','" + ContactorName + "'";
 
                 if ((TelNo ?? "") != defString)
@@ -582,6 +920,11 @@ namespace MEStc_SXS
                     strSQLAddField += ",EMail";
                     strSQLAddValue += ",'" + EMail + "'";
                 }
+                if ((AGE ?? "") != defString)
+                {
+                    strSQLAddField += ",AGE";
+                    strSQLAddValue += ",'" + AGE + "'";
+                }
                 if ((Description ?? "") != defString)
                 {
                     strSQLAddField += ",Description";
@@ -630,8 +973,112 @@ namespace MEStc_SXS
 
         }
 
+        public string AddSubcontractorContCustom(string SubcontractorNo, string ContactorName, string TelNo = defString, string FaxNo = defString, string Title = defString, string Address = defString, string EMail = defString, string Description = defString, string AdditionalXml = "", string Creator = defString, DateTime CreateDate = default(DateTime), string Note21706 = defString)
+        {
+            string AddSubcontractorContRet = default(string);
+            // 此 Function 为用作练习之自定义 Function
+            // 此 Function 將新增一筆資料
+            // 傳入值: 各欄位新增值
+            // 傳回值: success(成功), fail(失敗)
 
-        public string EditSubcontractorCont(string SubcontractorNo, string ContactorName, string TelNo = defString, string FaxNo = defString, string Title = defString, string Address = defString, string EMail = defString, string Description = defString, string AdditionalXml = "", int DataStamp = defInteger, string Reviser = defString, DateTime ReviseDate = default(DateTime))
+            try
+            {
+                strSQLAddField = "Insert into tblENTSubcontractorCont_21706 (SubcontractorNo,  ContactorName";
+=======
+                strSQLAddField = "Insert into A_21703SUB (SubcontractorNo,  ContactorName";
+>>>>>>> .merge_file_vx44Nb
+                strSQLAddValue = " Values ('" + SubcontractorNo + "','" + ContactorName + "'";
+
+                if ((Age ?? "") != defString)
+                {
+                    strSQLAddField += ",Age";
+                    strSQLAddValue += ",'" + Age + "'";
+                }
+                if ((TelNo ?? "") != defString)
+                {
+                    strSQLAddField += ",TelNo";
+                    strSQLAddValue += ",'" + TelNo + "'";
+                }
+                if ((FaxNo ?? "") != defString)
+                {
+                    strSQLAddField += ",FaxNo";
+                    strSQLAddValue += ",'" + FaxNo + "'";
+                }
+                if ((Title ?? "") != defString)
+                {
+                    strSQLAddField += ",Title";
+                    strSQLAddValue += ",'" + Title + "'";
+                }
+                if ((Address ?? "") != defString)
+                {
+                    strSQLAddField += ",Address";
+                    strSQLAddValue += ",'" + Address + "'";
+                }
+                if ((EMail ?? "") != defString)
+                {
+                    strSQLAddField += ",EMail";
+                    strSQLAddValue += ",'" + EMail + "'";
+                }
+                if ((Description ?? "") != defString)
+                {
+                    strSQLAddField += ",Description";
+                    strSQLAddValue += ",'" + Description + "'";
+                }
+                if (Creator != defString)
+                {
+                    strSQLAddField = strSQLAddField + ",Creator";
+                    strSQLAddValue = strSQLAddValue + ",'" + Creator + "'";
+                }
+                if (CreateDate != defDateTime)
+                {
+                    strSQLAddField = strSQLAddField + ",CreateDate";
+                    strSQLAddValue = strSQLAddValue + ", To_Date('" + Strings.Format(CreateDate, "yyyy/MM/dd HH:mm:ss") + "','YYYY/MM/DD HH24:MI:SS')";
+                }
+                // 以下为自定义字段
+                if ((Note21706 ?? "") != defString)
+                {
+                    strSQLAddField += ",Note21706";
+                    strSQLAddValue += ",'" + Note21706 + "'";
+                }
+
+                if (string.IsNullOrEmpty(AdditionalXml))
+                {
+                    // 當沒有額外的欄位時,直接給定strSQL
+                    strSQL = strSQLAddField + ")" + strSQLAddValue + ")";
+                }
+
+                else
+                {
+                    // 加上additional的field & value 後傳回
+                    strSQL = SeparateAddXML_Add(ref strSQLAddField, ref strSQLAddValue, AdditionalXml);
+
+                }
+
+                // //執行SQL指令
+                ExecuteSQLNoneQuery(Conversions.ToString(DataBaseType), strConnectionString, ref strSQL);
+
+                // //Return success
+                AddSubcontractorContRet = "success";
+            }
+
+            catch (Exception e1)
+            {
+                AddSubcontractorContRet = "fail";
+                // 發生錯誤時丟回本身的Function Name及系統錯誤訊息
+                throw;
+
+            } // New Exception("kcENT.AddSubcontractorCont: " & e1.Message)
+
+            return AddSubcontractorContRet;
+
+        }
+
+
+<<<<<<< HEAD
+        public string EditSubcontractorCont(string SubcontractorNo, string ContactorName, string TelNo = defString, string FaxNo = defString, string Title = defString, string Address = defString, string EMail = defString, string AGE = defString, string Description = defString, string AdditionalXml = "", int DataStamp = defInteger, string Reviser = defString, DateTime ReviseDate = default(DateTime))
+=======
+        public string EditSubcontractorCont(string SubcontractorNo, string ContactorName, string TelNo = defString, string Age = defString, string FaxNo = defString, string Title = defString, string Address = defString, string EMail = defString, string Description = defString, string AdditionalXml = "", int DataStamp = defInteger, string Reviser = defString, DateTime ReviseDate = default(DateTime))
+>>>>>>> d89d49780d597d830e98f207bcaf042ea615b374
         {
             string EditSubcontractorContRet = default(string);
 
@@ -642,8 +1089,121 @@ namespace MEStc_SXS
             try
             {
                 // 先給定strSQL一定有的欄位
-                strSQL = "Update tblENTSubcontractorCont Set ";
+<<<<<<< HEAD
+<<<<<<< HEAD
+                strSQL = "Update A_21671sub Set ";
+=======
+                strSQL = "Update A_21703SUB Set ";
+>>>>>>> d89d49780d597d830e98f207bcaf042ea615b374
+=======
+<<<<<<< .merge_file_APRfoz
+                strSQL = "Update tblENTSubcontractorCont_21706 Set ";
+>>>>>>> 24c623d98bc11e5948b038d0b561b7316dd293ef
 
+                if ((TelNo ?? "") != defString)
+                {
+                    strSQL += "TelNo = '" + TelNo + "',";
+                }
+                if ((FaxNo ?? "") != defString)
+                {
+                    strSQL += "FaxNo = '" + FaxNo + "',";
+                }
+                if ((Title ?? "") != defString)
+                {
+                    strSQL += "Title = '" + Title + "',";
+                }
+                if ((Address ?? "") != defString)
+                {
+                    strSQL += "Address = '" + Address + "',";
+                }
+                if ((EMail ?? "") != defString)
+                {
+                    strSQL += "EMail = '" + EMail + "',";
+                }
+                if ((AGE ?? "") != defString)
+                {
+                    strSQLAddField += ",AGE";
+                    strSQLAddValue += ",'" + AGE + "'";
+                }
+                if ((Description ?? "") != defString)
+                {
+                    strSQL += "Description = '" + Description + "',";
+                }
+
+                if (Reviser != defString)
+                    strSQL = strSQL + "Reviser = '" + Reviser + "',";
+
+                if (ReviseDate != defDateTime)
+                    strSQL = strSQL + "ReviseDate = To_Date('" + Strings.Format(ReviseDate, "yyyy/MM/dd H:mm:ss") + "','YYYY/MM/DD HH24:MI:SS'),";
+
+                if (DataStamp != defInteger)
+                    strSQL = strSQL + "DataStamp = DataStamp + 1 ,";
+
+                // 有額外的欄位時再Append進原來的strSQL中
+                if (!string.IsNullOrEmpty(AdditionalXml))
+                {
+                    // 加上additional的field & value
+                    strSQL += SeparateAddXML_Edit(AdditionalXml);
+                }
+
+                // 去除strSQL中最後一個 ","
+                if (Strings.InStr(1, strSQL, ",") != 0)   // 表示有要修改的欄位
+                {
+                    if (Strings.Right(strSQL, 1) == ",")
+                    {
+                        strSQL = Strings.Mid(strSQL, 1, Strings.Len(strSQL) - 1);
+                    }
+
+                    strSQL += " Where SubcontractorNo = '" + SubcontractorNo + "'" + " And ContactorName ='" + ContactorName + "'";
+                    strSQL = strSQL + " And DataStamp = '" + DataStamp + "'";
+
+                    // 有額外的條件式時再Append進原來的strSQL中
+                    if (!string.IsNullOrEmpty(AdditionalXml))
+                    {
+                        // 加上additional的condition
+                        strSQL += SeparateAddXML_Condition(AdditionalXml);
+                    }
+
+                    // 呼叫執行SQL指令
+                    ExecuteSQLNoneQuery(Conversions.ToString(DataBaseType), strConnectionString, ref strSQL, 1, true);
+                }
+
+                // //Return success
+                EditSubcontractorContRet = "success";
+            }
+
+            catch (Exception e1)
+            {
+                EditSubcontractorContRet = "fail";
+                // 發生錯誤時丟回本身的Function Name及系統錯誤訊息
+                throw;
+
+            } // New Exception("kcENT.EditSubcontractorCont: " & e1.Message)
+
+            return EditSubcontractorContRet;
+
+        }
+
+        public string EditSubcontractorContCustom(string SubcontractorNo, string ContactorName, string TelNo = defString, string FaxNo = defString, string Title = defString, string Address = defString, string EMail = defString, string Description = defString, string AdditionalXml = "", int DataStamp = defInteger, string Reviser = defString, DateTime ReviseDate = default(DateTime), string Note21706 = defString)
+        {
+            string EditSubcontractorContRet = default(string);
+            // 此 Function 为用作练习之自定义 Function
+            // 此 Function 將修改一筆資料
+            // 傳入值: 各欄位修改值
+            // 傳回值: success(成功), fail(失敗)
+
+            try
+            {
+                // 先給定strSQL一定有的欄位
+                strSQL = "Update tblENTSubcontractorCont_21706 Set ";
+=======
+                strSQL = "Update A_21703SUB Set ";
+>>>>>>> .merge_file_vx44Nb
+
+                if ((Age ?? "") != defString)
+                {
+                    strSQL += "Age = '" + Age + "',";
+                }
                 if ((TelNo ?? "") != defString)
                 {
                     strSQL += "TelNo = '" + TelNo + "',";
@@ -668,6 +1228,11 @@ namespace MEStc_SXS
                 {
                     strSQL += "Description = '" + Description + "',";
                 }
+                // 以下为自定义字段
+                if ((Note21706 ?? "") != defString)
+                {
+                    strSQL += "Note21706 = '" + Note21706 + "',";
+                }
 
                 if (Reviser != defString)
                     strSQL = strSQL + "Reviser = '" + Reviser + "',";
@@ -732,7 +1297,19 @@ namespace MEStc_SXS
 
             try
             {
-                strSQL = "Delete From tblENTSubcontractorCont " + " Where SubcontractorNo='" + SubcontractorNo + "'";
+<<<<<<< HEAD
+<<<<<<< HEAD
+                strSQL = "Delete From A_21671sub " + " Where SubcontractorNo='" + SubcontractorNo + "'";
+=======
+                strSQL = "Delete From A_21703SUB " + " Where SubcontractorNo='" + SubcontractorNo + "'";
+>>>>>>> d89d49780d597d830e98f207bcaf042ea615b374
+=======
+<<<<<<< .merge_file_APRfoz
+                strSQL = "Delete From tblENTSubcontractorCont_21706 " + " Where SubcontractorNo='" + SubcontractorNo + "'";
+=======
+                strSQL = "Delete From A_21703SUB " + " Where SubcontractorNo='" + SubcontractorNo + "'";
+>>>>>>> .merge_file_vx44Nb
+>>>>>>> 24c623d98bc11e5948b038d0b561b7316dd293ef
 
                 if ((ContactorName ?? "") != defString)
                 {
@@ -779,7 +1356,19 @@ namespace MEStc_SXS
                 // //Create connection
                 cnnTemp = CreateConnection(strConnectionString);
 
-                strSQL = "Select * From tblENTSubcontractorCont Where SubcontractorNo Is Not Null";
+<<<<<<< HEAD
+<<<<<<< HEAD
+                strSQL = "Select * From A_21671sub Where SubcontractorNo Is Not Null";
+=======
+                strSQL = "Select * From A_21703SUB Where SubcontractorNo Is Not Null";
+>>>>>>> d89d49780d597d830e98f207bcaf042ea615b374
+=======
+<<<<<<< .merge_file_APRfoz
+                strSQL = "Select * From tblENTSubcontractorCont_21706 Where SubcontractorNo Is Not Null";
+=======
+                strSQL = "Select * From A_21703SUB Where SubcontractorNo Is Not Null";
+>>>>>>> .merge_file_vx44Nb
+>>>>>>> 24c623d98bc11e5948b038d0b561b7316dd293ef
 
                 // 有傳入SubcontractorNo表示只取該SubcontractorNo之資料
                 if ((SubcontractorNo ?? "") != defString)
@@ -799,10 +1388,29 @@ namespace MEStc_SXS
 
                 // //Select data
                 dsENT = new DataSet();
-                ExecuteSQLQuery_Adapter(strSQL, dsENT, "tblENTSubcontractorCont", cnnTemp);
+<<<<<<< HEAD
+<<<<<<< HEAD
+                ExecuteSQLQuery_Adapter(strSQL, dsENT, "A_21671sub", cnnTemp);
 
                 // //Combine return value
-                LoadSubcontractorContRet = CombineXMLReturnValue("loadSubcontractorcont", "tblENTSubcontractorCont", "DataSet", FormatXMLSchema(dsENT.GetXmlSchema()), dsENT.GetXml(), "");
+                LoadSubcontractorContRet = CombineXMLReturnValue("loadSubcontractorcont", "A_21671sub", "DataSet", FormatXMLSchema(dsENT.GetXmlSchema()), dsENT.GetXml(), "");
+=======
+<<<<<<< .merge_file_APRfoz
+                ExecuteSQLQuery_Adapter(strSQL, dsENT, "tblENTSubcontractorCont_21706", cnnTemp);
+
+                // //Combine return value
+                LoadSubcontractorContRet = CombineXMLReturnValue("loadSubcontractorcont", "tblENTSubcontractorCont_21706", "DataSet", FormatXMLSchema(dsENT.GetXmlSchema()), dsENT.GetXml(), "");
+>>>>>>> 24c623d98bc11e5948b038d0b561b7316dd293ef
+=======
+                ExecuteSQLQuery_Adapter(strSQL, dsENT, "A_21703SUB", cnnTemp);
+
+                // //Combine return value
+                LoadSubcontractorContRet = CombineXMLReturnValue("loadSubcontractorcont", "A_21703SUB", "DataSet", FormatXMLSchema(dsENT.GetXmlSchema()), dsENT.GetXml(), "");
+<<<<<<< HEAD
+>>>>>>> d89d49780d597d830e98f207bcaf042ea615b374
+=======
+>>>>>>> .merge_file_vx44Nb
+>>>>>>> 24c623d98bc11e5948b038d0b561b7316dd293ef
             }
 
             catch (Exception e1)
@@ -841,7 +1449,19 @@ namespace MEStc_SXS
                 // //Create connection
                 cnnTemp = CreateConnection(strConnectionString);
 
-                strSQL = "Select * From tblENTSubcontractorCont Where SubcontractorNo Is Not Null";
+<<<<<<< HEAD
+<<<<<<< HEAD
+                strSQL = "Select * From A_21671sub Where SubcontractorNo Is Not Null";
+=======
+                strSQL = "Select * From A_21703SUB Where SubcontractorNo Is Not Null";
+>>>>>>> d89d49780d597d830e98f207bcaf042ea615b374
+=======
+<<<<<<< .merge_file_APRfoz
+                strSQL = "Select * From tblENTSubcontractorCont_21706 Where SubcontractorNo Is Not Null";
+=======
+                strSQL = "Select * From A_21703SUB Where SubcontractorNo Is Not Null";
+>>>>>>> .merge_file_vx44Nb
+>>>>>>> 24c623d98bc11e5948b038d0b561b7316dd293ef
                 if ((SubcontractorNo ?? "") != defString)
                 {
                     strSQL += " And SubcontractorNo = '" + SubcontractorNo + "'";
@@ -859,7 +1479,19 @@ namespace MEStc_SXS
 
                 // //Select data
                 dsENT = new DataSet();
-                ExecuteSQLQuery_Adapter(strSQL, dsENT, "tblENTSubcontractorCont", cnnTemp);
+<<<<<<< HEAD
+<<<<<<< HEAD
+                ExecuteSQLQuery_Adapter(strSQL, dsENT, "A_21671sub", cnnTemp);
+=======
+                ExecuteSQLQuery_Adapter(strSQL, dsENT, "A_21703SUB", cnnTemp);
+>>>>>>> d89d49780d597d830e98f207bcaf042ea615b374
+=======
+<<<<<<< .merge_file_APRfoz
+                ExecuteSQLQuery_Adapter(strSQL, dsENT, "tblENTSubcontractorCont_21706", cnnTemp);
+=======
+                ExecuteSQLQuery_Adapter(strSQL, dsENT, "A_21703SUB", cnnTemp);
+>>>>>>> .merge_file_vx44Nb
+>>>>>>> 24c623d98bc11e5948b038d0b561b7316dd293ef
 
                 // //Return data
                 ShowSubcontractorContRet = dsENT;
@@ -901,7 +1533,19 @@ namespace MEStc_SXS
                 // //Create connection
                 cnnTemp = CreateConnection(strConnectionString);
 
-                strSQL = "Select * From tblENTSubcontractorCont Where SubcontractorNo Is Not Null";
+<<<<<<< HEAD
+<<<<<<< HEAD
+                strSQL = "Select * From A_21671sub Where SubcontractorNo Is Not Null";
+=======
+                strSQL = "Select * From A_21703SUB Where SubcontractorNo Is Not Null";
+>>>>>>> d89d49780d597d830e98f207bcaf042ea615b374
+=======
+<<<<<<< .merge_file_APRfoz
+                strSQL = "Select * From tblENTSubcontractorCont_21706 Where SubcontractorNo Is Not Null";
+=======
+                strSQL = "Select * From A_21703SUB Where SubcontractorNo Is Not Null";
+>>>>>>> .merge_file_vx44Nb
+>>>>>>> 24c623d98bc11e5948b038d0b561b7316dd293ef
                 if ((SubcontractorNo ?? "") != defString)
                 {
                     strSQL += " And SubcontractorNo = '" + SubcontractorNo + "'";
@@ -919,7 +1563,19 @@ namespace MEStc_SXS
 
                 // //Select data
                 dsENT = new DataSet();
-                ExecuteSQLQuery_Adapter(strSQL, dsENT, "tblENTSubcontractorCont", cnnTemp);
+<<<<<<< HEAD
+<<<<<<< HEAD
+                ExecuteSQLQuery_Adapter(strSQL, dsENT, "A_21671sub", cnnTemp);
+=======
+                ExecuteSQLQuery_Adapter(strSQL, dsENT, "A_21703SUB", cnnTemp);
+>>>>>>> d89d49780d597d830e98f207bcaf042ea615b374
+=======
+<<<<<<< .merge_file_APRfoz
+                ExecuteSQLQuery_Adapter(strSQL, dsENT, "tblENTSubcontractorCont_21706", cnnTemp);
+=======
+                ExecuteSQLQuery_Adapter(strSQL, dsENT, "A_21703SUB", cnnTemp);
+>>>>>>> .merge_file_vx44Nb
+>>>>>>> 24c623d98bc11e5948b038d0b561b7316dd293ef
 
                 // //Return data
                 if (dsENT.Tables[0].Rows.Count > 0)

SRC/wsSXS/wsSXS.csproj

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="14.0" DefaultTargets="Build"
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"
+    Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -63,12 +65,14 @@
       <HintPath>..\MES_S_DLL\MEStc_SXS.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualBasic" />
-    <Reference Include="iMESAppSetting, Version=6.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference
+      Include="iMESAppSetting, Version=6.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\MES_S_DLL\iMESAppSetting.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="iMESComSubroutine, Version=6.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference
+      Include="iMESComSubroutine, Version=6.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\MES_S_DLL\iMESComSubroutine.dll</HintPath>
       <Private>False</Private>
@@ -97,7 +101,8 @@
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+    <Reference
+      Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\MES_S_DLL\Newtonsoft.Json.dll</HintPath>
       <Private>False</Private>
@@ -146,11 +151,22 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
 
+    <Compile Include="wsENT21706\wsENT_21706.cs" />
+
+
+    <Compile Include="wsTEST_21703\wsTEST_21703.cs" />
+
+
     <Compile Include="wsENT_21681\wsENT_21681.cs" />
     <Compile Include="wsTest21681\wsTest21681.cs" />
     <Compile Include="wsTEST_14278\wsTEST_14278.cs" />
 
+
+
+
     <Compile Include="wsWIP\wsWIP.cs" />
+    <Compile Include="wxENT21687\wsENT687.cs" />
+
     <Compile Include="wxENT\wsENT.cs" />
 
     <Compile Include="wxENT_21674\wsENT_21674.cs" />
@@ -159,6 +175,8 @@
     <Compile Include="wxENT_21685\ws_21685.cs" />
     <Compile Include="wsENT\wsENT.cs" />
 
+    <Compile Include="wxENT_21685\ws_21685.cs" />
+    <Compile Include="wsENT\wsENT.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources.resx">
@@ -188,5 +206,6 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-  <Import Project="..\MESWin\shared file\MakeVersion_CS.targets" Condition="exists('..\MESWin\shared file\MakeVersion_CS.targets')" />
+  <Import Project="..\MESWin\shared file\MakeVersion_CS.targets"
+    Condition="exists('..\MESWin\shared file\MakeVersion_CS.targets')" />
 </Project>

SRC/wsSXS/wsWIP/wsWIP.cs

@@ -40,92 +40,92 @@ namespace wsSXS
         }
 
 
-        //public string LoadOPMaterialState(string InXml)
+        public string LoadOPMaterialState(string InXml)
-        //{
+        {
-        //    string LoadOPMaterialStateRet = null;
+            string LoadOPMaterialStateRet = null;
 
-        //    // 先給預設值,以判斷是否有傳入該參數
+            // 先給預設值,以判斷是否有傳入該參數
-        //    string OPNo = defString;
+            string OPNo = defString;
-        //    string MaterialNo = defString;
+            string MaterialNo = defString;
-        //    string MaterialLotNo = defString;
+            string MaterialLotNo = defString;
-        //    string UnitNo = defString;
+            string UnitNo = defString;
-        //    string MaterialType = defString;
+            string MaterialType = defString;
 
-        //    ArriveTime = DateTime.Now;
+            ArriveTime = DateTime.Now;
 
-        //    try
+            try
-        //    {
+            {
-        //        // 讀取InXml字串
+                // 讀取InXml字串
-        //        xmlDoc.LoadXml(InXml);
+                xmlDoc.LoadXml(InXml);
-        //        // 組Identity字串
+                // 組Identity字串
-        //        strIdentity = CombineXMLIdentity(Environment.MachineName, GetXMLCurUserNo(xmlDoc), ArriveTime.ToString(defDateTimeFormat));
+                strIdentity = CombineXMLIdentity(Environment.MachineName, GetXMLCurUserNo(xmlDoc), ArriveTime.ToString(defDateTimeFormat));
 
-        //        // 判斷是否有傳入OPNo,若有,表示要依OPNo查詢
+                // 判斷是否有傳入OPNo,若有,表示要依OPNo查詢
-        //        if (xmlDoc.DocumentElement.GetElementsByTagName("opno").Count > 0)
+                if (xmlDoc.DocumentElement.GetElementsByTagName("opno").Count > 0)
-        //        {
+                {
-        //            if (xmlDoc.GetElementsByTagName("opno").Item(0).SelectNodes("value").Count > 0)
+                    if (xmlDoc.GetElementsByTagName("opno").Item(0).SelectNodes("value").Count > 0)
-        //            {
+                    {
-        //                OPNo = xmlDoc.DocumentElement.GetElementsByTagName("opno").Item(0).SelectNodes("value").Item(0).InnerText;
+                        OPNo = xmlDoc.DocumentElement.GetElementsByTagName("opno").Item(0).SelectNodes("value").Item(0).InnerText;
-        //            }
+                    }
-        //        }
+                }
-        //        // 判斷是否有傳入MaterialNo,若有,表示要依MaterialNo查詢
+                // 判斷是否有傳入MaterialNo,若有,表示要依MaterialNo查詢
-        //        if (xmlDoc.DocumentElement.GetElementsByTagName("materialno").Count > 0)
+                if (xmlDoc.DocumentElement.GetElementsByTagName("materialno").Count > 0)
-        //        {
+                {
-        //            if (xmlDoc.GetElementsByTagName("materialno").Item(0).SelectNodes("value").Count > 0)
+                    if (xmlDoc.GetElementsByTagName("materialno").Item(0).SelectNodes("value").Count > 0)
-        //            {
+                    {
-        //                MaterialNo = xmlDoc.DocumentElement.GetElementsByTagName("materialno").Item(0).SelectNodes("value").Item(0).InnerText;
+                        MaterialNo = xmlDoc.DocumentElement.GetElementsByTagName("materialno").Item(0).SelectNodes("value").Item(0).InnerText;
-        //            }
+                    }
-        //        }
+                }
-        //        // 判斷是否有傳入MaterialLotNo,若有,表示要依MaterialLotNo查詢
+                // 判斷是否有傳入MaterialLotNo,若有,表示要依MaterialLotNo查詢
-        //        if (xmlDoc.DocumentElement.GetElementsByTagName("materiallotno").Count > 0)
+                if (xmlDoc.DocumentElement.GetElementsByTagName("materiallotno").Count > 0)
-        //        {
+                {
-        //            if (xmlDoc.GetElementsByTagName("materiallotno").Item(0).SelectNodes("value").Count > 0)
+                    if (xmlDoc.GetElementsByTagName("materiallotno").Item(0).SelectNodes("value").Count > 0)
-        //            {
+                    {
-        //                MaterialLotNo = xmlDoc.DocumentElement.GetElementsByTagName("materiallotno").Item(0).SelectNodes("value").Item(0).InnerText;
+                        MaterialLotNo = xmlDoc.DocumentElement.GetElementsByTagName("materiallotno").Item(0).SelectNodes("value").Item(0).InnerText;
-        //            }
+                    }
-        //        }
+                }
-        //        if (xmlDoc.DocumentElement.GetElementsByTagName("unitno").Count > 0)
+                if (xmlDoc.DocumentElement.GetElementsByTagName("unitno").Count > 0)
-        //        {
+                {
-        //            if (xmlDoc.GetElementsByTagName("unitno").Item(0).SelectNodes("value").Count > 0)
+                    if (xmlDoc.GetElementsByTagName("unitno").Item(0).SelectNodes("value").Count > 0)
-        //            {
+                    {
-        //                UnitNo = xmlDoc.DocumentElement.GetElementsByTagName("unitno").Item(0).SelectNodes("value").Item(0).InnerText;
+                        UnitNo = xmlDoc.DocumentElement.GetElementsByTagName("unitno").Item(0).SelectNodes("value").Item(0).InnerText;
-        //            }
+                    }
-        //        }
+                }
-        //        if (xmlDoc.DocumentElement.GetElementsByTagName("materialtype").Count > 0)
+                if (xmlDoc.DocumentElement.GetElementsByTagName("materialtype").Count > 0)
-        //        {
+                {
-        //            if (xmlDoc.GetElementsByTagName("materialtype").Item(0).SelectNodes("value").Count > 0)
+                    if (xmlDoc.GetElementsByTagName("materialtype").Item(0).SelectNodes("value").Count > 0)
-        //            {
+                    {
-        //                MaterialType = xmlDoc.DocumentElement.GetElementsByTagName("materialtype").Item(0).SelectNodes("value").Item(0).InnerText;
+                        MaterialType = xmlDoc.DocumentElement.GetElementsByTagName("materialtype").Item(0).SelectNodes("value").Item(0).InnerText;
-        //            }
+                    }
-        //        }
+                }
 
-        //        // 呼叫Dll執行
+                // 呼叫Dll執行
-        //        //strReturnValue = objWIP.LoadOPMaterialState(OPNo, MaterialNo, MaterialLotNo, UnitNo, MaterialType);
+                // strReturnValue = objWIP.LoadOPMaterialState(OPNo, MaterialNo, MaterialLotNo, UnitNo, MaterialType);
-        //        strException = "";
+                strException = "";
-        //        strResult = "success";
+                strResult = "success";
-        //    }
+            }
 
-        //    catch (iMESException.MESException ex)
+            catch (iMESException.MESException ex)
-        //    {
+            {
-        //        strReturnValue = "";
+                strReturnValue = "";
-        //        strException = CombineXMLException(ex.ErrorCode.ToString(), TranslateMsg(ex.Message, GetXMLLanguageMode(xmlDoc), strResourceDir), "Load OP Material State Fail!!", ex.StackTrace);
+                strException = CombineXMLException(ex.ErrorCode.ToString(), TranslateMsg(ex.Message, GetXMLLanguageMode(xmlDoc), strResourceDir), "Load OP Material State Fail!!", ex.StackTrace);
-        //        strResult = "fail";
+                strResult = "fail";
-        //    }
+            }
 
-        //    catch (Exception ex)
+            catch (Exception ex)
-        //    {
+            {
-        //        strReturnValue = "";
+                strReturnValue = "";
-        //        strException = CombineXMLException(defWSErrCode, ex.Message, "Load OP Material State Fail!!", ex.StackTrace);
+                strException = CombineXMLException(defWSErrCode, ex.Message, "Load OP Material State Fail!!", ex.StackTrace);
-        //        strResult = "fail";
+                strResult = "fail";
-        //    }
+            }
 
-        //    finally
+            finally
-        //    {
+            {
-        //        // 將各部份之XML字串組起來並傳出
+                // 將各部份之XML字串組起來並傳出
-        //        LoadOPMaterialStateRet = CombineXMLResponse(strIdentity, strReturnValue, strException, strResult, "");
+                LoadOPMaterialStateRet = CombineXMLResponse(strIdentity, strReturnValue, strException, strResult, "");
-        //    }
+            }
-        //    return LoadOPMaterialStateRet;
+            return LoadOPMaterialStateRet;
 
-        //}
+        }
     }
 }

SRC/wsSXS/wxENT/wsENT.cs

@@ -15,7 +15,7 @@ namespace wsSXS
 {
     public class wsENT
     {
-        private MEStc_SXS .clsENT  objENT = new MEStc_SXS.clsENT();
+        private MEStc_SXS.clsENT objENT = new MEStc_SXS.clsENT();
         private kcSYS.clsSYSUserLog objSYS = new kcSYS.clsSYSUserLog();   // 宣告Sys的物件
         //private kcBasis_UPD.clsBasis_UPD objBasis = new kcBasis_UPD.clsBasis_UPD();    //主檔優化
         //private kcBasis_Query.clsBasis_Query objQuery = new kcBasis_Query.clsBasis_Query();    //主檔優化
@@ -119,7 +119,9 @@ namespace wsSXS
             var SubcontractorNo = default(string);
             string SubcontractorName;
             string Description = defString;
+            string Age = defString;
             string Creator = defString;
+            string AGE = defString;
 
             ArriveTime = DateTime.Now;
 
@@ -171,6 +173,21 @@ namespace wsSXS
                         Description = xmlDoc.DocumentElement.GetElementsByTagName("description").Item(0).SelectNodes("value").Item(0).InnerText;
                     }
                 }
+
+
+                // Age
+
+                if (xmlDoc.DocumentElement.GetElementsByTagName("age").Count > 0)
+                {
+                    if (xmlDoc.GetElementsByTagName("age").Item(0).SelectNodes("value").Count > 0)
+                    {
+
+                        Description = xmlDoc.DocumentElement.GetElementsByTagName("age").Item(0).SelectNodes("value").Item(0).InnerText;
+
+                        Age = xmlDoc.DocumentElement.GetElementsByTagName("age").Item(0).SelectNodes("value").Item(0).InnerText;
+
+                    }
+                }
                 // Creator
                 if (xmlDoc.DocumentElement.GetElementsByTagName("creator").Count > 0)
                 {
@@ -181,7 +198,147 @@ namespace wsSXS
                 }
 
                 // 呼叫Dll執行新增資料
-                objENT.AddSubcontractor(SubcontractorNo, SubcontractorName, Description, Creator);
+
+                objENT.AddSubcontractor(SubcontractorNo, SubcontractorName, Description,AGE, Creator);
+                objENT.AddSubcontractor(SubcontractorNo, SubcontractorName, Description,Age, Creator);
+
+
+                strException = "";
+                strResult = "success";
+
+                objSYS.AddEventLog("wsENT", GetXMLCurUserNo(xmlDoc), "SubcontractorNo", SubcontractorNo, DateTime.Now, "AddSubcontractor");
+            }
+
+            catch (iMESException.MESException ex)
+            {
+                strException = CombineXMLException(Conversions.ToString(ex.ErrorCode), TranslateMsg(ex.Message, GetXMLLanguageMode(xmlDoc), strResourceDir), "Add Subcontractor failed!", ex.StackTrace);
+
+                strResult = "fail";
+
+                objSYS.AddErrorLog_ErrorCode("wsENT", GetXMLCurUserNo(xmlDoc), "SubcontractorNo", SubcontractorNo, DateTime.Now, strException, ComputerName: GetXMLCurComputer(xmlDoc), ErrorCode: Conversions.ToString(ex.ErrorCode));
+            }
+
+            catch (Exception ex)
+            {
+                strException = CombineXMLException(defWSErrCode, ex.Message, "Add Subcontractor failed!", ex.StackTrace);
+
+                strResult = "fail";
+
+                objSYS.AddErrorLog_ErrorCode("wsENT", GetXMLCurUserNo(xmlDoc), "SubcontractorNo", SubcontractorNo, DateTime.Now, strException, ComputerName: GetXMLCurComputer(xmlDoc), ErrorCode: defWSErrCode);
+            }
+
+            finally
+            {
+                // 將各部份之XML字串組起來並傳出
+                AddSubcontractorRet = CombineXMLResponse(strIdentity, "", strException, strResult, "");
+
+            }
+
+            return AddSubcontractorRet;
+
+        }
+
+        [WebMethod(Description = "Add Subcontractor data(Custom)")]
+        public string AddSubcontractorCustom(string InXml)
+        {
+            string AddSubcontractorRet = default(string);
+
+            // 此 Function 为用作练习之自定义 Function
+            // 先給預設值,以判斷是否有傳入該參數
+            var SubcontractorNo = default(string);
+            string SubcontractorName;
+            string Description = defString;
+            string Creator = defString;
+
+            // 以下为自定义字段
+            string NotNull;
+            string Note21706 = defString;
+
+            ArriveTime = DateTime.Now;
+
+            try
+            {
+                // 讀取InXml字串
+                xmlDoc.LoadXml(InXml);
+
+                // 組Identity字串
+                strIdentity = CombineXMLIdentity(Environment.MachineName, GetXMLCurUserNo(xmlDoc), Conversions.ToString(ArriveTime));
+
+                // 開始解譯InXml字串
+                // Subcontractor一定要傳入
+                if (xmlDoc.DocumentElement.GetElementsByTagName("subcontractorno").Count > 0)
+                {
+                    if (xmlDoc.GetElementsByTagName("subcontractorno").Item(0).SelectNodes("value").Count > 0)
+                    {
+                        SubcontractorNo = xmlDoc.DocumentElement.GetElementsByTagName("subcontractorno").Item(0).SelectNodes("value").Item(0).InnerText;
+                    }
+                    else
+                    {
+                        throw new iMESException.MESException("0000-200002", "SubcontractorNo Not Found!");
+                    }
+                }
+                else
+                {
+                    throw new iMESException.MESException("0000-200002", "SubcontractorNo Not Found!");
+                }
+                if (xmlDoc.DocumentElement.GetElementsByTagName("subcontractorname").Count > 0)
+                {
+                    if (xmlDoc.GetElementsByTagName("subcontractorname").Item(0).SelectNodes("value").Count > 0)
+                    {
+                        SubcontractorName = xmlDoc.DocumentElement.GetElementsByTagName("subcontractorname").Item(0).SelectNodes("value").Item(0).InnerText;
+                    }
+                    else
+                    {
+                        throw new iMESException.MESException("0000-200002", "SubcontractorName Not Found!");
+                    }
+                }
+                else
+                {
+                    throw new iMESException.MESException("0000-200002", "SubcontractorName Not Found!");
+                }
+                // 自定义的非空字段 NotNull 一定要傳入
+                if (xmlDoc.DocumentElement.GetElementsByTagName("notnull").Count > 0)
+                {
+                    if (xmlDoc.GetElementsByTagName("notnull").Item(0).SelectNodes("value").Count > 0)
+                    {
+                        NotNull = xmlDoc.DocumentElement.GetElementsByTagName("notnull").Item(0).SelectNodes("value").Item(0).InnerText;
+                    }
+                    else
+                    {
+                        throw new iMESException.MESException("0000-200002", "NotNull Not Found!");
+                    }
+                }
+                else
+                {
+                    throw new iMESException.MESException("0000-200002", "NotNull Not Found!");
+                }
+                // Description
+                if (xmlDoc.DocumentElement.GetElementsByTagName("description").Count > 0)
+                {
+                    if (xmlDoc.GetElementsByTagName("description").Item(0).SelectNodes("value").Count > 0)
+                    {
+                        Description = xmlDoc.DocumentElement.GetElementsByTagName("description").Item(0).SelectNodes("value").Item(0).InnerText;
+                    }
+                }
+                // Creator
+                if (xmlDoc.DocumentElement.GetElementsByTagName("creator").Count > 0)
+                {
+                    if (xmlDoc.GetElementsByTagName("creator").Item(0).SelectNodes("value").Count > 0)
+                    {
+                        Creator = xmlDoc.DocumentElement.GetElementsByTagName("creator").Item(0).SelectNodes("value").Item(0).InnerText;
+                    }
+                }
+                // Note21706
+                if (xmlDoc.DocumentElement.GetElementsByTagName("note21706").Count > 0)
+                {
+                    if (xmlDoc.GetElementsByTagName("note21706").Item(0).SelectNodes("value").Count > 0)
+                    {
+                        Note21706 = xmlDoc.DocumentElement.GetElementsByTagName("note21706").Item(0).SelectNodes("value").Item(0).InnerText;
+                    }
+                }
+
+                // 呼叫Dll執行新增資料
+                objENT.AddSubcontractorCustom(SubcontractorNo, SubcontractorName, NotNull, Description, Creator, defDateTime, Note21706);
 
                 strException = "";
                 strResult = "success";
@@ -229,6 +386,11 @@ namespace wsSXS
             string SubcontractorName = defString;
             string Description = defString;
 
+            string AGE = defString;
+
+            string Age = defString;
+
+
             int DataStamp = defInteger;
             string AdditionalXml = "";
 
@@ -295,6 +457,17 @@ namespace wsSXS
                     }
                 }
 
+
+                // Age
+
+                if (xmlDoc.DocumentElement.GetElementsByTagName("age").Count > 0)
+                {
+                    if (xmlDoc.GetElementsByTagName("age").Item(0).SelectNodes("value").Count > 0)
+                    {
+                        AGE = xmlDoc.DocumentElement.GetElementsByTagName("age").Item(0).SelectNodes("value").Item(0).InnerText;
+                    }
+                }
+
                 // AdditionalXml
                 GetXMLTagValue(ref AdditionalXml, xmlDoc, "additionalxml");
 
@@ -307,7 +480,163 @@ namespace wsSXS
                     if ((SubcontractorName ?? "") != defString | (Description ?? "") != defString)
                     {
                         // 呼叫Dll執行修改
-                        objENT.EditSubcontractor(SubcontractorNo, SubcontractorName, Description, AdditionalXml, DataStamp: DataStamp, Reviser: GetXMLCurUserNo(xmlDoc), ReviseDate: ArriveTime);
+
+                      objENT.EditSubcontractor(SubcontractorNo, SubcontractorName, Description,AGE, AdditionalXml, DataStamp: DataStamp, Reviser: GetXMLCurUserNo(xmlDoc), ReviseDate: ArriveTime);;
+
+                        objENT.EditSubcontractor(SubcontractorNo, SubcontractorName, Description,Age, AdditionalXml, DataStamp: DataStamp, Reviser: GetXMLCurUserNo(xmlDoc), ReviseDate: ArriveTime);
+
+                    }
+                }
+
+                strException = "";
+                strResult = "success";
+
+                objSYS.AddEventLog("wsENT", GetXMLCurUserNo(xmlDoc), "SubcontractorNo", SubcontractorNo, DateTime.Now, "EditSubcontractor");
+            }
+
+            catch (iMESException.MESException ex)
+            {
+                strException = CombineXMLException(Conversions.ToString(ex.ErrorCode), TranslateMsg(ex.Message, GetXMLLanguageMode(xmlDoc), strResourceDir), "Edit Subcontractor failed!", ex.StackTrace);
+
+                strResult = "fail";
+
+                objSYS.AddErrorLog_ErrorCode("wsENT", GetXMLCurUserNo(xmlDoc), "SubcontractorNo", SubcontractorNo, DateTime.Now, strException, ComputerName: GetXMLCurComputer(xmlDoc), ErrorCode: Conversions.ToString(ex.ErrorCode));
+            }
+
+            catch (Exception ex)
+            {
+                strException = CombineXMLException(defWSErrCode, ex.Message, "Edit Subcontractor failed!", ex.StackTrace);
+
+                strResult = "fail";
+
+                objSYS.AddErrorLog_ErrorCode("wsENT", GetXMLCurUserNo(xmlDoc), "SubcontractorNo", SubcontractorNo, DateTime.Now, strException, ComputerName: GetXMLCurComputer(xmlDoc), ErrorCode: defWSErrCode);
+            }
+
+            finally
+            {
+                // 將各部份之XML字串組起來並傳出
+                EditSubcontractorRet = CombineXMLResponse(strIdentity, "", strException, strResult, "");
+            }
+
+            return EditSubcontractorRet;
+
+        }
+
+        [WebMethod(Description = "Edit Specified Subcontractor Data(Custom)")]
+        public string EditSubcontractorCustom(string InXml)
+        {
+            string EditSubcontractorRet = default(string);
+
+            // 此 Function 为用作练习之自定义 Function
+            // 參數先給預設值,以判斷是否有傳入該參數
+            var SubcontractorNo = default(string);
+            int IssueState = defInteger;
+            string SubcontractorName = defString;
+            string Description = defString;
+
+            int DataStamp = defInteger;
+            string AdditionalXml = "";
+
+            // 以下为自定义字段
+            string NotNull = defString;
+            string Note21706 = defString;
+
+            ArriveTime = DateTime.Now;
+
+            try
+            {
+                // 讀取InXml字串
+                xmlDoc.LoadXml(InXml);
+                // 組Identity字串
+                strIdentity = CombineXMLIdentity(Environment.MachineName, GetXMLCurUserNo(xmlDoc), Conversions.ToString(ArriveTime));
+
+                // 開始解譯InXml字串
+                // Subcontractor一定要傳入
+                if (xmlDoc.DocumentElement.GetElementsByTagName("subcontractorno").Count > 0)
+                {
+                    if (xmlDoc.GetElementsByTagName("subcontractorno").Item(0).SelectNodes("value").Count > 0)
+                    {
+                        SubcontractorNo = xmlDoc.DocumentElement.GetElementsByTagName("subcontractorno").Item(0).SelectNodes("value").Item(0).InnerText;
+                    }
+                    else
+                    {
+                        throw new iMESException.MESException("0000-200002", "SubcontractorNo Not Found!");
+                    }
+                }
+                else
+                {
+                    throw new iMESException.MESException("0000-200002", "SubcontractorNo Not Found!");
+                }
+                // IssueState一定要傳入
+                if (xmlDoc.DocumentElement.GetElementsByTagName("issuestate").Count > 0)
+                {
+                    if (xmlDoc.GetElementsByTagName("issuestate").Item(0).SelectNodes("value").Count > 0)
+                    {
+                        IssueState = Conversions.ToInteger(xmlDoc.DocumentElement.GetElementsByTagName("issuestate").Item(0).SelectNodes("value").Item(0).InnerText);
+                    }
+                    else
+                    {
+                        throw new iMESException.MESException("0000-200002", "[%IssueState%]");
+                    }
+                }
+                else
+                {
+                    throw new iMESException.MESException("0000-200002", "[%IssueState%]");
+                }
+                // SubcontractorName不可空白
+                if (xmlDoc.DocumentElement.GetElementsByTagName("subcontractorname").Count > 0)
+                {
+                    if (xmlDoc.GetElementsByTagName("subcontractorname").Item(0).SelectNodes("value").Count > 0)
+                    {
+                        SubcontractorName = xmlDoc.DocumentElement.GetElementsByTagName("subcontractorname").Item(0).SelectNodes("value").Item(0).InnerText;
+                        if (string.IsNullOrEmpty(SubcontractorName))
+                        {
+                            throw new iMESException.MESException("0000-200001", "SubcontractorName is empty!");
+                        }
+                    }
+                }
+                // NotNull不可空白
+                if (xmlDoc.DocumentElement.GetElementsByTagName("notnull").Count > 0)
+                {
+                    if (xmlDoc.GetElementsByTagName("notnull").Item(0).SelectNodes("value").Count > 0)
+                    {
+                        NotNull = xmlDoc.DocumentElement.GetElementsByTagName("notnull").Item(0).SelectNodes("value").Item(0).InnerText;
+                        if (string.IsNullOrEmpty(SubcontractorName))
+                        {
+                            throw new iMESException.MESException("0000-200001", "NotNull is empty!");
+                        }
+                    }
+                }
+                // Description
+                if (xmlDoc.DocumentElement.GetElementsByTagName("description").Count > 0)
+                {
+                    if (xmlDoc.GetElementsByTagName("description").Item(0).SelectNodes("value").Count > 0)
+                    {
+                        Description = xmlDoc.DocumentElement.GetElementsByTagName("description").Item(0).SelectNodes("value").Item(0).InnerText;
+                    }
+                }
+                // Note21706
+                if (xmlDoc.DocumentElement.GetElementsByTagName("Note21706").Count > 0)
+                {
+                    if (xmlDoc.GetElementsByTagName("Note21706").Item(0).SelectNodes("value").Count > 0)
+                    {
+                        Note21706 = xmlDoc.DocumentElement.GetElementsByTagName("Note21706").Item(0).SelectNodes("value").Item(0).InnerText;
+                    }
+                }
+
+                // AdditionalXml
+                GetXMLTagValue(ref AdditionalXml, xmlDoc, "additionalxml");
+
+                // DataStamp
+                GetXMLTagValue(ref DataStamp, xmlDoc, "datastamp", true);
+
+                if (IssueState == 0)     // Unfrozen時才可修改
+                {
+                    // 有修改欄位值時
+                    if ((SubcontractorName ?? "") != defString | (Description ?? "") != defString)
+                    {
+                        // 呼叫Dll執行修改
+                        objENT.EditSubcontractorCustom(SubcontractorNo, SubcontractorName, NotNull, Description, AdditionalXml, DataStamp: DataStamp, Reviser: GetXMLCurUserNo(xmlDoc), ReviseDate: ArriveTime, Note21706);
                     }
                 }
 
@@ -555,10 +884,10 @@ namespace wsSXS
                             string IssueMasterNo;
 
                             // 核准後應將狀態改為Active
-                            tmpSQL = "Update tblENTSubcontractor Set IssueState = 2 Where SubcontractorNo = '" + SubcontractorNo + "'";
+                            tmpSQL = "Update A_21703MAIN Set IssueState = 2 Where SubcontractorNo = '" + SubcontractorNo + "'";
                             ApproveSQL.Add(tmpSQL);
                             // 退回則應將狀態回復到Unfrozen
-                            tmpSQL = "Update tblENTSubcontractor Set IssueState = 0 Where SubcontractorNo = '" + SubcontractorNo + "'";
+                            tmpSQL = "Update A_21703MAIN Set IssueState = 0 Where SubcontractorNo = '" + SubcontractorNo + "'";
                             RejectSQL.Add(tmpSQL);
 
                             // Creator未傳入表示以目前的User
@@ -704,9 +1033,183 @@ namespace wsSXS
             string Title = defString;
             string Address = defString;
             string EMail = defString;
+            string AGE = defString;
+            string Description = defString;
+            string Age = defString;
+            string AdditionalXml = "";
+
+            ArriveTime = DateTime.Now;
+
+            try
+            {
+                // 讀取InXml字串
+                xmlDoc.LoadXml(InXml);
+
+                // 組Identity字串
+                strIdentity = CombineXMLIdentity(Environment.MachineName, GetXMLCurUserNo(xmlDoc), Conversions.ToString(ArriveTime));
+
+                // 開始解譯InXml字串
+                // SubcontractorNo一定要傳入
+                if (xmlDoc.DocumentElement.GetElementsByTagName("subcontractorno").Count > 0)
+                {
+                    if (xmlDoc.GetElementsByTagName("subcontractorno").Item(0).SelectNodes("value").Count > 0)
+                    {
+                        SubcontractorNo = xmlDoc.DocumentElement.GetElementsByTagName("subcontractorno").Item(0).SelectNodes("value").Item(0).InnerText;
+                    }
+                    else
+                    {
+                        throw new iMESException.MESException("0000-200002", "SubcontractorNo Not Found!");
+                    }
+                }
+                else
+                {
+                    throw new iMESException.MESException("0000-200002", "SubcontractorNo Not Found!");
+                }
+                // ContactorName一定要傳入
+                if (xmlDoc.DocumentElement.GetElementsByTagName("contactorname").Count > 0)
+                {
+                    if (xmlDoc.GetElementsByTagName("contactorname").Item(0).SelectNodes("value").Count > 0)
+                    {
+                        ContactorName = xmlDoc.DocumentElement.GetElementsByTagName("contactorname").Item(0).SelectNodes("value").Item(0).InnerText;
+                    }
+                    else
+                    {
+                        throw new iMESException.MESException("0000-200002", "ContactorName Not Found!");
+                    }
+                }
+                else
+                {
+                    throw new iMESException.MESException("0000-200002", "ContactorName Not Found!");
+                }
+                // TelNo
+                if (xmlDoc.DocumentElement.GetElementsByTagName("telno").Count > 0)
+                {
+                    if (xmlDoc.GetElementsByTagName("telno").Item(0).SelectNodes("value").Count > 0)
+                    {
+                        TelNo = xmlDoc.DocumentElement.GetElementsByTagName("telno").Item(0).SelectNodes("value").Item(0).InnerText;
+                    }
+                }
+                // Age
+                if (xmlDoc.DocumentElement.GetElementsByTagName("age").Count > 0)
+                {
+                    if (xmlDoc.GetElementsByTagName("age").Item(0).SelectNodes("value").Count > 0)
+                    {
+                        Age = xmlDoc.DocumentElement.GetElementsByTagName("age").Item(0).SelectNodes("value").Item(0).InnerText;
+                    }
+                }
+                // FaxNo
+                if (xmlDoc.DocumentElement.GetElementsByTagName("faxno").Count > 0)
+                {
+                    if (xmlDoc.GetElementsByTagName("faxno").Item(0).SelectNodes("value").Count > 0)
+                    {
+                        FaxNo = xmlDoc.DocumentElement.GetElementsByTagName("faxno").Item(0).SelectNodes("value").Item(0).InnerText;
+                    }
+                }
+                // Title
+                if (xmlDoc.DocumentElement.GetElementsByTagName("title").Count > 0)
+                {
+                    if (xmlDoc.GetElementsByTagName("title").Item(0).SelectNodes("value").Count > 0)
+                    {
+                        Title = xmlDoc.DocumentElement.GetElementsByTagName("title").Item(0).SelectNodes("value").Item(0).InnerText;
+                    }
+                }
+                // Address
+                if (xmlDoc.DocumentElement.GetElementsByTagName("address").Count > 0)
+                {
+                    if (xmlDoc.GetElementsByTagName("address").Item(0).SelectNodes("value").Count > 0)
+                    {
+                        Address = xmlDoc.DocumentElement.GetElementsByTagName("address").Item(0).SelectNodes("value").Item(0).InnerText;
+                    }
+                }
+                // EMail
+                if (xmlDoc.DocumentElement.GetElementsByTagName("email").Count > 0)
+                {
+                    if (xmlDoc.GetElementsByTagName("email").Item(0).SelectNodes("value").Count > 0)
+                    {
+                        EMail = xmlDoc.DocumentElement.GetElementsByTagName("email").Item(0).SelectNodes("value").Item(0).InnerText;
+                    }
+                }
+                // Description
+                if (xmlDoc.DocumentElement.GetElementsByTagName("description").Count > 0)
+                {
+                    if (xmlDoc.GetElementsByTagName("description").Item(0).SelectNodes("value").Count > 0)
+                    {
+                        Description = xmlDoc.DocumentElement.GetElementsByTagName("description").Item(0).SelectNodes("value").Item(0).InnerText;
+                    }
+                }
+                if (xmlDoc.DocumentElement.GetElementsByTagName("age").Count > 0)
+                {
+                    if (xmlDoc.GetElementsByTagName("age").Item(0).SelectNodes("value").Count > 0)
+                    {
+                        AGE = xmlDoc.DocumentElement.GetElementsByTagName("age").Item(0).SelectNodes("value").Item(0).InnerText;
+                    }
+                }
+                // AdditionalXml
+                GetXMLTagValue(ref AdditionalXml, xmlDoc, "additionalxml");
+
+
+                // 呼叫Dll執行新增資料
+
+                objENT.AddSubcontractorCont(SubcontractorNo, ContactorName, TelNo, FaxNo, Title, Address, EMail,AGE, Description, AdditionalXml, GetXMLCurUserNo(xmlDoc), ArriveTime);
+
+                objENT.AddSubcontractorCont(SubcontractorNo, ContactorName, TelNo, Age,FaxNo, Title, Address, EMail, Description, AdditionalXml, GetXMLCurUserNo(xmlDoc), ArriveTime);
+
+
+                strException = "";
+                strResult = "success";
+
+                objSYS.AddEventLog("wsENT", GetXMLCurUserNo(xmlDoc), "SubcontractorNo", SubcontractorNo, DateTime.Now, "AddSubcontractorContactor ContactorName:" + ContactorName);
+            }
+
+            catch (iMESException.MESException ex)
+            {
+                strException = CombineXMLException(Conversions.ToString(ex.ErrorCode), TranslateMsg(ex.Message, GetXMLLanguageMode(xmlDoc), strResourceDir), "Add SubcontractorContactor Data failed, ContactorName:" + ContactorName, ex.StackTrace);
+
+                strResult = "fail";
+
+                objSYS.AddErrorLog_ErrorCode("wsENT", GetXMLCurUserNo(xmlDoc), "SubcontractorNo", SubcontractorNo, DateTime.Now, strException, ComputerName: GetXMLCurComputer(xmlDoc), ErrorCode: Conversions.ToString(ex.ErrorCode));
+            }
+
+            catch (Exception ex)
+            {
+                strException = CombineXMLException(defWSErrCode, ex.Message, "Add SubcontractorContactor Data failed, ContactorName:" + ContactorName, ex.StackTrace);
+
+                strResult = "fail";
+
+                objSYS.AddErrorLog_ErrorCode("wsENT", GetXMLCurUserNo(xmlDoc), "SubcontractorNo", SubcontractorNo, DateTime.Now, strException, ComputerName: GetXMLCurComputer(xmlDoc), ErrorCode: defWSErrCode);
+            }
+
+            finally
+            {
+                // 將各部份之XML字串組起來並傳出
+                AddSubcontractorContRet = CombineXMLResponse(strIdentity, "", strException, strResult, "");
+
+            }
+
+            return AddSubcontractorContRet;
+
+        }
+
+        [WebMethod(Description = "Add Subcontractor Contactor data(Custom)")]
+        public string AddSubcontractorContCustom(string InXml)
+        {
+            string AddSubcontractorContRet = default(string);
+
+            // 此 Function 为用作练习之自定义 Function
+            // 先給預設值,以判斷是否有傳入該參數
+            var SubcontractorNo = default(string);
+            var ContactorName = default(string);
+            string TelNo = defString;
+            string FaxNo = defString;
+            string Title = defString;
+            string Address = defString;
+            string EMail = defString;
             string Description = defString;
             string AdditionalXml = "";
 
+            // 以下为自定义字段
+            string Note21706 = defString;
+
             ArriveTime = DateTime.Now;
 
             try
@@ -798,12 +1301,20 @@ namespace wsSXS
                         Description = xmlDoc.DocumentElement.GetElementsByTagName("description").Item(0).SelectNodes("value").Item(0).InnerText;
                     }
                 }
+                // Note21706
+                if (xmlDoc.DocumentElement.GetElementsByTagName("note21706").Count > 0)
+                {
+                    if (xmlDoc.GetElementsByTagName("note21706").Item(0).SelectNodes("value").Count > 0)
+                    {
+                        Note21706 = xmlDoc.DocumentElement.GetElementsByTagName("note21706").Item(0).SelectNodes("value").Item(0).InnerText;
+                    }
+                }
                 // AdditionalXml
                 GetXMLTagValue(ref AdditionalXml, xmlDoc, "additionalxml");
 
 
                 // 呼叫Dll執行新增資料
-                objENT.AddSubcontractorCont(SubcontractorNo, ContactorName, TelNo, FaxNo, Title, Address, EMail, Description, AdditionalXml, GetXMLCurUserNo(xmlDoc), ArriveTime);
+                objENT.AddSubcontractorContCustom(SubcontractorNo, ContactorName, TelNo, FaxNo, Title, Address, EMail, Description, AdditionalXml, GetXMLCurUserNo(xmlDoc), ArriveTime, Note21706);
 
                 strException = "";
                 strResult = "success";
@@ -852,7 +1363,9 @@ namespace wsSXS
             string Title = defString;
             string Address = defString;
             string EMail = defString;
+            string AGE = defString;
             string Description = defString;
+            string Age = defString;
 
             int DataStamp = defInteger;
             string AdditionalXml = "";
@@ -907,6 +1420,14 @@ namespace wsSXS
                         TelNo = xmlDoc.DocumentElement.GetElementsByTagName("telno").Item(0).SelectNodes("value").Item(0).InnerText;
                     }
                 }
+                // Age
+                if (xmlDoc.DocumentElement.GetElementsByTagName("age").Count > 0)
+                {
+                    if (xmlDoc.GetElementsByTagName("age").Item(0).SelectNodes("value").Count > 0)
+                    {
+                        Age = xmlDoc.DocumentElement.GetElementsByTagName("age").Item(0).SelectNodes("value").Item(0).InnerText;
+                    }
+                }
                 // FaxNo
                 if (xmlDoc.DocumentElement.GetElementsByTagName("faxno").Count > 0)
                 {
@@ -947,6 +1468,13 @@ namespace wsSXS
                         Description = xmlDoc.DocumentElement.GetElementsByTagName("description").Item(0).SelectNodes("value").Item(0).InnerText;
                     }
                 }
+                if (xmlDoc.DocumentElement.GetElementsByTagName("age").Count > 0)
+                {
+                    if (xmlDoc.GetElementsByTagName("age").Item(0).SelectNodes("value").Count > 0)
+                    {
+                        AGE = xmlDoc.DocumentElement.GetElementsByTagName("age").Item(0).SelectNodes("value").Item(0).InnerText;
+                    }
+                }
 
                 // AdditionalXml
                 GetXMLTagValue(ref AdditionalXml, xmlDoc, "additionalxml");
@@ -959,7 +1487,178 @@ namespace wsSXS
                 if ((TelNo ?? "") != defString | (FaxNo ?? "") != defString | (Title ?? "") != defString | (Address ?? "") != defString | (EMail ?? "") != defString | (Description ?? "") != defString)
                 {
                     // 呼叫Dll執行修改
-                    objENT.EditSubcontractorCont(SubcontractorNo, ContactorName, TelNo, FaxNo, Title, Address, EMail, Description, AdditionalXml, DataStamp: DataStamp, Reviser: GetXMLCurUserNo(xmlDoc), ReviseDate: ArriveTime);
+                    objENT.EditSubcontractorCont(SubcontractorNo, ContactorName, TelNo, FaxNo, Title, Address, EMail, AGE,Description, AdditionalXml, DataStamp: DataStamp, Reviser: GetXMLCurUserNo(xmlDoc), ReviseDate: ArriveTime);
+                }
+                // End If
+
+                strException = "";
+                strResult = "success";
+
+                objSYS.AddEventLog("wsENT", GetXMLCurUserNo(xmlDoc), "SubcontractorNo", SubcontractorNo, DateTime.Now, "EditSubcontractorContactor ContactorName:" + ContactorName);
+            }
+
+            catch (iMESException.MESException ex)
+            {
+                strException = CombineXMLException(Conversions.ToString(ex.ErrorCode), TranslateMsg(ex.Message, GetXMLLanguageMode(xmlDoc), strResourceDir), "Edit SubcontractorContactor Data failed, ContactorName:" + ContactorName, ex.StackTrace);
+
+                strResult = "fail";
+
+                objSYS.AddErrorLog_ErrorCode("wsENT", GetXMLCurUserNo(xmlDoc), "SubcontractorNo", SubcontractorNo, DateTime.Now, strException, ComputerName: GetXMLCurComputer(xmlDoc), ErrorCode: Conversions.ToString(ex.ErrorCode));
+            }
+
+            catch (Exception ex)
+            {
+                strException = CombineXMLException(defWSErrCode, ex.Message, "Edit SubcontractorContactor Data failed, ContactorName:" + ContactorName, ex.StackTrace);
+
+                strResult = "fail";
+
+                objSYS.AddErrorLog_ErrorCode("wsENT", GetXMLCurUserNo(xmlDoc), "SubcontractorNo", SubcontractorNo, DateTime.Now, strException, ComputerName: GetXMLCurComputer(xmlDoc), ErrorCode: defWSErrCode);
+            }
+
+            finally
+            {
+                // 將各部份之XML字串組起來並傳出
+                EditSubcontractorContRet = CombineXMLResponse(strIdentity, "", strException, strResult, "");
+
+            }
+
+            return EditSubcontractorContRet;
+
+        }
+
+        [WebMethod(Description = "Edit Specified Subcontractor Contactor Data(Custom)")]
+        public string EditSubcontractorContCustom(string InXml)
+        {
+            string EditSubcontractorContRet = default(string);
+
+            // 此 Function 为用作练习之自定义 Function
+            // 先給預設值,以判斷是否有傳入該參數
+            var SubcontractorNo = default(string);
+            var ContactorName = default(string);
+            string TelNo = defString;
+            string FaxNo = defString;
+            string Title = defString;
+            string Address = defString;
+            string EMail = defString;
+            string Description = defString;
+
+            int DataStamp = defInteger;
+            string AdditionalXml = "";
+
+            // 以下为自定义字段
+            string Note21706 = defString;
+
+            ArriveTime = DateTime.Now;
+
+            try
+            {
+                // 讀取InXml字串
+                xmlDoc.LoadXml(InXml);
+                // 組Identity字串
+                strIdentity = CombineXMLIdentity(Environment.MachineName, GetXMLCurUserNo(xmlDoc), Conversions.ToString(ArriveTime));
+
+                // 開始解譯InXml字串
+                // SubcontractorNo一定要傳入
+                if (xmlDoc.DocumentElement.GetElementsByTagName("subcontractorno").Count > 0)
+                {
+                    if (xmlDoc.GetElementsByTagName("subcontractorno").Item(0).SelectNodes("value").Count > 0)
+                    {
+                        SubcontractorNo = xmlDoc.DocumentElement.GetElementsByTagName("subcontractorno").Item(0).SelectNodes("value").Item(0).InnerText;
+                    }
+                    else
+                    {
+                        throw new iMESException.MESException("0000-200002", "SubcontractorNo Not Found!");
+                    }
+                }
+                else
+                {
+                    throw new iMESException.MESException("0000-200002", "SubcontractorNo Not Found!");
+                }
+                // ContactorName一定要傳入
+                if (xmlDoc.DocumentElement.GetElementsByTagName("contactorname").Count > 0)
+                {
+                    if (xmlDoc.GetElementsByTagName("contactorname").Item(0).SelectNodes("value").Count > 0)
+                    {
+                        ContactorName = xmlDoc.DocumentElement.GetElementsByTagName("contactorname").Item(0).SelectNodes("value").Item(0).InnerText;
+                    }
+                    else
+                    {
+                        throw new iMESException.MESException("0000-200002", "ContactorName Not Found!");
+                    }
+                }
+                else
+                {
+                    throw new iMESException.MESException("0000-200002", "ContactorName Not Found!");
+                }
+                // TelNo
+                if (xmlDoc.DocumentElement.GetElementsByTagName("telno").Count > 0)
+                {
+                    if (xmlDoc.GetElementsByTagName("telno").Item(0).SelectNodes("value").Count > 0)
+                    {
+                        TelNo = xmlDoc.DocumentElement.GetElementsByTagName("telno").Item(0).SelectNodes("value").Item(0).InnerText;
+                    }
+                }
+                // FaxNo
+                if (xmlDoc.DocumentElement.GetElementsByTagName("faxno").Count > 0)
+                {
+                    if (xmlDoc.GetElementsByTagName("faxno").Item(0).SelectNodes("value").Count > 0)
+                    {
+                        FaxNo = xmlDoc.DocumentElement.GetElementsByTagName("faxno").Item(0).SelectNodes("value").Item(0).InnerText;
+                    }
+                }
+                // Title
+                if (xmlDoc.DocumentElement.GetElementsByTagName("title").Count > 0)
+                {
+                    if (xmlDoc.GetElementsByTagName("title").Item(0).SelectNodes("value").Count > 0)
+                    {
+                        Title = xmlDoc.DocumentElement.GetElementsByTagName("title").Item(0).SelectNodes("value").Item(0).InnerText;
+                    }
+                }
+                // Address
+                if (xmlDoc.DocumentElement.GetElementsByTagName("address").Count > 0)
+                {
+                    if (xmlDoc.GetElementsByTagName("address").Item(0).SelectNodes("value").Count > 0)
+                    {
+                        Address = xmlDoc.DocumentElement.GetElementsByTagName("address").Item(0).SelectNodes("value").Item(0).InnerText;
+                    }
+                }
+                // EMail
+                if (xmlDoc.DocumentElement.GetElementsByTagName("email").Count > 0)
+                {
+                    if (xmlDoc.GetElementsByTagName("email").Item(0).SelectNodes("value").Count > 0)
+                    {
+                        EMail = xmlDoc.DocumentElement.GetElementsByTagName("email").Item(0).SelectNodes("value").Item(0).InnerText;
+                    }
+                }
+                // Description
+                if (xmlDoc.DocumentElement.GetElementsByTagName("description").Count > 0)
+                {
+                    if (xmlDoc.GetElementsByTagName("description").Item(0).SelectNodes("value").Count > 0)
+                    {
+                        Description = xmlDoc.DocumentElement.GetElementsByTagName("description").Item(0).SelectNodes("value").Item(0).InnerText;
+                    }
+                }
+                // Note21706
+                if (xmlDoc.DocumentElement.GetElementsByTagName("note21706").Count > 0)
+                {
+                    if (xmlDoc.GetElementsByTagName("note21706").Item(0).SelectNodes("value").Count > 0)
+                    {
+                        Note21706 = xmlDoc.DocumentElement.GetElementsByTagName("note21706").Item(0).SelectNodes("value").Item(0).InnerText;
+                    }
+                }
+
+                // AdditionalXml
+                GetXMLTagValue(ref AdditionalXml, xmlDoc, "additionalxml");
+
+                // DataStamp
+                GetXMLTagValue(ref DataStamp, xmlDoc, "datastamp", true);
+
+                // If IssueState = 0 Then     'Unfrozen時才可修改
+                // 有修改欄位值時
+                if ((TelNo ?? "") != defString | (FaxNo ?? "") != defString | (Title ?? "") != defString | (Address ?? "") != defString | (EMail ?? "") != defString | (Description ?? "") != defString)
+                {
+                    // 呼叫Dll執行修改
+                    objENT.EditSubcontractorContCustom(SubcontractorNo, ContactorName, TelNo, FaxNo, Title, Address, EMail, Description, AdditionalXml, DataStamp: DataStamp, Reviser: GetXMLCurUserNo(xmlDoc), ReviseDate: ArriveTime, Note21706);
                 }
                 // End If
 
@@ -1079,5 +1778,6 @@ namespace wsSXS
 
 
         #endregion
+
     }
 }