Kaynağa Gözat

添加参数,栈板是否连号可以勾选

callm 3 gün önce
ebeveyn
işleme
7568889d83

+ 1 - 2
UAS_MES_HYSX/FunctionCode/Packing/Packing_PalletCollectionZX.Designer.cs

@@ -771,7 +771,6 @@
             this.CheckBox.AutoSize = true;
             this.CheckBox.AutoSize = true;
             this.CheckBox.Checked = true;
             this.CheckBox.Checked = true;
             this.CheckBox.CheckState = System.Windows.Forms.CheckState.Checked;
             this.CheckBox.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.CheckBox.Enabled = false;
             this.CheckBox.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.CheckBox.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.CheckBox.ForeColor = System.Drawing.Color.Red;
             this.CheckBox.ForeColor = System.Drawing.Color.Red;
             this.CheckBox.Location = new System.Drawing.Point(1624, 367);
             this.CheckBox.Location = new System.Drawing.Point(1624, 367);
@@ -871,7 +870,7 @@
             this.SizeChanged += new System.EventHandler(this.Make_PalletCollection_SizeChanged);
             this.SizeChanged += new System.EventHandler(this.Make_PalletCollection_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.PackageInf)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.PackageInf)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.palletnum)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.palletnum)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
             this.PerformLayout();
 
 
         }
         }

+ 5 - 2
UAS_MES_HYSX/PublicMethod/HttpServer.cs

@@ -603,6 +603,9 @@ namespace UAS_MES_NEW.PublicMethod
             string status = deviceObj["status"].ToString();
             string status = deviceObj["status"].ToString();
             string device_type = deviceObj["device_type"].ToString();
             string device_type = deviceObj["device_type"].ToString();
             string en_no = deviceObj["en_no"].ToString();
             string en_no = deviceObj["en_no"].ToString();
+            string dev_para = deviceObj["dev_para"].ToString();
+            string reserve9 = deviceObj["reserve9"].ToString();
+            string reserve10 = deviceObj["reserve10"].ToString();
             string reserve11 = deviceObj["reserve11"].ToString();
             string reserve11 = deviceObj["reserve11"].ToString();
             string reserve12 = deviceObj["reserve12"].ToString();
             string reserve12 = deviceObj["reserve12"].ToString();
             string reserve13 = deviceObj["reserve13"].ToString();
             string reserve13 = deviceObj["reserve13"].ToString();
@@ -651,8 +654,8 @@ namespace UAS_MES_NEW.PublicMethod
                 default:
                 default:
                     break;
                     break;
             }
             }
-            dh.ExecuteSql("insert into ZTEDATA(ZD_ID,ZD_D_SN,zd_WholeDeviceCode,ZD_DEV_EN_NO,ZD_SN, ZD_MAKECODE, ZD_TYPE, ZD_VALUE,zd_mac,ZD_MAC_START, ZD_MAC_END,ZD_RESERVE3,zd_enno,zd_devicetype,zd_regcode,ZD_RESERVE11, ZD_RESERVE12, ZD_RESERVE13, ZD_RESERVE14, ZD_RESERVE15, ZD_RESERVE16, ZD_RESERVE17, ZD_RESERVE18, ZD_RESERVE19, ZD_RESERVE20, ZD_RESERVE21,ZD_RESERVE22)" +
-                "values(ZTEDATA_seq.nextval,'" + SN + "','" + WholeDeviceCode + "','" + dev_en_no + "','" + iSN + "','" + makecode + "','彩盒机身标','','" + mac + "','" + mac_start + "','" + mac_end + "','" + reserve3 + "','" + en_no + "','" + device_type + "','" + reg_code + "','" + reserve11 + "','" + reserve12 + "','" + reserve13 + "','" + reserve14 + "','" + reserve15 + "','" + reserve16 + "','" + reserve17 + "','" + reserve18 + "','" + reserve19 + "','" + reserve20 + "','" + reserve21 + "','" + reserve22 + "')", "insert");
+            dh.ExecuteSql("insert into ZTEDATA(ZD_ID,ZD_D_SN,zd_WholeDeviceCode,ZD_DEV_EN_NO,ZD_SN, ZD_MAKECODE, ZD_TYPE, ZD_VALUE,zd_mac,ZD_MAC_START, ZD_MAC_END,ZD_RESERVE3,zd_enno,zd_devicetype,zd_regcode,ZD_RESERVE9,ZD_RESERVE10,ZD_RESERVE11, ZD_RESERVE12, ZD_RESERVE13, ZD_RESERVE14, ZD_RESERVE15, ZD_RESERVE16, ZD_RESERVE17, ZD_RESERVE18, ZD_RESERVE19, ZD_RESERVE20, ZD_RESERVE21,ZD_RESERVE22,zd_dev_para)" +
+                "values(ZTEDATA_seq.nextval,'" + SN + "','" + WholeDeviceCode + "','" + dev_en_no + "','" + iSN + "','" + makecode + "','彩盒机身标','','" + mac + "','" + mac_start + "','" + mac_end + "','" + reserve3 + "','" + en_no + "','" + device_type + "','" + reg_code + "','"+ reserve9+ "','"+ reserve10+ "','" + reserve11 + "','" + reserve12 + "','" + reserve13 + "','" + reserve14 + "','" + reserve15 + "','" + reserve16 + "','" + reserve17 + "','" + reserve18 + "','" + reserve19 + "','" + reserve20 + "','" + reserve21 + "','" + reserve22 + "','"+ dev_para + "')", "insert");
             return dev_en_no;
             return dev_en_no;
         }
         }