Skip to content

孙克 / smf-core

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

Merge remote-tracking branch 'origin/master'

2 个父辈 5f4542ef b7cf7ea5
内嵌 并排
正在显示 12 个修改的文件 包含 27 行增加 和 3 行删除
src/main/java/com/neotel/smfcore/common/init/MenuInit.java
...@@ -202,9 +202,9 @@ public class MenuInit { ...@@ -202,9 +202,9 @@ public class MenuInit {
addDefaultFunctionMenu(111, pMenuUser,"用户管理", "peoples", "system/user/index", "peoples",DEFAULT_SHOW_MENU); addDefaultFunctionMenu(111, pMenuUser,"用户管理", "peoples", "system/user/index", "peoples",DEFAULT_SHOW_MENU);
addDefaultFunctionMenu(112, pMenuUser,"角色管理", "role", "system/role/index", "role",DEFAULT_SHOW_MENU); addDefaultFunctionMenu(112, pMenuUser,"角色管理", "role", "system/role/index", "role",DEFAULT_SHOW_MENU);
//条形码:条码管理,条码设置 //条形码:条码管理,条码设置
// Menu selfAudit = Menu.CreatePMenu("盘点管理", 12, "selfAuditManagerment", "selfAuditM",null); Menu selfAudit = Menu.CreatePMenu("盘点管理", 12, "selfAuditManagerment", "selfAuditM",null);
// addDefaultFunctionMenu(121,selfAudit, "盘点", "selfAudit", "system/selfAudit/index","selfAudit"); addDefaultFunctionMenu(121,selfAudit, "盘点", "selfAudit", "system/selfAudit/index","selfAudit");
// addDefaultFunctionMenu(122, selfAudit, "盘点记录","selfAuditLog", "system/selfAuditLog/index", "selfAuditLog"); addDefaultFunctionMenu(122, selfAudit, "盘点记录","selfAuditLog", "system/selfAuditLog/index", "selfAuditLog");
Menu helpAbout = Menu.CreatePMenu("帮助", 9999, "help", "help",null); Menu helpAbout = Menu.CreatePMenu("帮助", 9999, "help", "help",null);
addDefaultFunctionMenu(99991, helpAbout, "说明书", "instruction", "system/instruction/index","aboutBook"); addDefaultFunctionMenu(99991, helpAbout, "说明书", "instruction", "system/instruction/index","aboutBook");
......
src/main/java/com/neotel/smfcore/core/device/handler/impl/BaseDeviceHandler.java
...@@ -137,6 +137,7 @@ public class BaseDeviceHandler implements IDeviceHandler { ...@@ -137,6 +137,7 @@ public class BaseDeviceHandler implements IDeviceHandler {
statusBean.setClientIp(request.getRemoteHost()); statusBean.setClientIp(request.getRemoteHost());
handleMsg(statusBean); handleMsg(statusBean);
statusBean = saveAlarmAndHumidity(statusBean); statusBean = saveAlarmAndHumidity(statusBean);
statusBean=handleSelfAudit(statusBean);
// //
// if (storage.isSmdXl()) { // if (storage.isSmdXl()) {
...@@ -165,6 +166,19 @@ public class BaseDeviceHandler implements IDeviceHandler { ...@@ -165,6 +166,19 @@ public class BaseDeviceHandler implements IDeviceHandler {
// } // }
// } // }
statusBean=handleSelfAudit(statusBean);
return statusBean;
}
protected StatusBean handleSelfAudit(StatusBean statusBean) {
try {
String batchNo = dataCache.getCache(Constants.CACHE_SELFAUDIT_BATCHNO);
if (ObjectUtil.isNotEmpty(batchNo)) {
statusBean.addData("selfAudit", batchNo);
}
} catch (Exception ex) {
log.error("handleSelfAudit error:" + ex.getMessage());
}
return statusBean; return statusBean;
} }
......
src/main/java/com/neotel/smfcore/core/device/handler/impl/LineBoxHandler.java
...@@ -24,6 +24,7 @@ public class LineBoxHandler extends BaseDeviceHandler { ...@@ -24,6 +24,7 @@ public class LineBoxHandler extends BaseDeviceHandler {
} }
handleMsg(statusBean); handleMsg(statusBean);
statusBean = saveAlarmAndHumidity(statusBean); statusBean = saveAlarmAndHumidity(statusBean);
statusBean=handleSelfAudit(statusBean);
statusBean = handleInOutFinished(statusBean); statusBean = handleInOutFinished(statusBean);
StatusBean humidityResult = handleHumidity(statusBean); StatusBean humidityResult = handleHumidity(statusBean);
if (humidityResult != null) { if (humidityResult != null) {
......
src/main/java/com/neotel/smfcore/core/device/handler/impl/MimoBoxHandler.java
...@@ -58,6 +58,7 @@ public class MimoBoxHandler extends BaseDeviceHandler { ...@@ -58,6 +58,7 @@ public class MimoBoxHandler extends BaseDeviceHandler {
statusBean = saveAlarmAndHumidity(statusBean); statusBean = saveAlarmAndHumidity(statusBean);
statusBean = handleInOutFinished(statusBean); statusBean = handleInOutFinished(statusBean);
StatusBean humidityResult = handleHumidity(statusBean); StatusBean humidityResult = handleHumidity(statusBean);
statusBean=handleSelfAudit(statusBean);
if (humidityResult != null) { if (humidityResult != null) {
return humidityResult; return humidityResult;
} }
......
src/main/java/com/neotel/smfcore/core/device/handler/impl/RobotBoxHandler.java
...@@ -60,6 +60,7 @@ public class RobotBoxHandler extends BaseDeviceHandler { ...@@ -60,6 +60,7 @@ public class RobotBoxHandler extends BaseDeviceHandler {
statusBean.setClientIp(request.getRemoteHost()); statusBean.setClientIp(request.getRemoteHost());
handleMsg(statusBean); handleMsg(statusBean);
statusBean = saveAlarmAndHumidity(statusBean); statusBean = saveAlarmAndHumidity(statusBean);
statusBean=handleSelfAudit(statusBean);
statusBean = handleFinished(statusBean); statusBean = handleFinished(statusBean);
StatusBean humidityResult = handleHumidity(statusBean); StatusBean humidityResult = handleHumidity(statusBean);
if (humidityResult != null) { if (humidityResult != null) {
......
src/main/java/com/neotel/smfcore/core/device/handler/impl/SisoBoxHandler.java
...@@ -28,6 +28,7 @@ public class SisoBoxHandler extends BaseDeviceHandler { ...@@ -28,6 +28,7 @@ public class SisoBoxHandler extends BaseDeviceHandler {
} }
handleMsg(statusBean); handleMsg(statusBean);
statusBean = saveAlarmAndHumidity(statusBean); statusBean = saveAlarmAndHumidity(statusBean);
statusBean=handleSelfAudit(statusBean);
statusBean = handleInOutFinished(statusBean); statusBean = handleInOutFinished(statusBean);
StatusBean humidityResult = handleHumidity(statusBean); StatusBean humidityResult = handleHumidity(statusBean);
if (humidityResult != null) { if (humidityResult != null) {
......
src/main/java/com/neotel/smfcore/core/device/handler/impl/ThirdBoxHandler.java
...@@ -40,6 +40,7 @@ public class ThirdBoxHandler extends BaseDeviceHandler{ ...@@ -40,6 +40,7 @@ public class ThirdBoxHandler extends BaseDeviceHandler{
statusBean.setClientIp(request.getRemoteHost()); statusBean.setClientIp(request.getRemoteHost());
handleMsg(statusBean); handleMsg(statusBean);
statusBean = saveAlarmAndHumidity(statusBean); statusBean = saveAlarmAndHumidity(statusBean);
statusBean=handleSelfAudit(statusBean);
statusBean = handleFinished(statusBean); statusBean = handleFinished(statusBean);
StatusBean humidityResult = handleHumidity(statusBean); StatusBean humidityResult = handleHumidity(statusBean);
if (humidityResult != null) { if (humidityResult != null) {
......
src/main/java/com/neotel/smfcore/core/device/handler/impl/VerticalBoxHandler.java
...@@ -37,6 +37,7 @@ public class VerticalBoxHandler extends BaseDeviceHandler { ...@@ -37,6 +37,7 @@ public class VerticalBoxHandler extends BaseDeviceHandler {
public StatusBean handleClientRequest(StatusBean statusBean, HttpServletRequest request) { public StatusBean handleClientRequest(StatusBean statusBean, HttpServletRequest request) {
statusBean.setClientIp(request.getRemoteHost()); statusBean.setClientIp(request.getRemoteHost());
handleMsg(statusBean); handleMsg(statusBean);
statusBean=handleSelfAudit(statusBean);
// statusBean = saveStatus(statusBean); // statusBean = saveStatus(statusBean);
String cid = statusBean.getCid(); String cid = statusBean.getCid();
Collection<DataLog> queueTasks = taskService.getQueueTasks(cid); Collection<DataLog> queueTasks = taskService.getQueueTasks(cid);
......
src/main/java/com/neotel/smfcore/core/device/handler/impl/XLCBoxHandler.java
...@@ -149,6 +149,7 @@ public class XLCBoxHandler extends BaseDeviceHandler { ...@@ -149,6 +149,7 @@ public class XLCBoxHandler extends BaseDeviceHandler {
statusBean.setClientIp(request.getRemoteHost()); statusBean.setClientIp(request.getRemoteHost());
handleMsg(statusBean); handleMsg(statusBean);
statusBean = saveAlarmAndHumidity(statusBean); statusBean = saveAlarmAndHumidity(statusBean);
statusBean=handleSelfAudit(statusBean);
statusBean = handleXLCStatusBean(statusBean); statusBean = handleXLCStatusBean(statusBean);
statusBean = handleInOutFinished(statusBean); statusBean = handleInOutFinished(statusBean);
StatusBean humidityResult = handleHumidity(statusBean); StatusBean humidityResult = handleHumidity(statusBean);
......
src/main/java/com/neotel/smfcore/core/device/handler/impl/XLRBoxHandler.java
...@@ -34,6 +34,7 @@ public class XLRBoxHandler extends BaseDeviceHandler { ...@@ -34,6 +34,7 @@ public class XLRBoxHandler extends BaseDeviceHandler {
} }
handleMsg(statusBean); handleMsg(statusBean);
statusBean = saveAlarmAndHumidity(statusBean); statusBean = saveAlarmAndHumidity(statusBean);
statusBean=handleSelfAudit(statusBean);
statusBean = handleDeviceStatus(statusBean); statusBean = handleDeviceStatus(statusBean);
StatusBean humidityResult = handleHumidity(statusBean); StatusBean humidityResult = handleHumidity(statusBean);
if (humidityResult != null) { if (humidityResult != null) {
......
src/main/java/com/neotel/smfcore/core/device/handler/impl/XlBoxHandler.java
...@@ -55,6 +55,7 @@ public class XlBoxHandler extends BaseDeviceHandler { ...@@ -55,6 +55,7 @@ public class XlBoxHandler extends BaseDeviceHandler {
statusBean.setClientIp(request.getRemoteHost()); statusBean.setClientIp(request.getRemoteHost());
handleMsg(statusBean); handleMsg(statusBean);
statusBean = saveAlarmAndHumidity(statusBean); statusBean = saveAlarmAndHumidity(statusBean);
statusBean=handleSelfAudit(statusBean);
statusBean = handleXlStatusBean(statusBean); statusBean = handleXlStatusBean(statusBean);
statusBean = handleInOutFinished(statusBean); statusBean = handleInOutFinished(statusBean);
StatusBean humidityResult = handleHumidity(statusBean); StatusBean humidityResult = handleHumidity(statusBean);
......
src/main/java/com/neotel/smfcore/core/solder/handler/SpBoxHandler.java
...@@ -106,6 +106,7 @@ public class SpBoxHandler extends BaseDeviceHandler { ...@@ -106,6 +106,7 @@ public class SpBoxHandler extends BaseDeviceHandler {
statusBean.setClientIp(request.getRemoteHost()); statusBean.setClientIp(request.getRemoteHost());
handleMsg(statusBean); handleMsg(statusBean);
statusBean = saveAlarmAndHumidity(statusBean); statusBean = saveAlarmAndHumidity(statusBean);
statusBean=handleSelfAudit(statusBean);
statusBean = handleInOutFinished(statusBean); statusBean = handleInOutFinished(statusBean);
StatusBean humidityResult = handleHumidity(statusBean); StatusBean humidityResult = handleHumidity(statusBean);
if(humidityResult != null){ if(humidityResult != null){
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!