扫码失败且门口有料时更新状态为14=入库失败

myproject/src/main/java/com/myproject/util/StorageConstants.java

@@ -136,9 +136,10 @@ public class StorageConstants {
          */
          */
         public final static  int IN_FINISHED = 7;
         public final static  int IN_FINISHED = 7;
         /**
         /**
-         * 8入库失败
+         * 14入库失败
          */
          */
-        public final static  int IN_FAILED = 8;
+        public final static  int IN_FAILED = 14;
+
         /**
         /**
          *9出库执行中，
          *9出库执行中，
          */
          */

myproject/src/main/java/com/myproject/webapp/controller/webService/MesApiController.java

@@ -360,8 +360,6 @@ public class MesApiController extends BaseController {
     @ResponseBody
     @ResponseBody
     public List<Map<String,Object>> status(HttpServletRequest request) {
     public List<Map<String,Object>> status(HttpServletRequest request) {
         String cid = request.getParameter("cid");
         String cid = request.getParameter("cid");
-        Locale localeZh = Language.ZH_CN.getLocale();
-        Locale localeEn = Language.ENGLISH.getLocale();
 
 
         Collection<Storage> storageList = Lists.newArrayList();
         Collection<Storage> storageList = Lists.newArrayList();
         if(Strings.isNullOrEmpty(cid)){
         if(Strings.isNullOrEmpty(cid)){
@@ -390,8 +388,11 @@ public class MesApiController extends BaseController {
 
 
             String msg = statusBean.getMsg();
             String msg = statusBean.getMsg();
             String msgEn = statusBean.getMsgEn();
             String msgEn = statusBean.getMsgEn();
+            String doorReelSingnal = statusBean.getDoorReelSingnal();
             Exception e = taskService.getServerException(storage.getCid());
             Exception e = taskService.getServerException(storage.getCid());
             if(e != null){
             if(e != null){
+                Locale localeZh = Language.ZH_CN.getLocale();
+                Locale localeEn = Language.ENGLISH.getLocale();
                 if(e instanceof ValidateException){
                 if(e instanceof ValidateException){
                     msg = getText(e.getMessage(),((ValidateException) e).getParams(), localeZh ,e.getMessage());
                     msg = getText(e.getMessage(),((ValidateException) e).getParams(), localeZh ,e.getMessage());
                     msgEn = getText(e.getMessage(),((ValidateException) e).getParams(), localeEn ,e.getMessage());
                     msgEn = getText(e.getMessage(),((ValidateException) e).getParams(), localeEn ,e.getMessage());
@@ -399,6 +400,12 @@ public class MesApiController extends BaseController {
                     msg = e.getMessage();
                     msg = e.getMessage();
                     msgEn = e.getMessage();
                     msgEn = e.getMessage();
                 }
                 }
+                if(doorReelSingnal.equals("1")){
+                    //门口有料,且不是出库状态,认为是入库失败
+                    if(storageStatus != StorageConstants.BOX_STATUS.CHECKOUT && storageStatus != StorageConstants.BOX_STATUS.OUT_FINISHED){
+                        storageStatus = StorageConstants.BOX_STATUS.IN_FAILED;
+                    }
+                }
             }
             }
             Map<String,Object> itemMap = new HashMap<>();
             Map<String,Object> itemMap = new HashMap<>();
             itemMap.put("cid", storage.getCid());
             itemMap.put("cid", storage.getCid());
@@ -406,7 +413,8 @@ public class MesApiController extends BaseController {
             itemMap.put("status",storageStatus);
             itemMap.put("status",storageStatus);
             itemMap.put("msg",msg);
             itemMap.put("msg",msg);
             itemMap.put("msgEn",msgEn);
             itemMap.put("msgEn",msgEn);
-            itemMap.put("doorReelSignal",statusBean.getDoorReelSingnal());
+            itemMap.put("doorReelSignal",doorReelSingnal);
+            log.info("doorReelSignal:" + doorReelSingnal);
             Map<String,Object> emptySlotMap = Maps.newHashMap();
             Map<String,Object> emptySlotMap = Maps.newHashMap();
             Map<String,Object> totalSlotMap = Maps.newHashMap();
             Map<String,Object> totalSlotMap = Maps.newHashMap();
             Map<String, UsageItem> usageMap = storage.getUsageMap();
             Map<String, UsageItem> usageMap = storage.getUsageMap();

myproject/src/main/java/com/myproject/webapp/controller/webService/TaskService.java

@@ -1148,6 +1148,7 @@ public class TaskService implements ITaskService {
         statusBean.setBoxStatus(statusOfBoxes);
         statusBean.setBoxStatus(statusOfBoxes);
         statusBean.setData(statusBeanToSave.getData());
         statusBean.setData(statusBeanToSave.getData());
         statusBean.setMsg(statusBeanToSave.getMsg());
         statusBean.setMsg(statusBeanToSave.getMsg());
+        statusBean.setMsgEn(statusBeanToSave.getMsgEn());
         statusBean.setStatus(statusBeanToSave.getStatus());
         statusBean.setStatus(statusBeanToSave.getStatus());
         statusBean.setOp(statusBeanToSave.getOp());
         statusBean.setOp(statusBeanToSave.getOp());
         statusBean.setSeq(statusBeanToSave.getSeq());
         statusBean.setSeq(statusBeanToSave.getSeq());