Merge branch 'master' of ssh://10.10.100.21/source/mes-client

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

@@ -90,6 +90,7 @@
             this.mb_bgcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.mb_badcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.AddBad = new System.Windows.Forms.DataGridViewImageColumn();
+            this.cm_makecode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pr_detail_ = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.cm_soncode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.cm_barcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -99,7 +100,6 @@
             this.cm_materialtype = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.cm_maprodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.cm_sncode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.cm_makecode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             ((System.ComponentModel.ISupportInitialize)(this.LabelDataGridView)).BeginInit();
             this.SuspendLayout();
             // 
@@ -184,6 +184,7 @@
             this.mb_bgcode,
             this.mb_badcode,
             this.AddBad,
+            this.cm_makecode,
             this.pr_detail_,
             this.cm_soncode,
             this.cm_barcode,
@@ -192,8 +193,7 @@
             this.cm_maid,
             this.cm_materialtype,
             this.cm_maprodcode,
-            this.cm_sncode,
-            this.cm_makecode});
+            this.cm_sncode});
             this.LabelDataGridView.Location = new System.Drawing.Point(12, 102);
             this.LabelDataGridView.Name = "LabelDataGridView";
             this.LabelDataGridView.RowHeadersVisible = false;
@@ -732,6 +732,12 @@
             this.AddBad.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
             this.AddBad.Width = 20;
             // 
+            // cm_makecode
+            // 
+            this.cm_makecode.DataPropertyName = "cm_makecode";
+            this.cm_makecode.HeaderText = "上料工单号";
+            this.cm_makecode.Name = "cm_makecode";
+            // 
             // pr_detail_
             // 
             this.pr_detail_.DataPropertyName = "pr_detail";
@@ -795,13 +801,6 @@
             this.cm_sncode.Name = "cm_sncode";
             this.cm_sncode.Visible = false;
             // 
-            // cm_makecode
-            // 
-            this.cm_makecode.DataPropertyName = "cm_makecode";
-            this.cm_makecode.HeaderText = "";
-            this.cm_makecode.Name = "cm_makecode";
-            this.cm_makecode.Visible = false;
-            // 
             // Make_Decompose
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -902,6 +901,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn mb_bgcode;
         private System.Windows.Forms.DataGridViewTextBoxColumn mb_badcode;
         private System.Windows.Forms.DataGridViewImageColumn AddBad;
+        private System.Windows.Forms.DataGridViewTextBoxColumn cm_makecode;
         private System.Windows.Forms.DataGridViewTextBoxColumn pr_detail_;
         private System.Windows.Forms.DataGridViewTextBoxColumn cm_soncode;
         private System.Windows.Forms.DataGridViewTextBoxColumn cm_barcode;
@@ -911,6 +911,5 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn cm_materialtype;
         private System.Windows.Forms.DataGridViewTextBoxColumn cm_maprodcode;
         private System.Windows.Forms.DataGridViewTextBoxColumn cm_sncode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn cm_makecode;
     }
 }

UAS-MES/FunctionCode/Make/Make_Decompose.resx

@@ -159,6 +159,9 @@
   <metadata name="AddBad.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="cm_makecode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="pr_detail_.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -186,9 +189,6 @@
   <metadata name="cm_sncode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="cm_makecode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="Decompose.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.cs

@@ -246,7 +246,7 @@ namespace UAS_MES.Make
                                 }
                             }
                             //开始录入SN
-                            if ((!ChangeResult.Checked && (!dh.CheckExist("makeserial", "ms_sncode='" + code.Text + "' and ms_id <>'" + oMsid + "'") && !onlyPass || onlyPass && TSN == code.Text)) || (ChangeResult.Checked && !dh.CheckExist("makeserial", "ms_sncode='" + code.Text + "' and ms_id <>'"+oMsid+"'")))
+                            if ((!ChangeResult.Checked && (!dh.CheckExist("makeserial", "ms_sncode='" + code.Text + "' and ms_id <>'" + oMsid + "' and nvl(ms_nextmacode,' ')<>' '") && !onlyPass || onlyPass && TSN == code.Text)) || (ChangeResult.Checked && !dh.CheckExist("makeserial", "ms_sncode='" + code.Text + "' and ms_id <>'"+oMsid+ "' and nvl(ms_nextmacode,' ')<>' '")))
                             {
                                 onlyPass = false;
                                 //SN校验成功，合法,记录下SN

UAS-MES/FunctionCode/Make/Make_SeqTransform.cs

@@ -208,7 +208,7 @@ namespace UAS_MES.Make
                                     return;
                             }
                             //防呆验证完成
-                            if ((!ChangeResult.Checked && (!dh.CheckExist("makeserial", "ms_sncode='" + sncode.Text + "' and ms_id <>'" + oMsId + "'") && !onlyPass || onlyPass && bsncode == sncode.Text)) || (ChangeResult.Checked && !dh.CheckExist("makeserial", "ms_sncode='" + sncode.Text + "' and ms_id <>'" + oMsId + "'")))
+                            if ((!ChangeResult.Checked && (!dh.CheckExist("makeserial", "ms_sncode='" + sncode.Text + "' and ms_id <>'" + oMsId + "' and nvl(ms_nextmacode,' ')<>' '") && !onlyPass || onlyPass && bsncode == sncode.Text)) || (ChangeResult.Checked && !dh.CheckExist("makeserial", "ms_sncode='" + sncode.Text + "' and ms_id <>'" + oMsId + "' and nvl(ms_nextmacode,' ')<>' '")))
                             {
                                 if (!ChangeResult.Checked && !onlyPass || bsncode != sncode.Text)
                                 {