Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit fec1e642 由 LN
选项

去掉skipSap

1 个父辈 5f460c1c
内嵌 并排
正在显示 7 个修改的文件 包含 107 行增加 和 22 行删除
pom.xml
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<description>SMF project for Spring Boot</description> <description>SMF project for Spring Boot</description>
<properties> <properties>
<maven.build.timestamp.format>M.ddHHmm</maven.build.timestamp.format> <maven.build.timestamp.format>M.ddHHmm</maven.build.timestamp.format>
<main.version>3.${maven.build.timestamp}</main.version> <main.version>5.${maven.build.timestamp}</main.version>
<app.version>${main.version}</app.version> <app.version>${main.version}</app.version>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<jjwt.version>0.11.1</jjwt.version> <jjwt.version>0.11.1</jjwt.version>
......
src/main/java/com/neotel/smfcore/common/utils/UserCodeUtil.java
...@@ -2,20 +2,104 @@ package com.neotel.smfcore.common.utils; ...@@ -2,20 +2,104 @@ package com.neotel.smfcore.common.utils;
import com.neotel.smfcore.common.csv.CsvReader; import com.neotel.smfcore.common.csv.CsvReader;
import com.neotel.smfcore.common.csv.CsvWriter; import com.neotel.smfcore.common.csv.CsvWriter;
import com.neotel.smfcore.common.exception.ApiException;
import com.neotel.smfcore.common.exception.ValidateException; import com.neotel.smfcore.common.exception.ValidateException;
import com.neotel.smfcore.custom.micron1053.api.bean.MaterialStatus;
import com.neotel.smfcore.custom.micron1053.api.bean.TrackStatus;
import com.neotel.smfcore.custom.micron1053.bean.MicronResult;
import com.neotel.smfcore.security.service.po.User; import com.neotel.smfcore.security.service.po.User;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import java.util.ArrayList; import java.util.*;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
@Slf4j @Slf4j
public class UserCodeUtil { public class UserCodeUtil {
public static void main(String[] args) { public static void main(String[] args) {
// FilePro(); // FilePro();
Test2();
Test3();
CreateUserCode( ); CreateUserCode( );
}
private static void Test3() {
String resData = " {\n" +
" \"transactionId\": \"dba46696-4c8c-4d75-8378-4c3ba7a2fbe7\",\n" +
" \"trackStatus\": [\n" +
" {\n" +
" \"serialNum\": \"P2UATREG002\",\n" +
" \"partNumber\": \"515-500726A\",\n" +
" \"success\": true,\n" +
" \"description\": \"4163755578 2024 posted\"\n" +
" }\n" +
" ]\n" +
"}";
try {
List<TrackStatus> statusList = new ArrayList<>();
MicronResult micronResult = new MicronResult(200, resData);
String errMsg = micronResult.getDErrorMsg();
if (micronResult.isOk()) {
List<Object> objects = micronResult.getResult("trackStatus", false);
for (Object obj :
objects) {
TrackStatus s = JsonUtil.toObj(JsonUtil.toJsonStr(obj), TrackStatus.class);
statusList.add(s);
}
}
} catch (Exception exception) {
log.error("", exception);
}
}
private static void Test2(){
try {
String resData=" {\n" +
" \"TransactionId\": \"4ec847a2-1b32-49bb-b4c1-4d3fef72b7e9\",\n" +
" \"Success\": true,\n" +
" \"ErrorMessage\": \"\",\n" +
" \"results\": [\n" +
" {\n" +
" \"SerialNum\": \"P2UATRES030\",\n" +
" \"PartNumber\": \"510-500990E\",\n" +
" \"MaterialStatus\": \"Missing\",\n" +
" \"ReservedLinePrepOrderId\": null\n" +
" }\n" +
" ]}";
MicronResult micronResult = new MicronResult(200,resData);
String errMsg = micronResult.getDErrorMsg();
Map<String, MaterialStatus> resultMap = new HashMap<>();
if (micronResult.isOk()) {
List<Map<String,Object>> resultList = micronResult.getResult("results");
for (Map<String,Object> map :
resultList) {
// Map<String,Object> map=JsonUtil.toMap(Obj);
MaterialStatus s =new MaterialStatus("","","","",false,"");
s.setSerialNum(micronResult.GetMapValue(map,"SerialNum"));
s.setPartNumber(micronResult.GetMapValue(map,"PartNumber"));
s.setMaterialStatus(micronResult.GetMapValue(map,"MaterialStatus"));
s.setReservedLinePrepOrderId(micronResult.GetMapValue(map,"ReservedLinePrepOrderId"));
resultMap.put(s.getSerialNum(), s);
}
}
String url="http://istio-ingressgateway-istio-system.apps.ose-dev45.micron.com/material/lineprep?operationId=OPS509&LinePrepOrderId=LinePrep-NKHN6#PRIMARY#1-LINE011";
String nUrl=HttpHelper.encodeURL(url);
log.info(nUrl);
int code = 500;
String responseContent=" {\n" +
" \"transactionId\": \"5b52d43f-2b38-4bd0-8169-a47ad983b396\",\n" +
" \"error\": 203,\n" +
" \"message\": \"Server error exception\",\n" +
" \"detail\": \"One or more errors occurred. (One or more errors occurred. (Failed SAP transaction. Details: \\\"The configuration file 'appsettings.SINGAPORE.DEVL.json' was not found and is not optional. The expected physical path was '/app/appsettings.SINGAPORE.DEVL.json'.\\\"))\"\n" +
"}";
log.info("Request to response: code=" + code + ",responseContent=" + responseContent);
MicronResult result = new MicronResult(code, responseContent);
String msg=result.getResult("message",false);
log.info(msg);
} catch (ApiException apiException) {
apiException.printStackTrace();
}
} }
public static void CreateUserCode( ) { public static void CreateUserCode( ) {
try { try {
......
src/main/java/com/neotel/smfcore/custom/micron1053/api/MicronApi.java
...@@ -991,12 +991,12 @@ public class MicronApi { ...@@ -991,12 +991,12 @@ public class MicronApi {
public static boolean Api012(String operationId, String action) { public static boolean Api012(String operationId, String action) {
String url = config.getUrl(config.api_name_012);
url = MessageFormat.format(url, operationId);
if(Debug){ if(Debug){
log.info("调试状态直接返回true, 调用MES接口 Api012: url=" + url + " ");
return true; return true;
} }
String url = config.getUrl(config.api_name_012);
url = MessageFormat.format(url, operationId);
try { try {
Map<String, Object> paramMap = new HashMap<>(); Map<String, Object> paramMap = new HashMap<>();
paramMap.put("action", action); paramMap.put("action", action);
...@@ -1056,10 +1056,10 @@ public class MicronApi { ...@@ -1056,10 +1056,10 @@ public class MicronApi {
return ResultBean.newErrorResult(-1, e.getMsgKey(), e.getDefaultMsg(), e.getMsgParam()); return ResultBean.newErrorResult(-1, e.getMsgKey(), e.getDefaultMsg(), e.getMsgParam());
} }
} }
public static ResultBean Api101(String id, String operationId, String skipSap) { public static ResultBean Api101(String id, String operationId) {
String url = config.getUrl(config.api_name_101); String url = config.getUrl(config.api_name_101);
url = MessageFormat.format(url, id, operationId, skipSap); url = MessageFormat.format(url, id, operationId);
return Api100("API101",url); return Api100("API101",url);
// if (Debug) { // if (Debug) {
...@@ -1094,9 +1094,9 @@ public class MicronApi { ...@@ -1094,9 +1094,9 @@ public class MicronApi {
return Api100("API102",url); return Api100("API102",url);
} }
public static ResultBean Api103( String packagingSlip,String purchaseOrder, String operationId, String skipSap) { public static ResultBean Api103( String packagingSlip,String purchaseOrder, String operationId) {
String url = config.getUrl(config.api_name_103); String url = config.getUrl(config.api_name_103);
url = MessageFormat.format(url, purchaseOrder, packagingSlip, operationId, skipSap); url = MessageFormat.format(url, purchaseOrder, packagingSlip, operationId);
return Api100("API102",url); return Api100("API102",url);
} }
......
src/main/java/com/neotel/smfcore/custom/micron1053/api/MicronConfig.java
...@@ -76,17 +76,17 @@ public class MicronConfig { ...@@ -76,17 +76,17 @@ public class MicronConfig {
/** /**
* Validate if MBR (From Warehouse ) is valid * Validate if MBR (From Warehouse ) is valid
*/ */
public String api_name_101 = "operation/validation/mbr?id={Id}&operationId={operationId}&skipSap={SkipSap}"; public String api_name_101 = "operation/validation/mbr?id={0}&operationId={1}";
/** /**
* Validate if REQ (From Outside Shelf) is valid * Validate if REQ (From Outside Shelf) is valid
*/ */
public String api_name_102 = "operation/validation/req?id={Id}&operationId={operationId}"; public String api_name_102 = "operation/validation/req?id={0}&operationId={1}";
/** /**
* Validate if MCL GR is valid * Validate if MCL GR is valid
*/ */
public String api_name_103 = "operation/validation/gr?purchaseOrder={PurchaseOrder}&packagingSlip={PackagingSlip}&operationId={operationId}&skipSap={SkipSap}"; public String api_name_103 = "operation/validation/gr?purchaseOrder={0}&packagingSlip={1}&operationId={2}";
/** /**
* Controlled Dispatch 输入lineID后调用此方法 * Controlled Dispatch 输入lineID后调用此方法
......
src/main/java/com/neotel/smfcore/custom/micron1053/loading/LoadingController.java
...@@ -297,11 +297,11 @@ public class LoadingController { ...@@ -297,11 +297,11 @@ public class LoadingController {
String operId = loadingInfo.getOperationId(); String operId = loadingInfo.getOperationId();
ResultBean resultBean = ResultBean.newErrorResult(-1, "smfcore.micron.operationFailure", "操作失败"); ResultBean resultBean = ResultBean.newErrorResult(-1, "smfcore.micron.operationFailure", "操作失败");
if (APIMODE.MBR.equals(mode)) { if (APIMODE.MBR.equals(mode)) {
resultBean = MicronApi.Api101(mbrId, operId, ""); resultBean = MicronApi.Api101(mbrId, operId );
} else if (APIMODE.REQ.equals(mode)) { } else if (APIMODE.REQ.equals(mode)) {
resultBean = MicronApi.Api102(reqId, operId); resultBean = MicronApi.Api102(reqId, operId);
} else if (APIMODE.GR.equals(mode)) { } else if (APIMODE.GR.equals(mode)) {
resultBean = MicronApi.Api103(deliveryNote, purchaseOrder, operId, ""); resultBean = MicronApi.Api103(deliveryNote, purchaseOrder, operId );
}else if(APIMODE.MCL.equals(mode)){ }else if(APIMODE.MCL.equals(mode)){
resultBean=ResultBean.newOkResult(true); resultBean=ResultBean.newOkResult(true);
} }
......
src/main/resources/config/application-prod.yml
...@@ -11,9 +11,9 @@ micron: ...@@ -11,9 +11,9 @@ micron:
api_name_010: material/track-out api_name_010: material/track-out
api_name_011: operation?mode={0}&username={1}&source={2} api_name_011: operation?mode={0}&username={1}&source={2}
api_name_012: operation/{0} api_name_012: operation/{0}
api_name_101: operation/validation/mbr?id={0}&operationId={1}&skipSap={2} api_name_101: operation/validation/mbr?id={0}&operationId={1}
api_name_102: operation/validation/req?id={0}&operationId={1} api_name_102: operation/validation/req?id={0}&operationId={1}
api_name_103: operation/validation/gr?purchaseOrder={0}&packagingSlip={1}&operationId={2}&skipSap={3} api_name_103: operation/validation/gr?purchaseOrder={0}&packagingSlip={1}&operationId={2}
api_name_201: operation/validate/ctrldispatch?linePrepOrderId={0}&operationId={1} api_name_201: operation/validate/ctrldispatch?linePrepOrderId={0}&operationId={1}
api_name_202: user/{0} api_name_202: user/{0}
api: api:
......
src/main/resources/config/application.yml
...@@ -13,9 +13,10 @@ micron: ...@@ -13,9 +13,10 @@ micron:
api_name_009: material/status api_name_009: material/status
api_name_010: material/track-out api_name_010: material/track-out
api_name_011: operation?mode={0}&username={1}&source={2} api_name_011: operation?mode={0}&username={1}&source={2}
api_name_101: operation/validation/mbr?id={0}&operationId={1}&skipSap={2} api_name_012: operation/{0}
api_name_101: operation/validation/mbr?id={0}&operationId={1}
api_name_102: operation/validation/req?id={0}&operationId={1} api_name_102: operation/validation/req?id={0}&operationId={1}
api_name_103: operation/validation/gr?purchaseOrder={0}&packagingSlip={1}&operationId={2}&skipSap={3} api_name_103: operation/validation/gr?purchaseOrder={0}&packagingSlip={1}&operationId={2}
api_name_201: operation/validate/ctrldispatch?linePrepOrderId={0}&operationId={1} api_name_201: operation/validate/ctrldispatch?linePrepOrderId={0}&operationId={1}
api_name_202: user/{0} api_name_202: user/{0}
api: api:
...@@ -46,7 +47,7 @@ spring: ...@@ -46,7 +47,7 @@ spring:
auto-index-creation: true # 默认为false，即不会自动创建索引 auto-index-creation: true # 默认为false，即不会自动创建索引
host: localhost # 主机地址 host: localhost # 主机地址
port: 27017 # 端口 port: 27017 # 端口
database: smf1053-20231201 # 数据库smf1053-20230606 database: smf105320240625 # 数据库smf1053-20230606
#备份数据库配置 #备份数据库配置
backup-mongodb: backup-mongodb:
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!