Merge remote-tracking branch 'refs/remotes/origin/master'

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

@@ -313,13 +313,13 @@
             this.sn_code.ID = null;
             this.sn_code.Location = new System.Drawing.Point(76, 545);
             this.sn_code.Name = "sn_code";
-            this.sn_code.Power = "ifwrite";
+            this.sn_code.Power = "ifread";
             this.sn_code.Size = new System.Drawing.Size(196, 21);
             this.sn_code.Str = null;
             this.sn_code.Str1 = null;
             this.sn_code.Str2 = null;
             this.sn_code.TabIndex = 135;
-            this.sn_code.Tag = "IfWrite";
+            this.sn_code.Tag = "ifread";
             this.sn_code.KeyDown += new System.Windows.Forms.KeyEventHandler(this.barcode_KeyDown);
             // 
             // PackageDetail

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

@@ -294,7 +294,7 @@
             this.outboxcode.Location = new System.Drawing.Point(1061, 324);
             this.outboxcode.Margin = new System.Windows.Forms.Padding(4);
             this.outboxcode.Name = "outboxcode";
-            this.outboxcode.Power = "ifwrite";
+            this.outboxcode.Power = "ifread";
             this.outboxcode.Size = new System.Drawing.Size(207, 25);
             this.outboxcode.Str = null;
             this.outboxcode.Str1 = null;
@@ -311,7 +311,7 @@
             this.pa_outboxcode.Location = new System.Drawing.Point(113, 36);
             this.pa_outboxcode.Margin = new System.Windows.Forms.Padding(4);
             this.pa_outboxcode.Name = "pa_outboxcode";
-            this.pa_outboxcode.Power = "ifwrite";
+            this.pa_outboxcode.Power = "ifread";
             this.pa_outboxcode.Size = new System.Drawing.Size(141, 25);
             this.pa_outboxcode.Str = null;
             this.pa_outboxcode.Str1 = null;
@@ -370,7 +370,7 @@
             this.NewPalletCode.MoveImage = ((System.Drawing.Image)(resources.GetObject("NewPalletCode.MoveImage")));
             this.NewPalletCode.Name = "NewPalletCode";
             this.NewPalletCode.NormalImage = ((System.Drawing.Image)(resources.GetObject("NewPalletCode.NormalImage")));
-            this.NewPalletCode.Power = "ifwrite";
+            this.NewPalletCode.Power = "ifread";
             this.NewPalletCode.Size = new System.Drawing.Size(80, 30);
             this.NewPalletCode.TabIndex = 159;
             this.NewPalletCode.Text = "新增栈板";

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

@@ -117,7 +117,7 @@
             this.weight.Location = new System.Drawing.Point(244, 191);
             this.weight.Margin = new System.Windows.Forms.Padding(4);
             this.weight.Name = "weight";
-            this.weight.Power = "ifwrite";
+            this.weight.Power = "ifread";
             this.weight.Size = new System.Drawing.Size(195, 25);
             this.weight.Str = null;
             this.weight.Str1 = null;
@@ -133,7 +133,7 @@
             this.pa_outboxcode.Location = new System.Drawing.Point(244, 121);
             this.pa_outboxcode.Margin = new System.Windows.Forms.Padding(4);
             this.pa_outboxcode.Name = "pa_outboxcode";
-            this.pa_outboxcode.Power = "ifwrite";
+            this.pa_outboxcode.Power = "ifread";
             this.pa_outboxcode.Size = new System.Drawing.Size(195, 25);
             this.pa_outboxcode.Str = null;
             this.pa_outboxcode.Str1 = null;

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

@@ -527,7 +527,7 @@
             this.NewRepairInf.Power = null;
             this.NewRepairInf.Size = new System.Drawing.Size(115, 30);
             this.NewRepairInf.TabIndex = 112;
-            this.NewRepairInf.Tag = "IfWrite";
+            this.NewRepairInf.Tag = "IfRead";
             this.NewRepairInf.Text = "新增维修信息";
             this.NewRepairInf.UseVisualStyleBackColor = true;
             this.NewRepairInf.Click += new System.EventHandler(this.NewRepairInf_Click);
@@ -547,7 +547,7 @@
             this.SaveRepairInf.Power = null;
             this.SaveRepairInf.Size = new System.Drawing.Size(115, 30);
             this.SaveRepairInf.TabIndex = 111;
-            this.SaveRepairInf.Tag = "IfWrite";
+            this.SaveRepairInf.Tag = "IfRead";
             this.SaveRepairInf.Text = "保存维修信息";
             this.SaveRepairInf.UseVisualStyleBackColor = true;
             this.SaveRepairInf.Visible = false;
@@ -568,7 +568,7 @@
             this.DeleteRepairInf.Power = null;
             this.DeleteRepairInf.Size = new System.Drawing.Size(76, 30);
             this.DeleteRepairInf.TabIndex = 110;
-            this.DeleteRepairInf.Tag = "IfWrite";
+            this.DeleteRepairInf.Tag = "IfRead";
             this.DeleteRepairInf.Text = "删除";
             this.DeleteRepairInf.UseVisualStyleBackColor = true;
             this.DeleteRepairInf.Click += new System.EventHandler(this.DeleteRepairInf_Click);
