Skip to content

孙克 / smf-core

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

一键导入功能修改

1 个父辈 a926e363
内嵌 并排
正在显示 4 个修改的文件 包含 41 行增加 和 51 行删除
src/main/java/com/neotel/smfcore/core/language/util/MessageUtils.java
...@@ -142,7 +142,7 @@ public class MessageUtils { ...@@ -142,7 +142,7 @@ public class MessageUtils {
// log.info("获取资源[" + msgKey + "][" + defaultMsg + "][" + lanType + "]失败：未找到code[" + msgKey + "]对应语言[" + lanType + "]"); // log.info("获取资源[" + msgKey + "][" + defaultMsg + "][" + lanType + "]失败：未找到code[" + msgKey + "]对应语言[" + lanType + "]");
return msg.getMsg(); return msg.getMsg();
} }
log.info("获取资源[" + msgKey + "][" + defaultMsg + "][" + lanType + "]失败：未找到code[" + msgKey + "]"); //log.info("获取资源[" + msgKey + "][" + defaultMsg + "][" + lanType + "]失败：未找到code[" + msgKey + "]");
} }
return defaultMsg; return defaultMsg;
} }
......
src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java
...@@ -176,7 +176,7 @@ public class LiteOrderCache { ...@@ -176,7 +176,7 @@ public class LiteOrderCache {
String result = checkOutLiteOrder(order.getOrderNo(), false); String result = checkOutLiteOrder(order.getOrderNo(), false);
if (!ObjectUtil.isEmpty(result)) { if (!ObjectUtil.isEmpty(result)) {
String msg = MessageUtils.getText(result, MessageUtils.getDefaultLocal(), ""); String msg = MessageUtils.getText(result, MessageUtils.getDefaultLocal(), "");
log.info("自动执行工单 【" + order.getOrderNo() + "】 失败：" + msg); //log.info("自动执行工单 【" + order.getOrderNo() + "】 失败：" + msg);
} else { } else {
log.info("自动执行工单 【" + order.getOrderNo() + "】 成功"); log.info("自动执行工单 【" + order.getOrderNo() + "】 成功");
break; break;
......
src/main/java/com/neotel/smfcore/custom/lizhen/report/inner/InnerReportController.java
...@@ -197,8 +197,8 @@ public class InnerReportController { ...@@ -197,8 +197,8 @@ public class InnerReportController {
} }
} else { } else {
resultMap.put(F2, F2); resultMap.put(F2, F2);
resultMap.put(F3, F3); //resultMap.put(F3, F3);
resultMap.put(F5, F5); //resultMap.put(F5, F5);
} }
return ResultBean.newOkResult(resultMap); return ResultBean.newOkResult(resultMap);
} }
...@@ -209,17 +209,13 @@ public class InnerReportController { ...@@ -209,17 +209,13 @@ public class InnerReportController {
public ResultBean linePullDown(String floor) { public ResultBean linePullDown(String floor) {
//得到每一个楼层的线体 //得到每一个楼层的线体
String f2Line = dataCache.getCache("F2Line").toString(); String f2Line = dataCache.getCache("F2Line").toString();
String f3Line = dataCache.getCache("F3Line").toString(); //String f3Line = dataCache.getCache("F3Line").toString();
String f5Line = dataCache.getCache("F5Line").toString(); //String f5Line = dataCache.getCache("F5Line").toString();
String resultLine = ""; String resultLine = "";
if (F2.equals(floor)) { if (F2.equals(floor)) {
resultLine = f2Line; resultLine = f2Line;
} else if (F3.equals(floor)) { } else {
resultLine = f3Line; resultLine = f2Line;
} else if (F5.equals(floor)) {
resultLine = f5Line;
} else {
resultLine = f2Line + "," + f3Line + "," + f5Line;
} }
Map<String, String> resultMap = new LinkedHashMap<>(); Map<String, String> resultMap = new LinkedHashMap<>();
for (String line : resultLine.split(",")) { for (String line : resultLine.split(",")) {
......
src/main/resources/config/application.yml
...@@ -3,57 +3,51 @@ server: ...@@ -3,57 +3,51 @@ server:
api: api:
name: Lizhen name: Lizhen
inCheckUrl: #http://172.30.170.148:8001/Npm/WmsCheckReelfob #禁用料 inCheckUrl:
batchCheckUrl: #http://172.30.60.117:8001/Npm/WmsCheckReelfob_Batch #批量禁用料 batchCheckUrl:
outNotifyUrl: #http://172.30.170.148:8082/SmtAutoWH/Save2DReelInfo #保存物料(外仓配置) outNotifyUrl:
outNotifyUrlPK: #http://172.30.170.148:8001/Sct/SaveReelInfo #PK发料保存(外仓配置) outNotifyUrlPK:
inNotifyUrl: #http://172.30.170.148:8082/SmtAutoWH/Save2DReelInfo #保存物料(内仓配置) inNotifyUrl:
fetchOrderUrl: #http://172.30.170.148:8082/SmtAutoWH/GetWoPickingList #获取工单 fetchOrderUrl:
barcodeInfoUrl: #http://172.30.170.148:8001/Sct/GetReelInfo #mes数量 barcodeInfoUrl:
fetchGRUrl: #http://10.42.25.199:8082/api/wcs/fetchGR #gr标签 fetchGRUrl:
brandQtyUrl: #http://172.30.170.199:8082/api/wcs/brandQty #gr标签满卷数 brandQtyUrl:
importUrl: #http://172.30.150.83:8001/smf-core/ext/forward/getDataLogs #内仓导入外仓picking虚拟仓数据 importUrl: http://10.68.27.83/smf-core/ext/getDatalogs #虚拟仓从1F导入数据接口
checkReelMeasure: #http://172.30.60.117:8001/Sct/CheckReelMeasure #外仓散料仓量测接口 checkReelMeasure:
getInDateUrl: http://172.30.170.199:8082/api/Mes/GetInDate getInDateUrl:
plant: W337 plant:
werks: W337 werks:
outerFactory: B15 outerFactory:
#缺料预警对应的地址 #缺料预警对应的地址
lizhen: lizhen:
F2: F2:
name: 2F name: 1F
line: A05-2FSMT-16S,A05-2FSMT-17S,A05-2FSMT-06S,A05-2FSMT-07S line: C03-1FSMT-01,C03-1FSMT-11,C03-1FSMT-02,C03-1FSMT-12
url: http://172.30.88.19:8001/smf-core/api/Mes/machineCallMaterial url: http://127.0.0.1/smf-core/api/Mes/machineCallMaterial
F3: F3:
name: 3F name:
line: A05-3FSMT-04S,A05-3FSMT-14S,A05-3FSMT-15S,A05-3FSMT-05S line:
url: http://172.30.97.99:8001/smf-core/api/Mes/machineCallMaterial url:
F5: F5:
name: 5F name:
line: A05-5FSMT-13S,A05-5FSMT-03S,A05-5FSMT-02S,A05-5FSMT-12S,A05-5FSMT-01S,A05-5FSMT-11S #,A05-5FARF-06 line:
url: http://172.30.97.63:8001/smf-core/api/Mes/machineCallMaterial url:
#转发地址 #转发地址
forward: forward:
f2: f2:
name: 2F name:
url: http://172.30.88.19:8001/smf-core url:
f3: f3:
name: 3F name:
url: http://172.30.97.99:8001/smf-core url:
f5: f5:
name: 5F name:
url: http://172.30.97.63:8001/smf-core url:
b15: b15:
name: B15 name:
url: http://10.42.176.209:8001/smf-core url:
#url: http://10.42.23.23:8001/smf-core
...@@ -90,5 +84,5 @@ app: ...@@ -90,5 +84,5 @@ app:
type: "" type: ""
menu: menu:
show: #expiredMaintenance show: imDetailsReport,feeding,virWarehous
hide: hide:
\ No newline at end of file \ No newline at end of file
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!