更新泰国接口逻辑

UAS_MES_HYSX/PublicMethod/HttpServer.cs

@@ -706,7 +706,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_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");
+                "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;
         }
 
@@ -1268,6 +1268,35 @@ namespace UAS_MES_NEW.PublicMethod
             string dev_mac = deviceObj["dev_mac"].ToString();
             string wifi_mac = deviceObj["wifi_mac"].ToString();
             string en = deviceObj["en"].ToString();
+            switch (status)
+            {
+                case "-1":
+                        BaseUtil.ShowError("该序号已入库");
+                    break;
+                case "-2":
+                    BaseUtil.ShowError("没有写入这个序号的设备");
+                    break;
+                case "-3":
+                    BaseUtil.ShowError("用户名或密码错误");
+                    break;
+                case "-4":
+                    BaseUtil.ShowError("该序号还未写入设备");
+                    break;
+                case "-5":
+                    BaseUtil.ShowError("未知错误");
+                    break;
+                case "-6":
+                    BaseUtil.ShowError("装箱数量<=0");
+                    break;
+                case "-7":
+                    BaseUtil.ShowError("该序号设备已经产生EN号");
+                    break;
+                case "-8":
+                    BaseUtil.ShowError("该线体数据已包完");
+                    break;
+                default:
+                    break;
+            }
             if (dh.CheckExist("ZTEDATA", "zd_sn='" + iSN + "' and zd_makecode='" + makecode + "' and zd_type='彩盒标'"))
             {
                 dh.ExecuteSql("delete from ZTEDATA where zd_sn='" + iSN + "' and zd_makecode='" + makecode + "' and zd_type='彩盒标'", "delete");
@@ -1320,6 +1349,35 @@ namespace UAS_MES_NEW.PublicMethod
             string exsim_iccid = deviceObj["exsim_iccid"].ToString();
             string fg_ver = deviceObj["4g_ver"].ToString();
             string fg_type = deviceObj["4g_type"].ToString();
+            switch (status)
+            {
+                case "-1":
+                    BaseUtil.ShowError("该序号已入库");
+                    break;
+                case "-2":
+                    BaseUtil.ShowError("没有写入这个序号的设备");
+                    break;
+                case "-3":
+                    BaseUtil.ShowError("用户名或密码错误");
+                    break;
+                case "-4":
+                    BaseUtil.ShowError("该序号还未写入设备");
+                    break;
+                case "-5":
+                    BaseUtil.ShowError("未知错误");
+                    break;
+                case "-6":
+                    BaseUtil.ShowError("装箱数量<=0");
+                    break;
+                case "-7":
+                    BaseUtil.ShowError("该序号设备已经产生EN号");
+                    break;
+                case "-8":
+                    BaseUtil.ShowError("该线体数据已包完");
+                    break;
+                default:
+                    break;
+            }
             if (dh.CheckExist("ZTEDATA", "zd_sn='" + iSN + "' and zd_makecode='" + makecode + "' and zd_type='彩盒标'"))
             {
                 dh.ExecuteSql("delete from ZTEDATA where zd_sn='" + iSN + "' and zd_makecode='" + makecode + "' and zd_type='彩盒标'", "delete");
@@ -1374,7 +1432,10 @@ namespace UAS_MES_NEW.PublicMethod
             };
 
             DeviceInfo deviceInfo = JsonConvert.DeserializeObject<DeviceInfo>(returnstr, settings);
-
+            if (deviceInfo.Status == -5)
+            {
+                BaseUtil.ShowError("未知错误，不允许操作");
+            }
             //将返回的信息存入数据库
             for (int i = 0; i < deviceInfo.product_id.Count; i++)
             {