不是执行中的任务取出物料时报警

欠料发料和产线补料页面不停弹框去除

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

@@ -34,7 +34,7 @@ public class GlobalExceptionHandler {
     @ExceptionHandler(Throwable.class)
     @ExceptionHandler(Throwable.class)
     public ResponseEntity<ApiError> handleException(Throwable e){
     public ResponseEntity<ApiError> handleException(Throwable e){
         // 打印堆栈信息
         // 打印堆栈信息
-        log.error(ThrowableUtil.getStackTrace(e));
+        log.error(e.getMessage());
         return buildResponseEntity(ApiError.error(e.getMessage()));
         return buildResponseEntity(ApiError.error(e.getMessage()));
     }
     }
 
 

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

@@ -143,7 +143,7 @@ public class NLPShelfHandler extends BaseDeviceHandler{
         String cid = request.getParameter("cid");
         String cid = request.getParameter("cid");
         Storage storage = dataCache.getStorage(cid);
         Storage storage = dataCache.getStorage(cid);
         if(storage == null){
         if(storage == null){
-            return ResultBean.newErrorResult(-1,"smfcore.shelfNotExist", "{0}对应的料架不存在",new String[]{cid} );
+            return ResultBean.newErrorResult(-1,"smfcore.shelfNotExist", "对应的料架["+cid+"]不存在",new String[]{cid} );
         }
         }
         synchronized (storage){
         synchronized (storage){
             Boolean process = processMap.get(cid);
             Boolean process = processMap.get(cid);
@@ -372,7 +372,8 @@ public class NLPShelfHandler extends BaseDeviceHandler{
                     Collection<DataLog> queueTasks = taskService.getQueueTasks();
                     Collection<DataLog> queueTasks = taskService.getQueueTasks();
                     String outResult = "";
                     String outResult = "";
                     for (DataLog queueTask : queueTasks) {
                     for (DataLog queueTask : queueTasks) {
-                        if(queueTask.isCheckOutTask() && queueTask.getPosName().equals(noReelPosName)){
+                        //只有执行中的任务才可以正常出库
+                        if(queueTask.isExecuting() && queueTask.isCheckOutTask() && queueTask.getPosName().equals(noReelPosName)){
                             //出库完成
                             //出库完成
                             try {
                             try {
                                 outResult = noReelPosName;
                                 outResult = noReelPosName;

src/main/java/com/neotel/smfcore/core/order/rest/OrderController.java

@@ -459,9 +459,9 @@ public class OrderController {
     @PreAuthorize("@el.check('workOrder')")
     @PreAuthorize("@el.check('workOrder')")
     public ResultBean updateOrderSet(HttpServletRequest request ) {
     public ResultBean updateOrderSet(HttpServletRequest request ) {
         boolean result = orderPnCache.reloadData();
         boolean result = orderPnCache.reloadData();
-        if (!result) {
-            return ResultBean.newErrorResult(-1, "smfcore.orderSet.reloadData.fail", "刷新数据失败，请稍后再试");
-        }
+//        if (!result) {
+//            return ResultBean.newErrorResult(-1, "smfcore.orderSet.reloadData.fail", "刷新数据失败，请稍后再试");
+//        }
         List<OrderPnInfo> orderPnInfos = orderPnCache.getDataList();
         List<OrderPnInfo> orderPnInfos = orderPnCache.getDataList();
         List<OrderPnDto> dtos = orderPnMapper.toDto(orderPnInfos);
         List<OrderPnDto> dtos = orderPnMapper.toDto(orderPnInfos);
         return ResultBean.newOkResult(dtos);
         return ResultBean.newOkResult(dtos);

src/main/java/com/neotel/smfcore/core/order/rest/RepleOrderController.java

@@ -327,9 +327,9 @@ public class RepleOrderController {
     @PreAuthorize("@el.check('productionLineReple')")
     @PreAuthorize("@el.check('productionLineReple')")
     public ResultBean updateOrderSet(HttpServletRequest request ) {
     public ResultBean updateOrderSet(HttpServletRequest request ) {
         boolean result = orderPnCache.reloadData();
         boolean result = orderPnCache.reloadData();
-        if (!result) {
-            return ResultBean.newErrorResult(-1, "smfcore.orderSet.reloadData.fail", "刷新数据失败，请稍后再试");
-        }
+//        if (!result) {
+//            return ResultBean.newErrorResult(-1, "smfcore.orderSet.reloadData.fail", "刷新数据失败，请稍后再试");
+//        }
         List<OrderPnInfo> orderPnInfos = orderPnCache.getDataList();
         List<OrderPnInfo> orderPnInfos = orderPnCache.getDataList();
         List<OrderPnDto> dtos = orderPnMapper.toDto(orderPnInfos);
         List<OrderPnDto> dtos = orderPnMapper.toDto(orderPnInfos);
         return ResultBean.newOkResult(dtos);
         return ResultBean.newOkResult(dtos);