update

UAS-MES/FunctionCode/Make/Make_TestCollection.Designer.cs

@@ -219,19 +219,18 @@
             // 
             this.columnHeader4.Text = "不良代码组";
             this.columnHeader4.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.columnHeader4.Width = 115;
+            this.columnHeader4.Width = 0;
             // 
             // columnHeader1
             // 
             this.columnHeader1.Text = "不良代码";
             this.columnHeader1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.columnHeader1.Width = 90;
+            this.columnHeader1.Width = 143;
             // 
             // columnHeader2
             // 
-            this.columnHeader2.Text = "备注";
-            this.columnHeader2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.columnHeader2.Width = 75;
+            this.columnHeader2.Text = "不良名称";
+            this.columnHeader2.Width = 161;
             // 
             // label4
             // 
@@ -304,9 +303,8 @@
             // 
             // columnHeader8
             // 
-            this.columnHeader8.Text = "备注";
-            this.columnHeader8.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.columnHeader8.Width = 75;
+            this.columnHeader8.Text = "不良名称";
+            this.columnHeader8.Width = 99;
             // 
             // AutoBadCode
             // 
@@ -797,14 +795,12 @@
         private CustomControl.ButtonUtil.ArrowLeftButton WaitReject;
         private CustomControl.ButtonUtil.ArrowRightButton ChooseedReject;
         private System.Windows.Forms.ColumnHeader columnHeader1;
-        private System.Windows.Forms.ColumnHeader columnHeader2;
         private System.Windows.Forms.Label label6;
         private CustomControl.ButtonUtil.NormalButton CleanInfo;
         private System.Windows.Forms.ColumnHeader columnHeader5;
         private System.Windows.Forms.ListView ChoosedRejectList;
         private System.Windows.Forms.ColumnHeader columnHeader6;
         private System.Windows.Forms.ColumnHeader columnHeader7;
-        private System.Windows.Forms.ColumnHeader columnHeader8;
         private CustomControl.RichText.RichTextAutoBottom OperateResult;
         private CustomControl.ValueLabel.ValueLabel ma_prodcode;
         private CustomControl.ValueLabel.ValueLabel mcd_inqty;
@@ -826,5 +822,7 @@
         private CustomControl.ButtonUtil.NormalButton SendCheck;
         private System.Windows.Forms.Label ob_checkno;
         private System.Windows.Forms.Label pr_detail_label;
+        private System.Windows.Forms.ColumnHeader columnHeader2;
+        private System.Windows.Forms.ColumnHeader columnHeader8;
     }
 }

UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -227,7 +227,7 @@ namespace UAS_MES.Make
         {
             object bg_code = bc_groupcode.SelectedValue;
             sql.Clear();
-            sql.Append("select bg_code||':'||bg_name bg_code,bc_code,bc_note ");
+            sql.Append("select bg_code||':'||bg_name bg_code,bc_code,bc_name ");
             sql.Append("from badcode left join badgroup on bc_groupcode=bg_code  where ");
             sql.Append("bc_groupcode='" + (bg_code != null ? bg_code.ToString() : "") + "' and bg_code is not null");
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
@@ -403,7 +403,7 @@ namespace UAS_MES.Make
                             //获取所有的不良代码
                             bccode[i] = ChoosedRejectList.Items[i].SubItems[2].Text;
                             //获取所有的不良备注
-                            bcremark[i] = ChoosedRejectList.Items[i].SubItems[3].Text;
+                            bcremark[i] = bc_remark.Text;
                         }
                     }
                 }

UAS-MES/FunctionCode/OQC/OQC_BatchResultJudge.cs

@@ -140,10 +140,11 @@ namespace UAS_MES.OQC
                 if (ReworkRequire.Checked)
                 {
                     string re_id = dh.GetSEQ("rework_seq");
+                    string re_code = dh.GetSerialNumberByCaller("Rework");
                     sql.Clear();
                     sql.Append("insert into rework (re_id ,re_code,re_indate,re_inman,re_status,re_statuscode,");
                     sql.Append("re_rwstatus,re_prodcode,re_qty, re_description,re_source,re_sourcemo,re_checkno) ");
-                    sql.Append(" select " + re_id + ",'" + dh.GetSerialNumberByCaller("Rework") + "',sysdate,'" + User.UserName + "','在录入','ENTERING','未返工',");
+                    sql.Append(" select " + re_id + ",'" + re_code + "',sysdate,'" + User.UserName + "','在录入','ENTERING','未返工',");
                     sql.Append("OQCBatch.ob_prodcode,OQCBatch.ob_batchqty,OQCBatch.ob_description,'批判退发起返工',OQCBatch.ob_makecode,OQCBatch.ob_checkno from oqcbatch where ob_checkno='" + ob_checkno.Text + "'");
                     dh.ExecuteSql(sql.GetString(), "insert");
                     sql.Clear();
@@ -151,6 +152,8 @@ namespace UAS_MES.OQC
                     sql.Append("select ReworkDetail_seq.nextval," + re_id + ",rownum,OQCBatchDetail.obd_sncode,ob_prodcode,ob_checkno,sysdate,'" + User.UserName + "','未返工' ");
                     sql.Append("from OQCBatch  left join OQCBatchDetail on obd_obid=ob_id where ob_checkno='" + ob_checkno.Text + "'");
                     dh.ExecuteSql(sql.GetString(), "insert");
+                    //将工单信息写回到OQC主表
+                    dh.ExecuteSql("update oqcbatch set ob_rmcode='"+re_code+"' where ob_checkno='"+ob_checkno.Text+"'", "update");
                 }
                 DoLog("判退通过", "批次判退成功", "通过");
                 OperateResult.AppendText(">>判退批成功\n", Color.Green);

