修改泰国接口

UAS_MES_HYSX/PublicMethod/HttpServer.cs

@@ -675,13 +675,13 @@ namespace UAS_MES_NEW.PublicMethod
 
         public static string GetMingPai_Thailand(string iSN)
         {
-            DataTable dt = (DataTable)dh.ExecuteSql("select ms_id,ma_custpo,ms_makecode,pr_prefix,PREFIX_EN_NO,PREFIX_BIG_BOX,pr_prebigxbox,pr_regcode from makeserial left join product on ms_prodcode=pr_code left join make on ma_code=ms_makecode left join ZTE_ORDER on ma_custpo=po_sn where ms_sncode ='" + iSN + "' or ms_firstsn='" + iSN + "' order by ms_id desc", "select");
+            DataTable dt = (DataTable)dh.ExecuteSql("select po_sn,ms_id,ma_custpo,ms_makecode,pr_prefix,PREFIX_EN_NO,PREFIX_BIG_BOX,pr_prebigxbox,pr_regcode from makeserial left join product on ms_prodcode=pr_code left join make on ma_code=ms_makecode left join ZTE_ORDER on ma_custpo=batch_no where ms_sncode ='" + iSN + "' or ms_firstsn='" + iSN + "' and RESERVE9='" + User.UserLineCode + "' order by ms_id desc", "select");
             string po = "";
             string makecode = "";
             string ms_id = "";
             if (dt.Rows.Count > 0)
             {
-                po = dt.Rows[0]["ma_custpo"].ToString();
+                po = dt.Rows[0]["po_sn"].ToString();
                 makecode = dt.Rows[0]["ms_makecode"].ToString();
                 ms_id = dt.Rows[0]["ms_id"].ToString();
             }
@@ -696,8 +696,8 @@ namespace UAS_MES_NEW.PublicMethod
             {
                 BaseUtil.ShowError("工单未维护客户PO号，不允许执行该操作");
             }
-
             string json = JsonConvert.SerializeObject(obj, Formatting.Indented);
+            dh.ExecuteSql("insert into EISDATA(ED_ID, ED_DATA, ED_INDATE, ED_TYPE)values(EISDATA_seq.nextval,'" + json + "',sysdate,'GETEN_THA')", "insert");
             string returnstr = ToServerReq(json);
             JObject deviceObj = JObject.Parse(returnstr);
             string tool_name = deviceObj["tool_name"].ToString();
@@ -723,17 +723,18 @@ namespace UAS_MES_NEW.PublicMethod
             dh.ExecuteSql("insert into ZTEDATA(ZD_ID,zd_vendor,ZD_D_SN,ZD_DEV_EN_NO,ZD_SN, ZD_MAKECODE, ZD_TYPE, ZD_VALUE,zd_mac,zd_enno,ZD_PRODUCTNAME)" +
             "values(ZTEDATA_seq.nextval,'" + vendor + "','" + sn + "','" + sn + "','" + iSN + "','" + makecode + "','铭牌标','','" + wifi_mac + "'" +
             ",'" + en + "','" + product_name + "')", "insert");
+            dh.ExecuteSql("insert into EISDATA(ED_ID, ED_DATA, ED_INDATE, ED_TYPE)values(EISDATA_seq.nextval,'" + returnstr + "',sysdate,'GETEN_THA')", "insert");
             return sn;
         }
         public static string GetCaiHe_Thailand(string iSN)
         {
-            DataTable dt = (DataTable)dh.ExecuteSql("select ms_id,ma_custpo,ms_makecode,pr_prefix,PREFIX_EN_NO,PREFIX_BIG_BOX,pr_prebigxbox,pr_regcode from makeserial left join product on ms_prodcode=pr_code left join make on ma_code=ms_makecode left join ZTE_ORDER on ma_custpo=po_sn where ms_sncode ='" + iSN + "' or ms_firstsn='" + iSN + "' order by ms_id desc", "select");
+            DataTable dt = (DataTable)dh.ExecuteSql("select ms_id,ma_custpo,ms_makecode,pr_prefix,PREFIX_EN_NO,PREFIX_BIG_BOX,pr_prebigxbox,pr_regcode from makeserial left join product on ms_prodcode=pr_code left join make on ma_code=ms_makecode left join ZTE_ORDER on ma_custpo=batch_no where RESERVE9='" + User.UserLineCode + "' and ms_sncode ='" + iSN + "' or ms_firstsn='" + iSN + "' order by ms_id desc", "select");
             string po = "";
             string makecode = "";
             string ms_id = "";
             if (dt.Rows.Count > 0)
             {
-                po = dt.Rows[0]["ma_custpo"].ToString();
+                po = dt.Rows[0]["po_sn"].ToString();
                 makecode = dt.Rows[0]["ms_makecode"].ToString();
                 ms_id = dt.Rows[0]["ms_id"].ToString();
             }
@@ -749,8 +750,8 @@ namespace UAS_MES_NEW.PublicMethod
             {
                 BaseUtil.ShowError("工单未维护客户PO号，不允许执行该操作");
             }
-
             string json = JsonConvert.SerializeObject(obj, Formatting.Indented);
+            dh.ExecuteSql("insert into EISDATA(ED_ID, ED_DATA, ED_INDATE, ED_TYPE)values(EISDATA_seq.nextval,'" + json + "',sysdate,'GETEN_THA')", "insert");
             string returnstr = ToServerReq(json);
             JObject deviceObj = JObject.Parse(returnstr);
             string tool_name = deviceObj["tool_name"].ToString();
@@ -769,15 +770,19 @@ namespace UAS_MES_NEW.PublicMethod
             dh.ExecuteSql("insert into ZTEDATA(ZD_ID,ZD_D_SN,ZD_DEV_EN_NO,ZD_SN, ZD_MAKECODE, ZD_TYPE, ZD_VALUE,zd_mac,zd_enno,ZD_PRODUCTNAME)" +
             "values(ZTEDATA_seq.nextval,'" + sn + "','" + sn + "','" + iSN + "','" + makecode + "','彩盒标','','" + wifi_mac + "'" +
             ",'" + en + "')", "insert");
+            dh.ExecuteSql("insert into EISDATA(ED_ID, ED_DATA, ED_INDATE, ED_TYPE)values(EISDATA_seq.nextval,'" + returnstr + "',sysdate,'GETEN_THA')", "insert");
             return sn;
         }
