栈板采集修改，获取字段内容

UAS_MES_HYSX/FunctionCode/Make/Make_ImeiCheck_ThreeLabelNEW.Designer.cs

@@ -256,6 +256,7 @@
             this.sn1.Margin = new System.Windows.Forms.Padding(4);
             this.sn1.Name = "sn1";
             this.sn1.Power = null;
+            this.sn1.ReadOnly = true;
             this.sn1.Size = new System.Drawing.Size(334, 35);
             this.sn1.Str = null;
             this.sn1.Str1 = null;
@@ -282,6 +283,7 @@
             this.sn2.Margin = new System.Windows.Forms.Padding(4);
             this.sn2.Name = "sn2";
             this.sn2.Power = null;
+            this.sn2.ReadOnly = true;
             this.sn2.Size = new System.Drawing.Size(334, 35);
             this.sn2.Str = null;
             this.sn2.Str1 = null;
@@ -308,6 +310,7 @@
             this.sn3.Margin = new System.Windows.Forms.Padding(4);
             this.sn3.Name = "sn3";
             this.sn3.Power = null;
+            this.sn3.ReadOnly = true;
             this.sn3.Size = new System.Drawing.Size(334, 35);
             this.sn3.Str = null;
             this.sn3.Str1 = null;

UAS_MES_HYSX/FunctionCode/Packing/Packing_PalletCollectionZX.cs

@@ -508,7 +508,7 @@ namespace UAS_MES_NEW.Packing
             {
                 maxnum = int.Parse(maxbox.Substring(maxbox.Length - 4));
             }
-            string currentbox = dh.getFieldDataByCondition("package left join source on sc_code=pa_sccode", "(pa_zxcode)", "pa_outboxcode='" + outboxcode.Text + "' and sc_linecode='" + User.UserLineCode + "'").ToString();
+            string currentbox = dh.getFieldDataByCondition("package left join source on sc_code=pa_sccode", "(pa_zxcode)", "pa_outboxcode='" + outboxcode.Text + "' and pa_makecode='"+pa_makecode.Text+"' and sc_linecode='" + User.UserLineCode + "'").ToString();
             if (currentbox != "")
             {
                 currentnum = int.Parse(currentbox.Substring(currentbox.Length - 4));

UAS_MES_HYSX/PublicMethod/HttpServer.cs

@@ -334,7 +334,7 @@ namespace UAS_MES_NEW.PublicMethod
     {
         static DataHelper dh = new DataHelper();
         public static int SN_SERVICE_PORT = 21610;
-        public static int MAX_BUF_SIZE = 8192;
+        public static int MAX_BUF_SIZE = 16392;
         static string ComputeSha256Hash(string input)
         {
             using (SHA256 sha256 = SHA256.Create())
@@ -457,10 +457,10 @@ namespace UAS_MES_NEW.PublicMethod
         {
             dynamic obj = new ExpandoObject();
             var expandoDict = obj as IDictionary<string, object>;
-            DataTable dt = (DataTable)dh.ExecuteSql("select NOTYPE,po_sn,ma_custpo,pd_barcode,pd_makecode,ZD_DEV_EN_NO from packagedetail left join ZTEDATA on zd_makecode=pd_makecode and pd_barcode=ZD_DEV_EN_NO left join make on ma_code=pd_makecode left join ZTE_ORDER on ma_custpo=BATCH_NO  where pd_outboxcode='" + iBox + "' and  RESERVE9='" + User.UserLineCode + "'", "select");
+            DataTable dt = (DataTable)dh.ExecuteSql("select nvl(NOTYPE,0)NOTYPE,po_sn,ma_custpo,pd_barcode,pd_makecode,ZD_DEV_EN_NO from packagedetail left join ZTEDATA on zd_makecode=pd_makecode and pd_barcode=ZD_DEV_EN_NO left join make on ma_code=pd_makecode left join ZTE_ORDER on ma_custpo=BATCH_NO  where pd_outboxcode='" + iBox + "' and  RESERVE9='" + User.UserLineCode + "'", "select");
             string makecode = "";
             string po = "";
-            string notype = "";
+            int notype = 0;
             for (int i = 0; i < dt.Rows.Count; i++)
             {
                 string enNoKey = $"en_no{i}";
@@ -468,7 +468,7 @@ namespace UAS_MES_NEW.PublicMethod
                 expandoDict[enNoKey] = enNoValue;
                 makecode = dt.Rows[i]["pd_makecode"].ToString();
                 po = dt.Rows[i]["po_sn"].ToString();
-                notype = dt.Rows[i]["NOTYPE"].ToString();
+                notype = int.Parse(dt.Rows[i]["NOTYPE"].ToString());
             }
             obj.request = "Q_wai_xiang";
             obj.packing_num = dt.Rows.Count;