Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 66a0239c 由 孙克
选项

更改dataCache.getCache(的类型错误

1 个父辈 5de0ed11
内嵌 并排
正在显示 10 个修改的文件 包含 27 行增加 和 12 行删除
src/main/java/com/neotel/smfcore/core/device/handler/impl/MimoBoxHandler.java
...@@ -124,7 +124,8 @@ public class MimoBoxHandler extends BaseDeviceHandler { ...@@ -124,7 +124,8 @@ public class MimoBoxHandler extends BaseDeviceHandler {
public StatusBean outSingleOutTask(Storage storage, StatusBean statusBean) { public StatusBean outSingleOutTask(Storage storage, StatusBean statusBean) {
try { try {
//准备更新暂停出入库 //准备更新暂停出入库
if (dataCache.getCache(Constants.CACHE_StopOut)) { Boolean stopOut = dataCache.getCache(Constants.CACHE_StopOut);
if (stopOut) {
return statusBean; return statusBean;
} }
String cid = storage.getCid(); String cid = storage.getCid();
......
src/main/java/com/neotel/smfcore/core/device/handler/impl/MimoG2BoxHandler.java
...@@ -109,7 +109,8 @@ public class MimoG2BoxHandler extends BaseDeviceHandler { ...@@ -109,7 +109,8 @@ public class MimoG2BoxHandler extends BaseDeviceHandler {
public StatusBean outSingleOutTask(Storage storage, StatusBean statusBean) { public StatusBean outSingleOutTask(Storage storage, StatusBean statusBean) {
try { try {
//准备更新暂停出入库 //准备更新暂停出入库
if (dataCache.getCache(Constants.CACHE_StopOut)) { Boolean stopOut = dataCache.getCache(Constants.CACHE_StopOut);
if (stopOut) {
return statusBean; return statusBean;
} }
String cid = storage.getCid(); String cid = storage.getCid();
......
src/main/java/com/neotel/smfcore/core/device/handler/impl/MimoG3BoxHandler.java
...@@ -108,7 +108,9 @@ public class MimoG3BoxHandler extends BaseDeviceHandler{ ...@@ -108,7 +108,9 @@ public class MimoG3BoxHandler extends BaseDeviceHandler{
public StatusBean outSingleOutTask(Storage storage, StatusBean statusBean) { public StatusBean outSingleOutTask(Storage storage, StatusBean statusBean) {
try { try {
//准备更新暂停出入库 //准备更新暂停出入库
if (dataCache.getCache(Constants.CACHE_StopOut)) {
Boolean stopOut = dataCache.getCache(Constants.CACHE_StopOut);
if (stopOut) {
return statusBean; return statusBean;
} }
String cid = storage.getCid(); String cid = storage.getCid();
......
src/main/java/com/neotel/smfcore/core/device/handler/impl/RobotBoxHandler.java
...@@ -100,7 +100,9 @@ public class RobotBoxHandler extends BaseDeviceHandler { ...@@ -100,7 +100,9 @@ public class RobotBoxHandler extends BaseDeviceHandler {
public StatusBean findCheckOutTask(Storage storage, StatusBean statusBean) { public StatusBean findCheckOutTask(Storage storage, StatusBean statusBean) {
try { try {
//准备更新暂停出入库 //准备更新暂停出入库
if (dataCache.getCache(Constants.CACHE_StopOut)) {
Boolean stopOut = dataCache.getCache(Constants.CACHE_StopOut);
if (stopOut) {
return statusBean; return statusBean;
} }
...@@ -290,7 +292,9 @@ public class RobotBoxHandler extends BaseDeviceHandler { ...@@ -290,7 +292,9 @@ public class RobotBoxHandler extends BaseDeviceHandler {
String lineMsg = ""; String lineMsg = "";
log.info("流水线[" + cids + "]获取[" + code + "]的入库库位"); log.info("流水线[" + cids + "]获取[" + code + "]的入库库位");
Map<String, Object> resultMap = Maps.newHashMap(); Map<String, Object> resultMap = Maps.newHashMap();
if (dataCache.getCache(Constants.CACHE_StopOut)) {
Boolean stopOut = dataCache.getCache(Constants.CACHE_StopOut);
if (stopOut) {
// lineMsg = "系统更新中,暂停出入库"; // lineMsg = "系统更新中,暂停出入库";
lineMsg="System update in progress, suspend the inlet and outlet"; lineMsg="System update in progress, suspend the inlet and outlet";
DeviceMessageUtil.updateLineMsg(lineMsg,code,cids,"" ,"smfcore.linemsg.update",null); DeviceMessageUtil.updateLineMsg(lineMsg,code,cids,"" ,"smfcore.linemsg.update",null);
......
src/main/java/com/neotel/smfcore/core/device/handler/impl/ThirdBoxHandler.java
...@@ -80,7 +80,8 @@ public class ThirdBoxHandler extends BaseDeviceHandler{ ...@@ -80,7 +80,8 @@ public class ThirdBoxHandler extends BaseDeviceHandler{
public StatusBean findCheckOutTask(Storage storage, StatusBean statusBean) { public StatusBean findCheckOutTask(Storage storage, StatusBean statusBean) {
try { try {
//准备更新暂停出入库 //准备更新暂停出入库
if (dataCache.getCache(Constants.CACHE_StopOut)) { Boolean stopOut = dataCache.getCache(Constants.CACHE_StopOut);
if (stopOut) {
return statusBean; return statusBean;
} }
//如果当前有barcode，暂时不发出库任务 //如果当前有barcode，暂时不发出库任务
......
src/main/java/com/neotel/smfcore/core/device/handler/impl/XLRBoxHandler.java
...@@ -104,7 +104,9 @@ public class XLRBoxHandler extends BaseDeviceHandler { ...@@ -104,7 +104,9 @@ public class XLRBoxHandler extends BaseDeviceHandler {
public StatusBean checkOut(Storage storage, StatusBean statusBean) { public StatusBean checkOut(Storage storage, StatusBean statusBean) {
try { try {
//准备更新暂停出入库 //准备更新暂停出入库
if (dataCache.getCache(Constants.CACHE_StopOut)) {
Boolean stopOut = dataCache.getCache(Constants.CACHE_StopOut);
if (stopOut) {
return statusBean; return statusBean;
} }
String cid = storage.getCid(); String cid = storage.getCid();
......
src/main/java/com/neotel/smfcore/core/device/rest/DeviceController.java
...@@ -51,7 +51,6 @@ import org.springframework.web.bind.annotation.*; ...@@ -51,7 +51,6 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.*; import java.util.*;
import java.util.List;
@Slf4j @Slf4j
...@@ -192,7 +191,8 @@ public class DeviceController { ...@@ -192,7 +191,8 @@ public class DeviceController {
log.info("流水线[" + cids + "]获取[" + rfid + "][" + code + "]的入库库位"); log.info("流水线[" + cids + "]获取[" + rfid + "][" + code + "]的入库库位");
Map<String, Object> resultMap = Maps.newHashMap(); Map<String, Object> resultMap = Maps.newHashMap();
if (dataCache.getCache(Constants.CACHE_StopOut)) { Boolean stopOut = dataCache.getCache(Constants.CACHE_StopOut);
if (stopOut) {
lineMsg = MessageUtils.getText("smfcore.linemsg.update", MessageUtils.getDefaultLocal(), "系统更新中,暂停出入库"); lineMsg = MessageUtils.getText("smfcore.linemsg.update", MessageUtils.getDefaultLocal(), "系统更新中,暂停出入库");
DeviceMessageUtil.updateLineMsg(lineMsg,code,cids,"" ,"smfcore.linemsg.update",null); DeviceMessageUtil.updateLineMsg(lineMsg,code,cids,"" ,"smfcore.linemsg.update",null);
resultMap.put("result", "100"); resultMap.put("result", "100");
......
src/main/java/com/neotel/smfcore/core/device/rest/DualPosNameDeviceController.java
...@@ -88,7 +88,8 @@ public class DualPosNameDeviceController { ...@@ -88,7 +88,8 @@ public class DualPosNameDeviceController {
log.info("流水线[" + cids + "]获取[" + rfid + "][" + code + "]的入库库位"); log.info("流水线[" + cids + "]获取[" + rfid + "][" + code + "]的入库库位");
Map<String, Object> resultMap = Maps.newHashMap(); Map<String, Object> resultMap = Maps.newHashMap();
if (dataCache.getCache(Constants.CACHE_StopOut)) { Boolean stopOut = dataCache.getCache(Constants.CACHE_StopOut);
if (stopOut) {
lineMsg = MessageUtils.getText("smfcore.linemsg.update", MessageUtils.getDefaultLocal(), "系统更新中,暂停出入库"); lineMsg = MessageUtils.getText("smfcore.linemsg.update", MessageUtils.getDefaultLocal(), "系统更新中,暂停出入库");
DeviceMessageUtil.updateLineMsg(lineMsg, code, cids, "", "smfcore.linemsg.update", null); DeviceMessageUtil.updateLineMsg(lineMsg, code, cids, "", "smfcore.linemsg.update", null);
resultMap.put("result", "100"); resultMap.put("result", "100");
......
src/main/java/com/neotel/smfcore/core/system/util/TaskService.java
...@@ -522,7 +522,8 @@ public class TaskService { ...@@ -522,7 +522,8 @@ public class TaskService {
public StatusBean checkOut(Storage storage, StatusBean statusBean) { public StatusBean checkOut(Storage storage, StatusBean statusBean) {
try { try {
//准备更新暂停出入库 //准备更新暂停出入库
if (dataCache.getCache(Constants.CACHE_StopOut)) { Boolean stopOut = dataCache.getCache(Constants.CACHE_StopOut);
if (stopOut) {
return statusBean; return statusBean;
} }
String cid = storage.getCid(); String cid = storage.getCid();
......
src/main/java/com/neotel/smfcore/custom/keboda1335/KebodaController.java
...@@ -84,7 +84,9 @@ public class KebodaController { ...@@ -84,7 +84,9 @@ public class KebodaController {
log.info("流水线[" + cids + "]获取[" + rfid + "][" + code + "]的入库库位"); log.info("流水线[" + cids + "]获取[" + rfid + "][" + code + "]的入库库位");
Map<String, Object> resultMap = Maps.newHashMap(); Map<String, Object> resultMap = Maps.newHashMap();
if (dataCache.getCache(Constants.CACHE_StopOut)) {
Boolean stopOut = dataCache.getCache(Constants.CACHE_StopOut);
if (stopOut) {
lineMsg = "系统更新中,暂停出入库"; lineMsg = "系统更新中,暂停出入库";
DeviceMessageUtil.updateLineMsg(lineMsg, code, cids, "", "smfcore.linemsg.update", null); DeviceMessageUtil.updateLineMsg(lineMsg, code, cids, "", "smfcore.linemsg.update", null);
resultMap.put("result", "100"); resultMap.put("result", "100");
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!