+
         public static void GetOutBoxInf_Thailand(string iBox)
         {
             dynamic obj = new ExpandoObject();
             var expandoDict = obj as IDictionary<string, object>;
-            DataTable dt = (DataTable)dh.ExecuteSql("select 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  where pd_outboxcode='" + iBox + "'", "select");
+            DataTable dt = (DataTable)dh.ExecuteSql("select nvl(PACKING_NUM,0)PACKING_NUM,nvl(notype,0)notype,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 batch_no=ma_custpo  where RESERVE9='" + User.UserLineCode + "' and pd_outboxcode='" + iBox + "'", "select");
             string makecode = "";
             string po = "";
+            int notype = 0;
+            int PACKING_NUM = 0;
             for (int i = 0; i < dt.Rows.Count; i++)
             {
                 string enNoKey = $"sn{i}";
@@ -785,14 +790,16 @@ namespace UAS_MES_NEW.PublicMethod
                 expandoDict[enNoKey] = enNoValue;
                 makecode = dt.Rows[i]["pd_makecode"].ToString();
                 po = dt.Rows[i]["ma_custpo"].ToString();
+                notype = int.Parse(dt.Rows[i]["notype"].ToString());
+                PACKING_NUM = int.Parse(dt.Rows[i]["PACKING_NUM"].ToString());
             }
             obj.request = "ajc_wai_xiang";
-            obj.packing_num = dt.Rows.Count;
+            obj.packing_num = PACKING_NUM;
             obj.User = "test";
             obj.po_sn = po;
             obj.password = "123456";
             obj.tool_name = "AJC";
-            obj.noType = 1;
+            obj.noType = notype;
 
             if (po == "")
             {