UAS-MES/FunctionCode/OQC/OQC_SamplingDataCollection.cs

@@ -203,7 +203,6 @@ namespace UAS_MES.OQC
                         //将布尔值转换为0,-1
                         if (TempForCheckType.Rows[i]["ois_id"].ToString() != "" && TempForCheckType.Rows[i]["ois_id"].ToString() != "0")
                         {
-
                             ois_ifng_update.Add(TempForCheckType.Rows[i]["oi_ng"].ToString());
                             ois_defectlevel_update.Add(TempForCheckType.Rows[i]["oi_leveldefect"].ToString());
                             ois_remark_update.Add(TempForCheckType.Rows[i]["ois_remark"].ToString());
@@ -505,7 +504,6 @@ namespace UAS_MES.OQC
                 }
                 catch (Exception) { }
                 cl.Rows.Add(headerRow);
-
                 for (int i = 0; i < dt.Rows.Count; i++)
                 {
                     DataGridViewRow dataRow = new DataGridViewRow();

UAS-MES/FunctionCode/Query/Query_ProductTraceBack.Designer.cs

@@ -68,7 +68,7 @@
             this.ma_salecode.AllPower = null;
             this.ma_salecode.BackColor = System.Drawing.Color.White;
             this.ma_salecode.ID = null;
-            this.ma_salecode.Location = new System.Drawing.Point(322, 24);
+            this.ma_salecode.Location = new System.Drawing.Point(322, 23);
             this.ma_salecode.Name = "ma_salecode";
             this.ma_salecode.Power = null;
             this.ma_salecode.Size = new System.Drawing.Size(128, 21);
@@ -380,7 +380,7 @@
             this.ma_code.DBTitle = null;
             this.ma_code.FormName = null;
             this.ma_code.Location = new System.Drawing.Point(84, 24);
-            this.ma_code.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(2);
             this.ma_code.Name = "ma_code";
             this.ma_code.Power = null;
             this.ma_code.SelectField = null;

UAS-MES/FunctionCode/Query/Query_ProductTraceBack.cs

@@ -35,7 +35,7 @@ namespace UAS_MES.Query
         }
 
         private void 产品制程追溯_SizeChanged(object sender, EventArgs e)
-        {
+        { 
             asc.controlAutoSize(this);
         }
 

UAS-MES/UAS-MES.csproj

@@ -12,7 +12,7 @@
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <IsWebBootstrapper>true</IsWebBootstrapper>
     <TargetFrameworkProfile />
     <SccProjectName>
     </SccProjectName>
@@ -22,9 +22,9 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
-    <PublishUrl>F:\MESRelease\</PublishUrl>
+    <PublishUrl>E:\s_user_site\</PublishUrl>
     <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
+    <InstallFrom>Web</InstallFrom>
     <UpdateEnabled>true</UpdateEnabled>
     <UpdateMode>Foreground</UpdateMode>
     <UpdateInterval>7</UpdateInterval>
@@ -32,15 +32,17 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>true</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
+    <InstallUrl>http://172.16.11.99/</InstallUrl>
     <UpdateUrl>http://172.16.11.99/</UpdateUrl>
     <TargetCulture>zh</TargetCulture>
     <ProductName>优软MES系统</ProductName>
     <PublisherName>深圳市优软科技有限公司</PublisherName>
     <SuiteName>优软MES系统</SuiteName>
-    <MinimumRequiredVersion>1.0.0.201</MinimumRequiredVersion>
+    <MinimumRequiredVersion>1.0.0.340</MinimumRequiredVersion>
+    <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
-    <ApplicationRevision>284</ApplicationRevision>
+    <ApplicationRevision>342</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>true</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -79,7 +81,7 @@
     <GenerateManifests>true</GenerateManifests>
   </PropertyGroup>
   <PropertyGroup>
-    <SignManifests>false</SignManifests>
+    <SignManifests>true</SignManifests>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject>UAS_MES.Program</StartupObject>