@@ -795,7 +795,7 @@
             this.Clean.Power = null;
             this.Clean.Size = new System.Drawing.Size(80, 30);
             this.Clean.TabIndex = 81;
-            this.Clean.Tag = "IfWrite";
+            this.Clean.Tag = "IfRead";
             this.Clean.Text = "清除";
             this.Clean.UseVisualStyleBackColor = true;
             this.Clean.Click += new System.EventHandler(this.Clean_Click);
@@ -858,7 +858,7 @@
             this.NewBadCode.Power = null;
             this.NewBadCode.Size = new System.Drawing.Size(115, 30);
             this.NewBadCode.TabIndex = 60;
-            this.NewBadCode.Tag = "IfWrite";
+            this.NewBadCode.Tag = "IfRead";
             this.NewBadCode.Text = "新增不良代码";
             this.NewBadCode.UseVisualStyleBackColor = true;
             this.NewBadCode.Click += new System.EventHandler(this.NewBadCode_Click);
@@ -879,7 +879,7 @@
             this.SaveBadLocation.Power = null;
             this.SaveBadLocation.Size = new System.Drawing.Size(61, 30);
             this.SaveBadLocation.TabIndex = 59;
-            this.SaveBadLocation.Tag = "IfWrite";
+            this.SaveBadLocation.Tag = "IfRead";
             this.SaveBadLocation.Text = "保存";
             this.SaveBadLocation.UseVisualStyleBackColor = true;
             this.SaveBadLocation.Click += new System.EventHandler(this.SaveBadLocation_Click);
@@ -900,7 +900,7 @@
             this.Scrap.Power = null;
             this.Scrap.Size = new System.Drawing.Size(91, 30);
             this.Scrap.TabIndex = 56;
-            this.Scrap.Tag = "IfWrite";
+            this.Scrap.Tag = "IfRead";
             this.Scrap.Text = "报废";
             this.Scrap.UseVisualStyleBackColor = true;
             this.Scrap.Click += new System.EventHandler(this.Scrap_Click);
@@ -921,7 +921,7 @@
             this.RepairComplete.Power = null;
             this.RepairComplete.Size = new System.Drawing.Size(91, 30);
             this.RepairComplete.TabIndex = 55;
-            this.RepairComplete.Tag = "IfWrite";
+            this.RepairComplete.Tag = "IfRead";
             this.RepairComplete.Text = "完成维修";
             this.RepairComplete.UseVisualStyleBackColor = true;
             this.RepairComplete.Click += new System.EventHandler(this.RepairComplete_Click);

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

@@ -357,13 +357,13 @@
             this.sncode.Location = new System.Drawing.Point(145, 644);
             this.sncode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.sncode.Name = "sncode";
-            this.sncode.Power = "ifwrite";
+            this.sncode.Power = "ifread";
             this.sncode.Size = new System.Drawing.Size(238, 34);
             this.sncode.Str = null;
             this.sncode.Str1 = null;
             this.sncode.Str2 = null;
             this.sncode.TabIndex = 77;
-            this.sncode.Tag = "IfWrite";
+            this.sncode.Tag = "IfRead";
             this.sncode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.sncode_KeyDown);
             // 
             // label2

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

@@ -292,13 +292,13 @@
             this.sn_code.Location = new System.Drawing.Point(101, 683);
             this.sn_code.Margin = new System.Windows.Forms.Padding(4);
             this.sn_code.Name = "sn_code";
-            this.sn_code.Power = "ifwrite";
+            this.sn_code.Power = "ifread";
             this.sn_code.Size = new System.Drawing.Size(260, 25);
             this.sn_code.Str = null;
             this.sn_code.Str1 = null;
             this.sn_code.Str2 = null;
             this.sn_code.TabIndex = 135;
-            this.sn_code.Tag = "IfWrite";
+            this.sn_code.Tag = "IfRead";
             this.sn_code.KeyDown += new System.Windows.Forms.KeyEventHandler(this.barcode_KeyDown);
             // 
             // PackageDetail

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

@@ -767,7 +767,7 @@
             this.ms_sncode.Str1 = null;
             this.ms_sncode.Str2 = null;
             this.ms_sncode.TabIndex = 68;
-            this.ms_sncode.Tag = "IfWrite";
+            this.ms_sncode.Tag = "IfRead";
             this.ms_sncode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ms_code_KeyDown);
             // 
             // ma_softversion

UAS-MES/FunctionCode/Packing/Packing_CartonTransfer.cs

@@ -267,7 +267,7 @@ namespace UAS_MES.Packing
                                             }
                                         }
                                         string new_laststepcode = dh.getFieldDataByCondition("packagedetail inner join makeserial on ms_outboxcode=pd_outboxcode and ms_sncode=pd_barcode and ms_prodcode = pd_prodcode", "max(nvl(ms_currentstepcode,ms_stepcode))", "pd_outboxcode='" + pa_outboxcode.Text + "'").ToString();
-                                        if (new_laststepcode != laststepcode.Text)
+                                        if (new_laststepcode!=""&&(new_laststepcode != laststepcode.Text))
                                         {
                                             OperateResult.AppendText(">>目标箱号中的序列号最后所在工序与所录入序列号最后所在工序不一致\n", Color.Red, sn_code);
                                             return;