From 997e697edaf59893248bc2467223058b221a4de2 Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期五, 12 七月 2024 14:51:47 +0800
Subject: [PATCH] 修改参数采集
---
jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/service/RestfulService.java | 34 ++++++----------------------------
1 files changed, 6 insertions(+), 28 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/service/RestfulService.java b/jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/service/RestfulService.java
index 1fcadf7..08c4a11 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/service/RestfulService.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/service/RestfulService.java
@@ -8,27 +8,6 @@
import org.springframework.web.bind.annotation.RequestParam;
public class RestfulService {
- public static void main(String[] args) {
- String json = "{\"code\":\"success\",\"data\":{\"productNum\":\"LCV123456P0600036\",\"stationCode\":\"1HZ01\",\"resultCode\":\"S\",\"resultText\":\"鎶ュ伐鎴愬姛\"},\"message\":\"API 璋冪敤鎴愬姛\"}";
- JSONObject jsonObject = new JSONObject(json);
- String code = jsonObject.getStr("code");
- String resultCode = jsonObject.getJSONObject("data").getStr("resultCode");
- System.out.println("code: " + code);
- System.out.println("resultCode: " + resultCode);
- }
-
- public static final String getRealmName = Constants.FACTORY_EMS_UAT_RUL;
-
- // public static final String getRealmName = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration";
-//
- public static final String postRealmName = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/interface";
-
-// public static final String getRealmName = "https://imes-group.geelycv.com/api/mom-open/restful/aMesSysIntegration";
-
-// public static final String postRealmName = "https://imes-group.geelycv.com/api/mom-open/restful/interface";
-
- public static final String siteCode = "3983";
-
/**
* 鐢熶骇宸ュ崟璇锋眰鎺ュ彛
* @param productNum
@@ -36,9 +15,9 @@
* @return
*/
//{"code":"success","data":{"productNum":"LCV123456P0600036","stationCode":"1HZ01","materialCode":"LCV001_3","productionOrderNum":"500000258"},"message":"API璋冪敤鎴愬姛"}
- public static String getProductionWorkOrderRequest(String productNum,String stationCode)
+ public static String getProductionWorkOrderRequest(String productNum,String stationCode,String materialCode)
{
- String url = getRealmName + "/productionWorkOrderRequest?siteCode="+siteCode+"&stationCode="+stationCode+"&productNum="+productNum;
+ String url = Constants.FACTORY_EMS_UAT_GET_RUL + "productionWorkOrderRequest?siteCode="+Constants.FACTORY_EMS_SITE_CODE+"&stationCode="+stationCode+"&productNum="+productNum+"&materialCode="+materialCode;
HttpResponse response = HttpRequest.get(url).execute();
HttpRequest httpRequest = HttpRequest.get(url);
return response.body();
@@ -56,7 +35,7 @@
{
String result = "";
try {
- String url = getRealmName + "/workReportResultFeedback?siteCode="+siteCode+"&stationCode="+stationCode+"&productNum="+productNum+"&confirmTime="+confirmTime;
+ String url = Constants.FACTORY_EMS_UAT_GET_RUL + "workReportResultFeedback?siteCode="+Constants.FACTORY_EMS_SITE_CODE+"&stationCode="+stationCode+"&productNum="+productNum+"&confirmTime="+confirmTime;
HttpResponse response = HttpRequest.get(url).execute();
HttpRequest httpRequest = HttpRequest.get(url);
result = response.body();
@@ -65,7 +44,6 @@
}finally {
return result;
}
-
}
@@ -78,7 +56,7 @@
//{"code":"success","data":[{"productionOrderNum":"500000258","componentCode":"LCV_TZ_002","quantity":"1.0","stationCode":"C01"},{"productionOrderNum":"500000258","componentCode":"LCV_CG_001","quantity":"1.0","stationCode":"C01"},{"productionOrderNum":"500000258","componentCode":"LCV_CG_002","quantity":"1.0","stationCode":"C01"},{"productionOrderNum":"500000258","componentCode":"LCV_CG_003","quantity":"1.0","stationCode":"C01"},{"productionOrderNum":"500000258","componentCode":"LCV_CG_004","quantity":"1.0","stationCode":"C01"},{"productionOrderNum":"500000258","componentCode":"LCV_CG_005","quantity":"1.0","stationCode":"C02"},{"productionOrderNum":"500000258","componentCode":"LCV_CG_006","quantity":"1.0","stationCode":"C03"},{"productionOrderNum":"500000258","componentCode":"LCV_CG_007","quantity":"1.0","stationCode":"C04"},{"productionOrderNum":"500000258","componentCode":"LCV_CG_009","quantity":"2.0","stationCode":"C05"}],"message":"API璋冪敤鎴愬姛"}
public static String getProductionOrderComponentRequest(String productionOrderNum)
{
- String url = getRealmName + "/productionOrderComponentRequest?siteCode="+siteCode+"&productionOrderNum="+productionOrderNum;
+ String url = Constants.FACTORY_EMS_UAT_GET_RUL + "productionOrderComponentRequest?siteCode="+Constants.FACTORY_EMS_SITE_CODE+"&productionOrderNum="+productionOrderNum;
HttpResponse response = HttpRequest.get(url).execute();
HttpRequest httpRequest = HttpRequest.get(url);
return response.body();
@@ -93,10 +71,10 @@
//{"code":"success","data":[{"configValues":{"FXPTX":"","ZJTX":"","JSYZYZC":"","CDGDTX":"","CHLXTX":""},"productTrackInfo":{"ProductNum":"LCVLCVTS3P0600388","StationCode":"1A03"}}],"message":"API璋冪敤鎴愬姛"}
public static String postPRODUCTION_QUEUE(String productNum,String stationCode)
{
- String url = postRealmName + "/PRODUCTION_QUEUE";
+ String url = Constants.FACTORY_EMS_UAT_POST_RUL + "PRODUCTION_QUEUE";
HttpResponse response = HttpRequest.post(url)
// 琛ㄥ崟鍙傛暟锛屽彲浠ラ�氳繃澶氭璋冪敤 form 鏂规硶娣诲姞澶氫釜鍙傛暟
- .form("siteCode", siteCode)
+ .form("siteCode", Constants.FACTORY_EMS_SITE_CODE)
.form("interfaceCode", "PRODUCTION_QUEUE")
.form("parameter", "{\"productNum\":\""+productNum+"\",\"stationCode\":\""+stationCode+"\",\"requestQty\":1}")
// 鎵ц璇锋眰
--
Gitblit v1.9.3