Commit 522c98f5 zshaohui

打印客户端请求序列号

1 个父辈 bfcbe553
...@@ -195,4 +195,7 @@ public class Constants { ...@@ -195,4 +195,7 @@ public class Constants {
* 工单剩余数量 * 工单剩余数量
*/ */
public static final String CACHE_ordrRemainingQty = "ordrRemainingQty"; public static final String CACHE_ordrRemainingQty = "ordrRemainingQty";
public static final String CACHE_printSeq = "CACHE_printSeq";
} }
...@@ -103,11 +103,19 @@ public class DeviceController { ...@@ -103,11 +103,19 @@ public class DeviceController {
@ResponseBody @ResponseBody
@AnonymousAccess @AnonymousAccess
public StatusBean communication(@RequestBody final StatusBean statusBean, HttpServletRequest request) { public StatusBean communication(@RequestBody final StatusBean statusBean, HttpServletRequest request) {
Boolean printSeq = dataCache.getCache(Constants.CACHE_printSeq);
if (printSeq == null){
printSeq = false;
}
if (printSeq){
log.info("收到料仓"+statusBean.getCid()+"定时请求,序列号为:"+statusBean.getSeq());
}
try { try {
String cid = statusBean.getCid(); String cid = statusBean.getCid();
Storage storage = dataCache.getStorage(cid); Storage storage = dataCache.getStorage(cid);
if (storage == null) { if (storage == null) {
log.error("料仓cid: [" + cid + "]不存在"); log.info("料仓cid: [" + cid + "]不存在");
return null; return null;
} }
synchronized (storage) { synchronized (storage) {
...@@ -118,11 +126,17 @@ public class DeviceController { ...@@ -118,11 +126,17 @@ public class DeviceController {
deviceHandler = handlerMap.get(DeviceType.AUTO.name()); deviceHandler = handlerMap.get(DeviceType.AUTO.name());
} }
StatusBean resultBean = deviceHandler.handleClientRequest(statusBean, request); StatusBean resultBean = deviceHandler.handleClientRequest(statusBean, request);
if (printSeq){
log.info("返回料仓"+statusBean.getCid()+"定时请求,序列号为:"+statusBean.getSeq());
}
return resultBean; return resultBean;
} }
} catch (Exception e) { } catch (Exception e) {
log.error("", e); log.error("", e);
} }
if (printSeq){
log.info("返回料仓"+statusBean.getCid()+"定时请求,序列号为:"+statusBean.getSeq());
}
return statusBean; return statusBean;
} }
......
...@@ -524,6 +524,19 @@ public class InnerBoxRestController { ...@@ -524,6 +524,19 @@ public class InnerBoxRestController {
} }
@ApiOperation("定时通信打印seq开关")
@RequestMapping("/printSeq")
@AnonymousAccess
public ResultBean printSeq(int type) {
boolean printSeq = false;
if (type == 1) {
printSeq = true;
}
dataCache.updateCache(Constants.CACHE_printSeq, printSeq);
return ResultBean.newOkResult("");
}
public void setLabelOrderItemId(String cid, String orderItemId) { public void setLabelOrderItemId(String cid, String orderItemId) {
labelOrderItemMap.put(cid, orderItemId); labelOrderItemMap.put(cid, orderItemId);
} }
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!