Skip to content

孙克 / smf-core

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

1.料架没有亮灯颜色,默认是blue--bug修复

1 个父辈 03ba02b4
内嵌 并排
正在显示 4 个修改的文件 包含 4 行增加 和 4 行删除
src/main/java/com/neotel/smfcore/core/device/handler/impl/AccShelfHandler.java
...@@ -60,7 +60,7 @@ public class AccShelfHandler extends BaseDeviceHandler{ ...@@ -60,7 +60,7 @@ public class AccShelfHandler extends BaseDeviceHandler{
for (DataLog task : for (DataLog task :
dataLogs) { dataLogs) {
if (StringUtils.isBlank(task.getLightColor())){ if (StringUtils.isBlank(task.getLightColor())){
task.setLightColor(ORDER_COLOR.BLUE.name()); task.setLightColor(ORDER_COLOR.BLUE.getRgb());
} }
String colorName = ORDER_COLOR.fromRgb(task.getLightColor()).name(); String colorName = ORDER_COLOR.fromRgb(task.getLightColor()).name();
statusBean.addData("open", task.getPosName() + "=" + colorName); statusBean.addData("open", task.getPosName() + "=" + colorName);
......
src/main/java/com/neotel/smfcore/core/device/handler/impl/NLMShelfHandler.java
...@@ -110,7 +110,7 @@ public class NLMShelfHandler extends BaseDeviceHandler { ...@@ -110,7 +110,7 @@ public class NLMShelfHandler extends BaseDeviceHandler {
dataLogs) { dataLogs) {
// statusBean.addData("open", task.getPosName() + "=" + ORDER_COLOR.fromRgb(task.getLightColor()).name()); // statusBean.addData("open", task.getPosName() + "=" + ORDER_COLOR.fromRgb(task.getLightColor()).name());
if (StringUtils.isBlank(task.getLightColor())){ if (StringUtils.isBlank(task.getLightColor())){
task.setLightColor(ORDER_COLOR.BLUE.name()); task.setLightColor(ORDER_COLOR.BLUE.getRgb());
} }
String color = ORDER_COLOR.fromRgb(task.getLightColor()).name(); String color = ORDER_COLOR.fromRgb(task.getLightColor()).name();
addMergeData(statusBean, task, "open", color); addMergeData(statusBean, task, "open", color);
......
src/main/java/com/neotel/smfcore/core/device/handler/impl/NLPShelfHandler.java
...@@ -247,7 +247,7 @@ public class NLPShelfHandler extends BaseDeviceHandler { ...@@ -247,7 +247,7 @@ public class NLPShelfHandler extends BaseDeviceHandler {
List<DataLog> dataLogs = getLightGuideTask(outMap,statusBean.getCid()); List<DataLog> dataLogs = getLightGuideTask(outMap,statusBean.getCid());
for (DataLog task : dataLogs) { for (DataLog task : dataLogs) {
if (StringUtils.isBlank(task.getLightColor())){ if (StringUtils.isBlank(task.getLightColor())){
task.setLightColor(ORDER_COLOR.BLUE.name()); task.setLightColor(ORDER_COLOR.BLUE.getRgb());
} }
String colorName = ORDER_COLOR.fromRgb(task.getLightColor()).name(); String colorName = ORDER_COLOR.fromRgb(task.getLightColor()).name();
statusBean.addData("open", task.getPosName() + "=" + colorName); statusBean.addData("open", task.getPosName() + "=" + colorName);
......
src/main/java/com/neotel/smfcore/core/device/handler/impl/NLShelfHandler.java
...@@ -120,7 +120,7 @@ public class NLShelfHandler extends BaseDeviceHandler { ...@@ -120,7 +120,7 @@ public class NLShelfHandler extends BaseDeviceHandler {
List<DataLog> dataLogs = getLightGuideTask(outMap,statusBean.getCid()); List<DataLog> dataLogs = getLightGuideTask(outMap,statusBean.getCid());
for (DataLog task : dataLogs) { for (DataLog task : dataLogs) {
if (StringUtils.isBlank(task.getLightColor())){ if (StringUtils.isBlank(task.getLightColor())){
task.setLightColor(ORDER_COLOR.BLUE.name()); task.setLightColor(ORDER_COLOR.BLUE.getRgb());
} }
String colorName = ORDER_COLOR.fromRgb(task.getLightColor()).name(); String colorName = ORDER_COLOR.fromRgb(task.getLightColor()).name();
statusBean.addData("open", task.getPosName() + "=" + colorName); statusBean.addData("open", task.getPosName() + "=" + colorName);
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!