Skip to content

孙克 / smf-core

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

工单颜色

1 个父辈 43c924a5
内嵌 并排
正在显示 5 个修改的文件 包含 21 行增加 和 7 行删除
pom.xml
...@@ -15,9 +15,9 @@ ...@@ -15,9 +15,9 @@
<name>smf-core</name> <name>smf-core</name>
<description>SMF project for Spring Boot</description> <description>SMF project for Spring Boot</description>
<properties> <properties>
<maven.build.timestamp.format>MMd</maven.build.timestamp.format> <maven.build.timestamp.format>M.dd</maven.build.timestamp.format>
<main.version>1.${maven.build.timestamp}</main.version> <main.version>1.${maven.build.timestamp}</main.version>
<app.version>${main.version}.${current.time}</app.version> <app.version>${main.version}${current.time}</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>
<!-- oshi监控需要指定jna版本, 问题详见 https://github.com/oshi/oshi/issues/1040 --> <!-- oshi监控需要指定jna版本, 问题详见 https://github.com/oshi/oshi/issues/1040 -->
......
src/main/java/com/neotel/smfcore/common/bean/ResultBean.java
...@@ -44,7 +44,7 @@ public class ResultBean<T> { ...@@ -44,7 +44,7 @@ public class ResultBean<T> {
ResultBean result = new ResultBean(); ResultBean result = new ResultBean();
result.setCode(0); result.setCode(0);
result.setMsgKey(msgKey); result.setMsgKey(msgKey);
result.setMsg(MessageUtils.getText(msgKey, new String[]{}, new Locale(SecurityUtils.getCurrentUserLanguage()), msg)); result.setMsg(MessageUtils.getText(msgKey, params, new Locale(SecurityUtils.getCurrentUserLanguage()), msg));
result.setData(data); result.setData(data);
return result; return result;
} }
......
src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java
...@@ -73,6 +73,10 @@ public class LiteOrderCache implements ITaskListener { ...@@ -73,6 +73,10 @@ public class LiteOrderCache implements ITaskListener {
currentColors.add(dataLog.getLightColor()); currentColors.add(dataLog.getLightColor());
} }
ORDER_COLOR nextColor = ORDER_COLOR.nextColor(currentColors); ORDER_COLOR nextColor = ORDER_COLOR.nextColor(currentColors);
if (nextColor == null) {
log.info("执行工单[" + liteOrder.getOrderNo() + "] 时,已达最大可执行工单数");
throw new ValidateException("order.out.maxOrder","已达最大可执行工单数");
}
//其他出库模式一次性全部生成任务 //其他出库模式一次性全部生成任务
List<StoragePos> lockPosList = storagePosManager.findLockPos(liteOrder.getOrderNo()); List<StoragePos> lockPosList = storagePosManager.findLockPos(liteOrder.getOrderNo());
if(lockPosList==null){ if(lockPosList==null){
......
src/main/java/com/neotel/smfcore/core/order/enums/ORDER_COLOR.java
...@@ -83,6 +83,14 @@ public enum ORDER_COLOR { ...@@ -83,6 +83,14 @@ public enum ORDER_COLOR {
return color; return color;
} }
} }
//找不到最大的,就使用未使用过的
for (ORDER_COLOR color : allColors){
if(!excludeColors.contains(color.getRgb())){
currentColorIndex = color.ordinal();
return color;
}
}
return null; return null;
} }
} }
src/main/java/com/neotel/smfcore/hella/handler/HellaServiceHandler.java
...@@ -392,7 +392,7 @@ public class HellaServiceHandler extends IoHandlerAdapter implements ITaskListen ...@@ -392,7 +392,7 @@ public class HellaServiceHandler extends IoHandlerAdapter implements ITaskListen
Collection<String> excludePosIds = new ArrayList<>(); Collection<String> excludePosIds = new ArrayList<>();
String resultCode = "0"; String resultCode = "0";
String resultMsg = ""; String resultMsg = "OK";
String resultDataStr = ""; String resultDataStr = "";
for (LiteOrderItem liteOrderItem : liteOrder.getOrderItems()) { for (LiteOrderItem liteOrderItem : liteOrder.getOrderItems()) {
int reelCount = liteOrderItem.getNeedReelCount(); int reelCount = liteOrderItem.getNeedReelCount();
...@@ -425,7 +425,7 @@ public class HellaServiceHandler extends IoHandlerAdapter implements ITaskListen ...@@ -425,7 +425,7 @@ public class HellaServiceHandler extends IoHandlerAdapter implements ITaskListen
resultCode = "-1"; resultCode = "-1";
resultMsg = "Some material not on the shelf"; resultMsg = "Some material not on the shelf";
for (int i=0;i<notFoundReelCount;i++){ for (int i=0;i<notFoundReelCount;i++){
resultDataStr = resultDataStr + ";" + pn + "NOT_FOUND;0"; resultDataStr = resultDataStr + ";" + pn + ";NOT_FOUND;0";
} }
} }
} }
...@@ -435,9 +435,11 @@ public class HellaServiceHandler extends IoHandlerAdapter implements ITaskListen ...@@ -435,9 +435,11 @@ public class HellaServiceHandler extends IoHandlerAdapter implements ITaskListen
} }
//<STX>orderMaterialExtResp;eventId;returnCode;messageText;workorderNumber;currentWorkorderflag;reflowgroupNumber;numberofPartnumbers;partNumber1;containerNumber;quantity;…;partNumberN;containerNumberN;quantityN<CR><LF> //<STX>orderMaterialExtResp;eventId;returnCode;messageText;workorderNumber;currentWorkorderflag;reflowgroupNumber;numberofPartnumbers;partNumber1;containerNumber;quantity;…;partNumberN;containerNumberN;quantityN<CR><LF>
//<STX>orderMaterialExtResp;1;0;OK;61598;1;325.618-01;3;790.130-13;abcde;3000; 790.131-01;abcdf;5000;790.131-01;abcdg;2580<CR><LF> //<STX>orderMaterialExtResp;1;0;OK;61598;1;325.618-01;3;790.130-13;abcde;3000; 790.131-01;abcdf;5000;790.131-01;abcdg;2580<CR><LF>
String respMsg = "orderMaterialExtResp;"+ eventId+";" + resultCode+";"+resultMsg+";"+workorderNumber+";"+currentWorkorderflag+";"+reflowgroupNumber+";"+numberofPartnumbers + resultDataStr; //orderMaterialExtResp;0;-1;Some material not on the shelf;1408;1;325.618-01;1;;791.704-06NOT_FOUND;0
//<STX>orderMaterialExtResp;eventId;returnCode;messageText;workorderNumber;currentWorkorderflag;reflowgroupNumber;numberofPartnumbers;partNumber1;containerNumber;quantity;…;partNumberN;containerNumberN;quantityN<CR><LF>
String respMsg = "orderMaterialExtResp;"+ eventId+";" + resultCode+";"+resultMsg+";"+workorderNumber+";"+currentWorkorderflag+";"+reflowgroupNumber+";"+numberofPartnumbers +";" +resultDataStr;
log.info("工单结果:" + respMsg); log.info("工单结果:" + respMsg);
session.write(respMsg); session.write("\02"+respMsg);
} }
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!