Skip to content

孙克 / smf-core

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

1.转发差异料功能提交

1 个父辈 7073dbbc
内嵌 并排
正在显示 8 个修改的文件 包含 162 行增加 和 54 行删除
src/main/java/com/neotel/smfcore/common/init/DataInitManager.java
...@@ -228,6 +228,9 @@ public class DataInitManager { ...@@ -228,6 +228,9 @@ public class DataInitManager {
//呼叫空箱 //呼叫空箱
addNewFunctionMenu(7, manual, "getEmpty", "呼叫空箱", "getEmpty", "neolight/getEmpty/index", "getEmpty", functionMenuMap); addNewFunctionMenu(7, manual, "getEmpty", "呼叫空箱", "getEmpty", "neolight/getEmpty/index", "getEmpty", functionMenuMap);
//退料
addNewFunctionMenu(8, manual, "manualReturn", "退料", "manualReturn", "manualReturn/index", "manualReturn", functionMenuMap);
Menu doc = Menu.CreatePMenu("单据操作", 5, "doc", 1, "docOp", raw); Menu doc = Menu.CreatePMenu("单据操作", 5, "doc", 1, "docOp", raw);
......
src/main/java/com/neotel/smfcore/custom/lizhen/kanban/common/KanbanUtils.java
...@@ -19,13 +19,10 @@ import java.util.*; ...@@ -19,13 +19,10 @@ import java.util.*;
@Slf4j @Slf4j
public class KanbanUtils { public class KanbanUtils {
private static String F2;
private static String F3; private static String F3;
private static String F5; private static String F5;
private static String F4;
private static IDataLogManager dataLogManager; private static IDataLogManager dataLogManager;
...@@ -158,14 +155,10 @@ public class KanbanUtils { ...@@ -158,14 +155,10 @@ public class KanbanUtils {
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 f4Line = dataCache.getCache("F4Line").toString(); String f4Line = dataCache.getCache("F4Line").toString();
if (F2.equals(floor)) { if (F3.equals(floor)) {
lineList = new ArrayList<>(Arrays.asList(f2Line.split(",")));
} else if (F3.equals(floor)) {
lineList = new ArrayList<>(Arrays.asList(f3Line.split(","))); lineList = new ArrayList<>(Arrays.asList(f3Line.split(",")));
} else if (F5.equals(floor)) { } else if (F5.equals(floor)) {
lineList = new ArrayList<>(Arrays.asList(f5Line.split(","))); lineList = new ArrayList<>(Arrays.asList(f5Line.split(",")));
} else if (F4.equals(floor)) {
lineList = new ArrayList<>(Arrays.asList(f4Line.split(",")));
} }
return lineList; return lineList;
} }
...@@ -190,10 +183,10 @@ public class KanbanUtils { ...@@ -190,10 +183,10 @@ public class KanbanUtils {
this.inOutDataManager = manager; this.inOutDataManager = manager;
} }
@Value("${lizhen.F2.name}") /*@Value("${lizhen.F2.name}")
private void setF2Floor(String floor) { private void setF2Floor(String floor) {
F2 = floor; F2 = floor;
} }*/
@Value("${lizhen.F3.name}") @Value("${lizhen.F3.name}")
private void setF3Floor(String floor) { private void setF3Floor(String floor) {
...@@ -205,8 +198,8 @@ public class KanbanUtils { ...@@ -205,8 +198,8 @@ public class KanbanUtils {
F5 = floor; F5 = floor;
} }
@Value("${lizhen.F4.name}") /*@Value("${lizhen.F4.name}")
private void setF4Floor(String floor) { private void setF4Floor(String floor) {
F4 = floor; F4 = floor;
} }*/
} }
src/main/java/com/neotel/smfcore/custom/lizhen/kanban/utils/AgvStatusCache.java
...@@ -21,9 +21,6 @@ import java.util.concurrent.CopyOnWriteArrayList; ...@@ -21,9 +21,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
@RestController @RestController
public class AgvStatusCache { public class AgvStatusCache {
@Value("${lizhen.F2.name}")
private String F2;
@Value("${lizhen.F3.name}") @Value("${lizhen.F3.name}")
private String F3; private String F3;
...@@ -73,7 +70,7 @@ public class AgvStatusCache { ...@@ -73,7 +70,7 @@ public class AgvStatusCache {
public ResultBean getAgvInfoBySource(String floor) { public ResultBean getAgvInfoBySource(String floor) {
List<String> locList = new ArrayList<>(); List<String> locList = new ArrayList<>();
List<String> locCnList = new ArrayList<>(); List<String> locCnList = new ArrayList<>();
if (F2.equals(floor) || F3.equals(floor) || F5.equals(floor)) { if (F3.equals(floor) || F5.equals(floor)) {
locList = KanbanUtils.getLineByFloor(floor); locList = KanbanUtils.getLineByFloor(floor);
locList.addAll(getLocByType(0)); locList.addAll(getLocByType(0));
locCnList = KanbanUtils.getLineByFloor(floor); locCnList = KanbanUtils.getLineByFloor(floor);
......
src/main/java/com/neotel/smfcore/custom/lizhen/report/inner/InnerReportController.java
...@@ -61,9 +61,6 @@ import java.util.stream.Collectors; ...@@ -61,9 +61,6 @@ import java.util.stream.Collectors;
@RestController @RestController
public class InnerReportController { public class InnerReportController {
@Value("${lizhen.F2.name}")
private String F2;
@Value("${lizhen.F3.name}") @Value("${lizhen.F3.name}")
private String F3; private String F3;
...@@ -184,15 +181,12 @@ public class InnerReportController { ...@@ -184,15 +181,12 @@ public class InnerReportController {
String floor = dataCache.getCache(Constants.CACHE_floor); String floor = dataCache.getCache(Constants.CACHE_floor);
Map<String, String> resultMap = new LinkedHashMap<>(); Map<String, String> resultMap = new LinkedHashMap<>();
if (StringUtils.isNotBlank(floor)) { if (StringUtils.isNotBlank(floor)) {
if (F2.equals(floor)) { if (F3.equals(floor)) {
resultMap.put(F2, F2);
} else if (F3.equals(floor)) {
resultMap.put(F3, F3); resultMap.put(F3, F3);
} else if (F5.equals(floor)) { } else if (F5.equals(floor)) {
resultMap.put(F5, F5); resultMap.put(F5, F5);
} }
} else { } else {
resultMap.put(F2, F2);
resultMap.put(F3, F3); resultMap.put(F3, F3);
resultMap.put(F5, F5); resultMap.put(F5, F5);
} }
...@@ -208,9 +202,7 @@ public class InnerReportController { ...@@ -208,9 +202,7 @@ public class InnerReportController {
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 (F3.equals(floor)) {
resultLine = f2Line;
} else if (F3.equals(floor)) {
resultLine = f3Line; resultLine = f3Line;
} else if (F5.equals(floor)) { } else if (F5.equals(floor)) {
resultLine = f5Line; resultLine = f5Line;
......
src/main/java/com/neotel/smfcore/custom/lizhen/wcs/LineUtil.java 0 → 100644
package com.neotel.smfcore.custom.lizhen.wcs;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@Service
public class LineUtil {
//Bg线体
@Value("${lizhen.F3.line}")
private String bgLine;
//BG差异料地址
@Value("${lizhen.F3.differenceUrl}")
private String bgDifferenceUrl;
//cg线体
@Value("${lizhen.F5.line}")
private String cgLine;
//CG差异料地址
@Value("${lizhen.F5.differenceUrl}")
private String cgDifferenceUrl;
//cg线体
@Value("${lizhen.C31F.line}")
private String c31fLine;
//CG差异料地址
@Value("${lizhen.C31F.differenceUrl}")
private String c31fDifferenceUrl;
public String getDifferentUrl(String gidLineSide) {
//从BG线挑
String[] bgSpl = bgLine.split(",");
for (String line : bgSpl) {
if (gidLineSide.startsWith(line)) {
return bgDifferenceUrl;
}
}
String[] cgSpl = cgLine.split(",");
for (String line : cgSpl) {
if (gidLineSide.startsWith(line)) {
return cgDifferenceUrl;
}
}
String[] c31fSpl = c31fLine.split(",");
for (String line : c31fSpl) {
if (gidLineSide.startsWith(line)) {
return c31fDifferenceUrl;
}
}
return "";
}
}
src/main/java/com/neotel/smfcore/custom/lizhen/wcs/LizhenController.java
...@@ -25,6 +25,7 @@ import com.neotel.smfcore.core.system.service.po.DataLog; ...@@ -25,6 +25,7 @@ import com.neotel.smfcore.core.system.service.po.DataLog;
import com.neotel.smfcore.custom.lizhen.innerBox.bean.PreWarningItem; import com.neotel.smfcore.custom.lizhen.innerBox.bean.PreWarningItem;
import com.neotel.smfcore.custom.lizhen.innerBox.util.PreWarningItemCache; import com.neotel.smfcore.custom.lizhen.innerBox.util.PreWarningItemCache;
import com.neotel.smfcore.custom.lizhen.third.maicheng.bean.AskReelBoxList; import com.neotel.smfcore.custom.lizhen.third.maicheng.bean.AskReelBoxList;
import com.neotel.smfcore.custom.lizhen.wcs.bean.DifferentMaterial;
import com.neotel.smfcore.custom.lizhen.wcs.bean.ManualTower; import com.neotel.smfcore.custom.lizhen.wcs.bean.ManualTower;
import com.neotel.smfcore.custom.luxsan.api.LuxsanApi; import com.neotel.smfcore.custom.luxsan.api.LuxsanApi;
import com.neotel.smfcore.custom.luxsan.factory_c.common.bean.result.WcsResult; import com.neotel.smfcore.custom.luxsan.factory_c.common.bean.result.WcsResult;
...@@ -67,13 +68,10 @@ public class LizhenController { ...@@ -67,13 +68,10 @@ public class LizhenController {
private ILiteOrderItemManager liteOrderItemManager; private ILiteOrderItemManager liteOrderItemManager;
@Autowired @Autowired
private CodeResolve codeResolve; private LineUtil lineUtil;
@Value("${lizhen.F2.line}")
private String F2Line;
@Value("${lizhen.F2.url}") @Autowired
private String F2Url; private CodeResolve codeResolve;
@Value("${lizhen.F3.line}") @Value("${lizhen.F3.line}")
private String F3Line; private String F3Line;
...@@ -87,12 +85,6 @@ public class LizhenController { ...@@ -87,12 +85,6 @@ public class LizhenController {
@Value("${lizhen.F5.url}") @Value("${lizhen.F5.url}")
private String F5Url; private String F5Url;
@Value("${lizhen.F4.line}")
private String F4Line;
@Value("${lizhen.F4.url}")
private String F4Url;
@Value("${lizhen.manual.url}") @Value("${lizhen.manual.url}")
private String manualTowerUrl; private String manualTowerUrl;
...@@ -104,20 +96,14 @@ public class LizhenController { ...@@ -104,20 +96,14 @@ public class LizhenController {
//初始化加载需要配送的地址 //初始化加载需要配送的地址
@PostConstruct @PostConstruct
public void init() { public void init() {
F2Line = dataCache.getConfigCache("F2Line", F2Line);
F2Url = dataCache.getConfigCache("F2Url", F2Url);
F3Line = dataCache.getConfigCache("F3Line", F3Line); F3Line = dataCache.getConfigCache("F3Line", F3Line);
F3Url = dataCache.getConfigCache("F3Url", F3Url); F3Url = dataCache.getConfigCache("F3Url", F3Url);
F5Line = dataCache.getConfigCache("F5Line", F5Line); F5Line = dataCache.getConfigCache("F5Line", F5Line);
F5Url = dataCache.getConfigCache("F5Url", F5Url); F5Url = dataCache.getConfigCache("F5Url", F5Url);
F4Line = dataCache.getConfigCache("F4Line", F4Line);
F4Url = dataCache.getConfigCache("F4Url", F4Url);
manualTowerUrl = dataCache.getConfigCache("manualTowerUrl", manualTowerUrl); manualTowerUrl = dataCache.getConfigCache("manualTowerUrl", manualTowerUrl);
manualCgTowerUrl = dataCache.getConfigCache("manualCgTowerUrl", manualCgTowerUrl); manualCgTowerUrl = dataCache.getConfigCache("manualCgTowerUrl", manualCgTowerUrl);
lineUrlMap.put(F2Line, F2Url);
lineUrlMap.put(F3Line, F3Url); lineUrlMap.put(F3Line, F3Url);
lineUrlMap.put(F5Line, F5Url); lineUrlMap.put(F5Line, F5Url);
lineUrlMap.put(F4Line, F4Url);
} }
...@@ -395,6 +381,37 @@ public class LizhenController { ...@@ -395,6 +381,37 @@ public class LizhenController {
} }
@ApiOperation("mes抛送差异料")
@RequestMapping("/differentMaterial")
@AnonymousAccess
public ResultBean differentMaterial(@RequestBody List<DifferentMaterial> differentMaterialList) throws ApiException {
log.info("收到差异料信息为:" + JSON.toJSONString(differentMaterialList));
String line = "";
for (DifferentMaterial differentMaterial : differentMaterialList) {
String gidLineSide = differentMaterial.getGidLineSide();
if (StringUtils.isNotEmpty(gidLineSide)) {
line = gidLineSide;
break;
}
}
log.info("获取到的线体为:" + line);
//找对应的地址
String differentUrl = lineUtil.getDifferentUrl(line);
log.info("[{}]获取到的地址为:[{}]", line, differentUrl);
if (StringUtils.isEmpty(differentUrl)){
return ResultBean.newErrorResult(-1,"","请检查线体:"+line+"是否正确");
}
String resultStr = HttpHelper.postJson(differentUrl, differentMaterialList);
log.info("差异料转发结果为:"+resultStr);
if (!"\"\"".equals(resultStr)) {
return ResultBean.newErrorResult(-1, "", resultStr);
}
return ResultBean.newOkResult("");
}
private String getForwardUrl(String line) { private String getForwardUrl(String line) {
......
src/main/java/com/neotel/smfcore/custom/lizhen/wcs/bean/DifferentMaterial.java 0 → 100644
package com.neotel.smfcore.custom.lizhen.wcs.bean;
import lombok.Data;
@Data
public class DifferentMaterial {
/**
* wo;//工单
* mc;//机台
* ipn;//物料
* zone;//站位
* gidLineSide;//线_Line_面
*/
private String mo;
private String mc;
private String ipn;
private String zone;
private String gidLineSide;
/*
[
{
"wo": "030000248583",
"mc": "NPM-2",
"ipn": "377S00070",
"zone": "1-07-L",
"gidLineSide": "A05-5FRF-01_1A_B"
},
{
"wo": "030000248583",
"mc": "NPM-2",
"ipn": "117S00069$YA0A01B5",
"zone": "1-08-L",
"gidLineSide": "A05-5FRF-01_1A_B"
},
{
"wo": "030000248583",
"mc": "NPM-2",
"ipn": "N/A",
"zone": "1-10",
"gidLineSide": "A05-5FRF-01_1B_T"
}
]
*/
}
src/main/resources/config/application.yml
...@@ -27,22 +27,23 @@ bc: ...@@ -27,22 +27,23 @@ bc:
#缺料预警对应的地址 #缺料预警对应的地址
lizhen: lizhen:
F2:
name: #2F
line: #A05-2FSMT-16S,A05-2FSMT-17S,A05-2FSMT-06S,A05-2FSMT-07S
url: #http://172.30.88.19:8001/smf-core/api/Mes/machineCallMaterial
F3: F3:
name: 3F name: 3F
line: C03-3FSMT-13,C02-3FSMT-12,C02-3FSMT-18,C02-3FSMT-19,C03-1FSMT-12,C02-3FSMT-11,C03-1FSMT-11,C02-3FSMT-17,C02-3FSMT-14,C03-1FSMT-12,C02-3FSMT-13,C02-3FSMT-16,C02-3FSMT-15,C02-3FSMT-19 line: C02-3FSMT-13,C02-3FSMT-14,C02-3FSMT-15,C02-3FSMT-16,C02-3FSMT-17,C02-3FSMT-19,C02-3FSMT-18
url: http://10.68.27.85/smf-core/wcs/machineCallMaterial url: http://10.68.27.85/smf-core/wcs/machineCallMaterial
differenceUrl: http://10.68.27.85/smf-core/api/Mes/differenceReel
F5: F5:
name: 3FCG name: 3FCG
line: C03-1FSMT-01,C02-3FSMT-02,C03-3FSMT-03,C02-3FSMT-09,C02-3FSMT-01,C03-1FSMT-02,C02-3FSMT-08,C02-3FSMT-06,C02-3FSMT-07,C02-3FSMT-04,C02-3FSMT-05,C02-3FSMT-03,C03-1FSMT-02 line: C02-3FSMT-03,C02-3FSMT-04,C02-3FSMT-05,C02-3FSMT-06,C02-3FSMT-07,C02-3FSMT-09,C02-3FSMT-08
url: http://10.68.27.79/smf-core/wcs/machineCallMaterial url: http://10.68.27.79/smf-core/wcs/machineCallMaterial
F4: differenceUrl: http://10.68.27.79/smf-core/api/Mes/differenceReel
name: #4F C31F:
line: #B03-4FSMT-11,B03-4FSMT-01,B03-4FSMT-13,B03-4FSMT-03,B03-4FSMT-14,B03-4FSMT-04 name: C31F
url: #http://172.25.252.12:8001/smf-core/api/Mes/machineCallMaterial line: C03-1FSMT-12,C03-1FSMT-02,C03-1FSMT-11,C03-1FSMT-01
differenceUrl: http://localhost:8803/api/Mes/differenceReel
#differenceUrl: http://10.68.27.90/smf-core/api/Mes/differenceReel
manual: manual:
url: http://10.68.27.85/smf-core/wcs/manualTower url: http://10.68.27.85/smf-core/wcs/manualTower
cgUrl: http://10.68.27.79/smf-core/wcs/manualTower cgUrl: http://10.68.27.79/smf-core/wcs/manualTower
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!