修改泰国数据截取

UAS_MES_HYSX/PublicMethod/HttpServer.cs

@@ -652,7 +652,7 @@ namespace UAS_MES_NEW.PublicMethod
                     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");
+                "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");
             return dev_en_no;
         }
 
@@ -723,8 +723,8 @@ namespace UAS_MES_NEW.PublicMethod
                     "ZD_VOLTAGE, ZD_POWER, ZD_ORDER_NO, ZD_BIG_BOX_NO, ZD_D_SN, ZD_DEV_EN_NO, ZD_RESERVE3, ZD_DEVICEID, ZD_MAC_START, ZD_MAC_END,zd_production_date, ZD_INDATE,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,'" + deviceInfo.DSN[i] + "','" + makecode + "','BOX','" + deviceInfo.DSN[i] + "','" + deviceInfo.ProductMode + "','" + deviceInfo.ProductName + "','" + deviceInfo.MaterialCode + "','" + deviceInfo.BatchNo + "','" + deviceInfo.SoftVersion + "','" + deviceInfo.HdVersion + "'," +
                     "'" + deviceInfo.Voltage + "','" + deviceInfo.Power + "','" + deviceInfo.OrderNo + "','" + deviceInfo.BigBoxNo + "','" + deviceInfo.DSN[i] + "'," +
-                    "'" + deviceInfo.DevEnNo[i] + "', '" + deviceInfo.Reserve3[i] + "','" + deviceInfo.DeviceId[i] + "','" + deviceInfo.MacStart[i] + "','" + deviceInfo.MacEnd[i] + "','" + deviceInfo.ProductionDate + "',sysdate,'"+ deviceInfo.Reserve11[i] + "','"+ deviceInfo.Reserve12[i] + "','"+ deviceInfo.Reserve13[i] + "'" +
-                    ",'"+ deviceInfo.Reserve14[i] + "','"+ deviceInfo.Reserve15[i] + "','"+ deviceInfo.Reserve16[i] + "','"+ deviceInfo.Reserve17[i] + "','"+ deviceInfo.Reserve18[i] + "','"+ deviceInfo.Reserve19[i] + "','"+ deviceInfo.Reserve20[i] + "','"+ deviceInfo.Reserve21[i] + "','"+ deviceInfo.Reserve22[i] + "')", "insert");
+                    "'" + deviceInfo.DevEnNo[i] + "', '" + deviceInfo.Reserve3[i] + "','" + deviceInfo.DeviceId[i] + "','" + deviceInfo.MacStart[i] + "','" + deviceInfo.MacEnd[i] + "','" + deviceInfo.ProductionDate + "',sysdate,'" + deviceInfo.Reserve11[i] + "','" + deviceInfo.Reserve12[i] + "','" + deviceInfo.Reserve13[i] + "'" +
+                    ",'" + deviceInfo.Reserve14[i] + "','" + deviceInfo.Reserve15[i] + "','" + deviceInfo.Reserve16[i] + "','" + deviceInfo.Reserve17[i] + "','" + deviceInfo.Reserve18[i] + "','" + deviceInfo.Reserve19[i] + "','" + deviceInfo.Reserve20[i] + "','" + deviceInfo.Reserve21[i] + "','" + deviceInfo.Reserve22[i] + "')", "insert");
             }
             dh.ExecuteSql("update package set pa_zxcode ='" + deviceInfo.BigBoxNo + "' where pa_outboxcode='" + iBox + "'", "update");
             if (returnstr.Length > 1000)
@@ -1197,7 +1197,7 @@ namespace UAS_MES_NEW.PublicMethod
             obj.User = "1453";
             obj.password = "12345678";
             obj.po_sn = po;
-            obj.product_id = iSN.Substring(4, 16);
+            obj.product_id = iSN;
             if (po == "")
             {
                 BaseUtil.ShowError("工单未维护客户PO号，不允许执行该操作");
@@ -1242,7 +1242,7 @@ namespace UAS_MES_NEW.PublicMethod
             obj.User = "1453";
             obj.password = "12345678";
             obj.po_sn = po;
-            obj.product_id = iSN.Substring(4, 16);
+            obj.product_id = iSN;
             if (po == "")
             {
                 BaseUtil.ShowError("工单未维护客户PO号，不允许执行该操作");