1.抛异常时,保存到消息列表

2.料盒操作,mes提示禁用,但实际已经入进去了,任务没生成,bug修改

src/main/java/com/neotel/smfcore/common/exception/handler/GlobalExceptionHandler.java

@@ -5,6 +5,9 @@ import com.neotel.smfcore.common.exception.EntityNotFoundException;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.utils.ThrowableUtil;
 import com.neotel.smfcore.common.utils.ThrowableUtil;
 import com.neotel.smfcore.core.language.util.MessageUtils;
 import com.neotel.smfcore.core.language.util.MessageUtils;
+import com.neotel.smfcore.core.message.enums.MessageType;
+import com.neotel.smfcore.core.message.service.manager.IMessageManager;
+import com.neotel.smfcore.core.message.service.po.Message;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +31,9 @@ import static org.springframework.http.HttpStatus.NOT_FOUND;
 public class GlobalExceptionHandler {
 public class GlobalExceptionHandler {
     @Autowired
     @Autowired
    private MessageUtils messageUtils;
    private MessageUtils messageUtils;
+
+    @Autowired
+    IMessageManager messageManager;
     /**
     /**
      * 处理所有不可知的异常
      * 处理所有不可知的异常
      */
      */
@@ -87,6 +93,14 @@ public class GlobalExceptionHandler {
         // 打印堆栈信息
         // 打印堆栈信息
         //log.error(ThrowableUtil.getStackTrace(e));
         //log.error(ThrowableUtil.getStackTrace(e));
         String targetMsg=messageUtils.getText(e.getMsgKey(),e.getMsgParam(),servlet.getLocale() ,e.getDefaultMsg());
         String targetMsg=messageUtils.getText(e.getMsgKey(),e.getMsgParam(),servlet.getLocale() ,e.getDefaultMsg());
+        e.getMessage();
+        Message message = new Message();
+        message.setType(MessageType.ERROR.name());
+        message.setDeviceName("server");
+        message.setMsgCode(e.getMsgKey());
+        message.setMsgParams(e.getMsgParam());
+        message.setMsg(e.getDefaultMsg());
+        messageManager.save(message);
         return buildResponseEntity(ApiError.error(e.getStatus(),targetMsg));
         return buildResponseEntity(ApiError.error(e.getStatus(),targetMsg));
     }
     }
 
 

src/main/java/com/neotel/smfcore/core/device/handler/impl/BaseDeviceHandler.java

@@ -333,6 +333,7 @@ public class BaseDeviceHandler implements IDeviceHandler {
                 storagePos = storagePosManager.getEmptyPosByStorage(storage, barcode, operatingPosIds);
                 storagePos = storagePosManager.getEmptyPosByStorage(storage, barcode, operatingPosIds);
             } else {
             } else {
                 log.info("料仓" + storageCid + "有出库任务未完成,不允许入库");
                 log.info("料仓" + storageCid + "有出库任务未完成,不允许入库");
+                throw new ValidateException("smfcore.error.storage.outNotEnd", "料仓{0}有出库任务未完成，不允许入库", new String[]{storageCid});
             }
             }
         }
         }
         if (storagePos == null) {
         if (storagePos == null) {

src/main/java/com/neotel/smfcore/core/message/rest/MessageController.java

@@ -53,6 +53,7 @@ public class MessageController {
     public PageData<MessageDto> query(MessageCriteria criteria, Pageable pageable,HttpServletRequest request){
     public PageData<MessageDto> query(MessageCriteria criteria, Pageable pageable,HttpServletRequest request){
 
 
         Query query = QueryHelp.getQuery(criteria);
         Query query = QueryHelp.getQuery(criteria);
+        query.addCriteria(Criteria.where("msg").exists(true).ne(""));
         PageData<Message> messagePageData=messageManager.findByPage(query,pageable);
         PageData<Message> messagePageData=messageManager.findByPage(query,pageable);
         List<MessageDto> dtos=messageMapper.toDto(messagePageData.getContent());
         List<MessageDto> dtos=messageMapper.toDto(messagePageData.getContent());
         for (int i=0;i<dtos.size();i++) {
         for (int i=0;i<dtos.size();i++) {

src/main/resources/messages.properties

@@ -120,7 +120,9 @@ smfcore.materialBox.invalid=\u672A\u627E\u5230\u6599\u76D2\u4FE1\u606F{0}
 smfcore.materialBox.noReel=\u6599\u76D2\u4E2D\u672A\u627E\u5230\u5BF9\u5E94\u7269\u6599
 smfcore.materialBox.noReel=\u6599\u76D2\u4E2D\u672A\u627E\u5230\u5BF9\u5E94\u7269\u6599
 smfcore.materialBox.boxNoReel=\u6599\u76D2\u4E2D\u65E0\u7269\u6599
 smfcore.materialBox.boxNoReel=\u6599\u76D2\u4E2D\u65E0\u7269\u6599
 smfcore.materialBox.inPos=\u7269\u6599\u5DF2\u5728\u5E93\u4F4D{0}\u4E2D
 smfcore.materialBox.inPos=\u7269\u6599\u5DF2\u5728\u5E93\u4F4D{0}\u4E2D
+smfcore.materialBox.inBox=\u7269\u6599{0}\u5DF2\u5728\u6599\u76D2{1}\u4E2D
 smfcore.materialBox.inOtherBox=\u7269\u6599\u5DF2\u5728\u6599\u76D2{0}\u4E2D
 smfcore.materialBox.inOtherBox=\u7269\u6599\u5DF2\u5728\u6599\u76D2{0}\u4E2D
+smfcore.materialBox.outBox=\u7269\u6599{0}\u5DF2\u7ECF\u53D6\u51FA
 smfcore.materialBox=\u6599\u76D2\u64CD\u4F5C
 smfcore.materialBox=\u6599\u76D2\u64CD\u4F5C
 smfcore.shelf.nextPos.hasReel=\u5E93\u4F4D[{0}]\u5DF2\u6709\u7269\u6599,\u8BF7\u91CD\u65B0\u626B\u63CF\u5E93\u4F4D\u7801
 smfcore.shelf.nextPos.hasReel=\u5E93\u4F4D[{0}]\u5DF2\u6709\u7269\u6599,\u8BF7\u91CD\u65B0\u626B\u63CF\u5E93\u4F4D\u7801
 smfcore.shelf.nextPos.hasTask=\u5E93\u4F4D[{0}]\u5DF2\u6709\u4EFB\u52A1,\u8BF7\u91CD\u65B0\u626B\u63CF\u5E93\u4F4D\u7801
 smfcore.shelf.nextPos.hasTask=\u5E93\u4F4D[{0}]\u5DF2\u6709\u4EFB\u52A1,\u8BF7\u91CD\u65B0\u626B\u63CF\u5E93\u4F4D\u7801
@@ -258,6 +260,7 @@ smfcore.error.virtualOut.noItem=\u5DE5\u5355{0}\u4E2D\u672A\u627E\u5230\u5BF9\u5
 smfcore.error.mimo.outFial=\u672A\u627E\u5230\u53EF\u51FA\u5E93\u7684\u7269\u6599
 smfcore.error.mimo.outFial=\u672A\u627E\u5230\u53EF\u51FA\u5E93\u7684\u7269\u6599
 smfcore.error.getMaterialLot.in=\u6761\u7801[{0}]\u9A8C\u8BC1\u5931\u8D25\uFF0C\u65E0\u6CD5\u5165\u5E93
 smfcore.error.getMaterialLot.in=\u6761\u7801[{0}]\u9A8C\u8BC1\u5931\u8D25\uFF0C\u65E0\u6CD5\u5165\u5E93
 smfcore.error.getMaterialLot.out=\u6761\u7801[{0}]\u9A8C\u8BC1\u5931\u8D25\uFF0C\u65E0\u6CD5\u51FA\u5E93
 smfcore.error.getMaterialLot.out=\u6761\u7801[{0}]\u9A8C\u8BC1\u5931\u8D25\uFF0C\u65E0\u6CD5\u51FA\u5E93
+smfcore.error.storage.outNotEnd=\u6599\u4ED3{0}\u6709\u51FA\u5E93\u4EFB\u52A1\u672A\u5B8C\u6210\uFF0C\u4E0D\u5141\u8BB8\u5165\u5E93
 
 
 #smfclient.nlp.onlyOneTray=\u4E0D\u53EF\u540C\u65F6\u653E\u5165\u591A\u76D8\u7269\u6599:{0}
 #smfclient.nlp.onlyOneTray=\u4E0D\u53EF\u540C\u65F6\u653E\u5165\u591A\u76D8\u7269\u6599:{0}
 #smfclient.nlp.cannotFindPos={0}\u672A\u627E\u5230\u5E93\u4F4D:{1}
 #smfclient.nlp.cannotFindPos={0}\u672A\u627E\u5230\u5E93\u4F4D:{1}