Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 7c1555a6 由 zshaohui
选项

1.地址切换成test 

2.登录时,取winaccountname为用户名
1 个父辈 672090b3
内嵌 并排
正在显示 5 个修改的文件 包含 24 行增加 和 6 行删除
src/main/java/com/neotel/smfcore/core/barcode/bean/BarcodeRule.java
...@@ -841,6 +841,9 @@ public class BarcodeRule { ...@@ -841,6 +841,9 @@ public class BarcodeRule {
rule="EXPDATEyyMMdd[12:0:-1]|BATCH[2:0:-1]|QTY[2:0:-1]|RI[2:0:-1]|PN[1:0:-1]|MPN[-1:0:2]"; rule="EXPDATEyyMMdd[12:0:-1]|BATCH[2:0:-1]|QTY[2:0:-1]|RI[2:0:-1]|PN[1:0:-1]|MPN[-1:0:2]";
// rule="PN[1:0:-1]|BATCH[2:0:-1]|LOT[2:0:-1]|QTY[2_7Q:0:-1]|RI[1:0:-1]|SP[3:0:-1]|PRODATEyyyyMMdd[2:0:-1]|xxx"; // rule="PN[1:0:-1]|BATCH[2:0:-1]|LOT[2:0:-1]|QTY[2_7Q:0:-1]|RI[1:0:-1]|SP[3:0:-1]|PRODATEyyyyMMdd[2:0:-1]|xxx";
codeStr = "=1+0x0-7x50=P507-10363|21PALPHA|1PALPHA CVP-390|1T30210064SP|2D08-09-2024|SENG-UAT01|4LSG";
rule = "PN[1:0:-1]|SP[3_21P:0:-1]|3|BATCH[2:0:-1]|EXPDATEdd-MM-yyyy[2_2D:0:-1]|RI|7";
BarcodeRule br = BarcodeRule.newRule(rule); BarcodeRule br = BarcodeRule.newRule(rule);
Barcode b = br.toCodeBean(codeStr).getBarcode(); Barcode b = br.toCodeBean(codeStr).getBarcode();
if(b != null){ if(b != null){
......
src/main/java/com/neotel/smfcore/core/barcode/utils/CodeResolve.java
...@@ -4,6 +4,7 @@ import com.google.common.base.Strings; ...@@ -4,6 +4,7 @@ import com.google.common.base.Strings;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.neotel.smfcore.common.exception.ValidateException; import com.neotel.smfcore.common.exception.ValidateException;
import com.neotel.smfcore.common.utils.DateUtil; import com.neotel.smfcore.common.utils.DateUtil;
import com.neotel.smfcore.common.utils.StringUtils;
import com.neotel.smfcore.core.barcode.bean.BarcodeRule; import com.neotel.smfcore.core.barcode.bean.BarcodeRule;
import com.neotel.smfcore.core.barcode.bean.CodeBean; import com.neotel.smfcore.core.barcode.bean.CodeBean;
import com.neotel.smfcore.core.barcode.enums.COMPONENT_TYPE; import com.neotel.smfcore.core.barcode.enums.COMPONENT_TYPE;
...@@ -207,6 +208,13 @@ public class CodeResolve { ...@@ -207,6 +208,13 @@ public class CodeResolve {
needUpdate = true; needUpdate = true;
} }
String provider = barcodeFromRule.getProvider();
if (StringUtils.isNotBlank(provider)){
barcode.setProvider(provider);
log.info("重新设置"+codeBeanFromRule.getCodeStr()+"的供应商");
needUpdate = true;
}
if(needUpdate){ if(needUpdate){
try { try {
barcodeManager.save(barcode); barcodeManager.save(barcode);
......
src/main/java/com/neotel/smfcore/custom/micron20031/Micron20031Api.java
...@@ -213,7 +213,12 @@ public class Micron20031Api { ...@@ -213,7 +213,12 @@ public class Micron20031Api {
return ""; return "";
} }
final static String auth = "Basic c0E1UENNdHhJTFAwZ0VFb1ZyUGFkMnhHTmZNYTp1WmRuSWYxVW1kOG9uNUpHa3NRclZ4RDdtWklh"; //Dev使用
//final static String auth = "Basic c0E1UENNdHhJTFAwZ0VFb1ZyUGFkMnhHTmZNYTp1WmRuSWYxVW1kOG9uNUpHa3NRclZ4RDdtWklh";
//test使用
final static String auth = "Basic bnhPa2tXX21SZHNja0NuaXZWTWlVRmg3SllzYTpSN2FkVTZZcXBnTmRSNEpKejNUTm5Qd2Z5Q3dh";
public static String getAuthToken() { public static String getAuthToken() {
if (ObjectUtil.isEmpty(url_getToken)) { if (ObjectUtil.isEmpty(url_getToken)) {
...@@ -465,6 +470,8 @@ public class Micron20031Api { ...@@ -465,6 +470,8 @@ public class Micron20031Api {
dataMap.put("SystemID","SPMMS"); dataMap.put("SystemID","SPMMS");
dataMap.put("MaterialType",MATERIAL_TYPE); dataMap.put("MaterialType",MATERIAL_TYPE);
dataMap.put("Username",username); dataMap.put("Username",username);
dataMap.put("supplier",barcode.getProvider());
dataMap.put("manufacturerLotNo",barcode.getBatch());
log.info("调用MES接口 depositCreateMA,参数:"+JsonUtil.toJsonStr(dataMap)); log.info("调用MES接口 depositCreateMA,参数:"+JsonUtil.toJsonStr(dataMap));
String resultStr = HttpHelper.postJsonWithAuth(depositCreateMAUrl, dataMap, auth); String resultStr = HttpHelper.postJsonWithAuth(depositCreateMAUrl, dataMap, auth);
......
src/main/java/com/neotel/smfcore/custom/micron20031/login/controller/MicronLoginController.java
...@@ -119,12 +119,12 @@ public class MicronLoginController { ...@@ -119,12 +119,12 @@ public class MicronLoginController {
MicronUserInfo userInfo = loginApi.getUserInfoByCode(code); MicronUserInfo userInfo = loginApi.getUserInfoByCode(code);
if (userInfo != null) { if (userInfo != null) {
//根据唯一名称判断是否存在 //根据唯一名称判断是否存在
User user = userManager.findByUserName(userInfo.getUnique_name()); User user = userManager.findByUserName(userInfo.getWinaccountname());
if (user == null) { if (user == null) {
//123456..123 //123456..123
String pwd = passwordEncoder.encode("123456..123"); String pwd = passwordEncoder.encode("123456..123");
Role role = roleManager.findOne(new Query(Criteria.where("name").is("admin"))); Role role = roleManager.findOne(new Query(Criteria.where("name").is("admin")));
user = new User(userInfo.getUnique_name(), userInfo.getEmail(), "zh-CN", role.getId(), pwd, true, true, new Date(), new HashSet<>(), ""); user = new User(userInfo.getWinaccountname(), userInfo.getEmail(), "zh-CN", role.getId(), pwd, true, true, new Date(), new HashSet<>(), "");
user = userManager.save(user); user = userManager.save(user);
} }
......
src/main/resources/config/application.yml
...@@ -2,7 +2,7 @@ server: ...@@ -2,7 +2,7 @@ server:
port: 8800 port: 8800
micron: micron:
apiAddr: https://devapigtwy.micron.com/t/app.mfg/MMSIL/v1/DEVL/SINGAPORE/ apiAddr: https://testapigtwy.micron.com/t/app.mfg/mmsil/v1/DEVL/SINGAPORE/
api_CheckUserRights: CheckUserRights api_CheckUserRights: CheckUserRights
api_CheckStockAvailable: CheckStockAvailable api_CheckStockAvailable: CheckStockAvailable
api_TriggerMatReqOrder: TriggerMatReqOrder api_TriggerMatReqOrder: TriggerMatReqOrder
...@@ -15,7 +15,7 @@ micron: ...@@ -15,7 +15,7 @@ micron:
api_ChkAuthoriseToDispatch: ChkAuthoriseToDispatch api_ChkAuthoriseToDispatch: ChkAuthoriseToDispatch
api_ReturnMaterial: ReturnMaterial api_ReturnMaterial: ReturnMaterial
defToken: Bearer 0f1a4408-7235-3f01-b671-f71491dc6bfa defToken: Bearer 0f1a4408-7235-3f01-b671-f71491dc6bfa
getTokenUrl: https://devapigtwy.micron.com/token getTokenUrl: https://testapigtwy.micron.com/token
email: email:
to: to:
cc: cc:
...@@ -37,7 +37,7 @@ micron: ...@@ -37,7 +37,7 @@ micron:
api: api:
name: 20031 name: 20031
inCheckUrl: https://devapigtwy.micron.com/t/app.mfg/MMSIL/v1/DEVL/SINGAPORE/ReturnMaterial inCheckUrl: https://testapigtwy.micron.com/t/app.mfg/mmsil/v1/DEVL/SINGAPORE/ReturnMaterial
# loginCheckUrl: https://testapigtwy.micron.com/t/app.mfg/mmsil/v1/DEVL/SINGAPORE/CheckUserRights # loginCheckUrl: https://testapigtwy.micron.com/t/app.mfg/mmsil/v1/DEVL/SINGAPORE/CheckUserRights
# 文件存储路径 # 文件存储路径
file: file:
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!