Merge repos.ubtob.net:usoft/mes-client

UAS_RFW/App.config

@@ -72,7 +72,7 @@
   <applicationSettings>
     <UAS_MES_NEW.Properties.Settings>
       <setting name="MES" serializeAs="String">
-        <value>Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=DATACENTER_T;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=erp.rfwdz.com)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</value>
+        <value>Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=DATACENTER_T;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.0.223)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</value>
       </setting>
     </UAS_MES_NEW.Properties.Settings>
   </applicationSettings>

UAS_RFW/DataOperate/DataHelper.cs

@@ -10,7 +10,7 @@ namespace UAS_MES_NEW.DataOperate
     class DataHelper
     {
         //系统默认的的连接字符串
-        private string ConnectionStrings = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=DATACENTER_T;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=erp.rfwdz.com)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
+        private string ConnectionStrings = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=DATACENTER_T;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.0.223)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
 
         //private string ConnectionStrings = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=MES_T;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=113.108.109.210)(PORT=1522)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
         //用户选择的数据库的连接字符串

UAS_RFW/FunctionCode/Packing/Packing_PackageCollection.Designer.cs

@@ -60,6 +60,8 @@
             this.pd_outqty = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pr_detail = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pd_description = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pr_speccs = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_custprodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pd_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.codenum = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.onlynumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -270,6 +272,8 @@
             this.pd_outqty,
             this.pr_detail,
             this.pd_description,
+            this.pr_speccs,
+            this.pd_custprodcode,
             this.pd_id,
             this.codenum,
             this.onlynumber,
@@ -420,6 +424,22 @@
             this.pd_description.Name = "pd_description";
             this.pd_description.Width = 150;
             // 
+            // pr_speccs
+            // 
+            this.pr_speccs.DataPropertyName = "pr_speccs";
+            this.pr_speccs.HeaderText = "封装";
+            this.pr_speccs.MinimumWidth = 8;
+            this.pr_speccs.Name = "pr_speccs";
+            this.pr_speccs.Width = 150;
+            // 
+            // pd_custprodcode
+            // 
+            this.pd_custprodcode.DataPropertyName = "pd_custprodcode";
+            this.pd_custprodcode.HeaderText = "客户料号";
+            this.pd_custprodcode.MinimumWidth = 8;
+            this.pd_custprodcode.Name = "pd_custprodcode";
+            this.pd_custprodcode.Width = 150;
+            // 
             // pd_id
             // 
             this.pd_id.DataPropertyName = "pd_id";
@@ -543,6 +563,8 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn pd_outqty;
         private System.Windows.Forms.DataGridViewTextBoxColumn pr_detail;
         private System.Windows.Forms.DataGridViewTextBoxColumn pd_description;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pr_speccs;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pd_custprodcode;
         private System.Windows.Forms.DataGridViewTextBoxColumn pd_id;
         private System.Windows.Forms.DataGridViewTextBoxColumn codenum;
         private System.Windows.Forms.DataGridViewTextBoxColumn onlynumber;

UAS_RFW/FunctionCode/Packing/Packing_PackageCollection.cs

@@ -102,9 +102,9 @@ namespace UAS_MES_NEW.Packing
         private void LoadGridData()
         {
             //加载Grid数据
-            dt = (DataTable)dh.ExecuteSql(" select max(pd_id)pd_id,pd_pocode,pd_ordercode,pd_prodcode,pr_brand,pr_orispeccode,sum(pd_outqty)pd_outqty,pr_detail,pd_description,'' onlynumber ,'' datecode,'' youxiaoqi  " +
+            dt = (DataTable)dh.ExecuteSql(" select max(pd_id)pd_id,pd_pocode,pd_ordercode,pd_prodcode,pr_brand,pr_orispeccode,sum(pd_outqty)pd_outqty,pr_detail,pd_description,'' onlynumber ,'' datecode,'' youxiaoqi, pr_speccs, pd_custprodcode " +
                 " from prodinout left join prodiodetail on pi_inoutno = pd_inoutno left join product on pd_prodcode = pr_code where pd_inoutno = '" + pi_inoutno.Text + "' group by pd_pocode," +
-                " pd_ordercode, pd_prodcode, pr_brand, pr_orispeccode, pr_detail,pd_description order by pd_id asc ", "select");
+                " pd_ordercode, pd_prodcode, pr_brand, pr_orispeccode, pr_detail,pd_description, pr_speccs, pd_custprodcode order by pd_id asc ", "select");
             BaseUtil.FillDgvWithDataTable(PackageDetail, dt);
  
         }

UAS_RFW/FunctionCode/Packing/Packing_PackageCollection.resx

@@ -126,6 +126,12 @@
   <metadata name="pd_description.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="pr_speccs.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="pd_custprodcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="codenum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

UAS_RFW/Login.cs

@@ -94,7 +94,7 @@ namespace UAS_MES_NEW
             //设置选中数据库的链接
             string DBUser = DB.SelectedValue.ToString().Split('#')[0];
             string Address = DB.SelectedValue.ToString().Split('#')[1];
-            DataHelper.DBConnectionString = "Password=select!#%*(;User ID=" + DBUser + ";Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=erp.rfwdz.com)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
+            DataHelper.DBConnectionString = "Password=select!#%*(;User ID=" + DBUser + ";Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.0.223)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
             //DataHelper.DBConnectionString = "Password=select!#%*(;User ID=" + DBUser + ";Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=usoft.7766.org)(PORT=11659)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
             SystemInf.CurrentDB = DBUser;   
             //设置屏幕的宽高信息

UAS_RFW/Properties/Settings.settings

@@ -27,7 +27,7 @@
       <Value Profile="(Default)">ftp://10.8.0.82|vsftpd|vsftpd</Value>
     </Setting>
     <Setting Name="MES" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=DATACENTER_T;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=erp.rfwdz.com)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</Value>
+      <Value Profile="(Default)">Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=DATACENTER_T;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.0.223)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</Value>
     </Setting>
   </Settings>
 </SettingsFile>

UAS_RFW/Properties/Settings1.Designer.cs

@@ -12,7 +12,7 @@ namespace UAS_MES_NEW.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.8.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -122,8 +122,8 @@ namespace UAS_MES_NEW.Properties {
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=DATACENTER_T;Pool" +
-            "ing=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=er" +
-            "p.rfwdz.com)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));")]
+            "ing=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=19" +
+            "2.168.0.223)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));")]
         public string MES {
             get {
                 return ((string)(this["MES"]));