Commit abd072d5 zshaohui

1.mATrackOut 增加mode参数

2.地址切换为dev
1 个父辈 4a4fb0d7
......@@ -211,10 +211,10 @@ public class Micron20031Api {
}
//Dev使用
//final static String auth = "Basic c0E1UENNdHhJTFAwZ0VFb1ZyUGFkMnhHTmZNYTp1WmRuSWYxVW1kOG9uNUpHa3NRclZ4RDdtWklh";
final static String auth = "Basic c0E1UENNdHhJTFAwZ0VFb1ZyUGFkMnhHTmZNYTp1WmRuSWYxVW1kOG9uNUpHa3NRclZ4RDdtWklh";
//test使用
final static String auth = "Basic bnhPa2tXX21SZHNja0NuaXZWTWlVRmg3SllzYTpSN2FkVTZZcXBnTmRSNEpKejNUTm5Qd2Z5Q3dh";
//final static String auth = "Basic bnhPa2tXX21SZHNja0NuaXZWTWlVRmg3SllzYTpSN2FkVTZZcXBnTmRSNEpKejNUTm5Qd2Z5Q3dh";
public static String getAuthToken() {
......@@ -563,6 +563,7 @@ public class Micron20031Api {
defaultUserName = SecurityUtils.getLoginUsername();
}
dataMap.put("Username", defaultUserName);
dataMap.put("Mode","DISABLE_SAP");
log.info("调用MES接口 mATrackOut,参数:"+JsonUtil.toJsonStr(dataMap));
String resultStr = HttpHelper.postJsonWithAuth(url, dataMap, auth);
......
......@@ -2,7 +2,7 @@ server:
port: 8800
micron:
apiAddr: https://testapigtwy.micron.com/t/app.mfg/mmsil/v1/DEVL/SINGAPORE/
apiAddr: https://devapigtwy.micron.com/t/app.mfg/MMSIL/v1/DEVL/SINGAPORE/
api_CheckUserRights: CheckUserRights
api_CheckStockAvailable: CheckStockAvailable
api_TriggerMatReqOrder: TriggerMatReqOrder
......@@ -15,7 +15,7 @@ micron:
api_ChkAuthoriseToDispatch: ChkAuthoriseToDispatch
api_ReturnMaterial: ReturnMaterial
defToken: Bearer 0f1a4408-7235-3f01-b671-f71491dc6bfa
getTokenUrl: https://testapigtwy.micron.com/token
getTokenUrl: https://devapigtwy.micron.com/token
email:
to:
cc:
......@@ -37,7 +37,7 @@ micron:
api:
name: 20031
inCheckUrl: https://testapigtwy.micron.com/t/app.mfg/mmsil/v1/DEVL/SINGAPORE/ReturnMaterial
inCheckUrl: https://devapigtwy.micron.com/t/app.mfg/MMSIL/v1/DEVL/SINGAPORE/ReturnMaterial
# loginCheckUrl: https://testapigtwy.micron.com/t/app.mfg/mmsil/v1/DEVL/SINGAPORE/CheckUserRights
# 文件存储路径
file:
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!