Merge remote-tracking branch 'origin/master'

src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java

@@ -496,6 +496,7 @@ public class LiteOrderCache {
         }
         List<String> availableStorageIds = dataCache.getAvailableStorageIds(cidList);
 
+        boolean shortage=false;
         //其他出库模式一次性全部生成任务
         for (LiteOrderItem orderItem : cacheOrder.getOrderItems()) {
             orderItem.setOutNum(0);
@@ -533,6 +534,7 @@ public class LiteOrderCache {
                                 break;
                             }
                         }else{
+                            shortage=true;
                             log.info("工单[" + orderNo + "]RI出库时,库存中未找到料盘["+reelId+"]");
                         }
                     }else if (Strings.isNullOrEmpty(reelId) && !Strings.isNullOrEmpty(partNumber)){
@@ -543,6 +545,7 @@ public class LiteOrderCache {
                     }
                     if (pos == null) {
 //                        log.error("未找到可以出库的物料[" + partNumber + "]");
+                        shortage=true;
                         break;
                     } else {
                         assignNum = assignNum + pos.getBarcode().getAmount();
@@ -572,6 +575,11 @@ public class LiteOrderCache {
 
         }
 
+        if(shortage){
+            cacheOrder.addAppendDate("shortage","true");
+        }else{
+            cacheOrder.addAppendDate("shortage","false");
+        }
         cacheOrder.setTaskReelCount(taskReelCount);
         cacheOrder.setTotalTaskReelCount(cacheOrder.getTotalTaskReelCount()+taskReelCount);
         log.info("工单[" + orderNo + "]任务分配结束,任务数[" + taskReelCount + "]");
@@ -679,6 +687,7 @@ public class LiteOrderCache {
         }
 
         if(shortReel){
+            cacheOrder.addAppendDate("shortage","true");
             cacheOrder.setClosed(true);
             cacheOrder.setStatus(LITEORDER_STATUS.CLOSED);
             liteOrderManager.save(cacheOrder);
@@ -847,6 +856,7 @@ public class LiteOrderCache {
             cacheOrder.setTaskReelCount(outCount);
             cacheOrder.setTaskFinishedTime(-1);
             cacheOrder.setFinishedReelCount(0);
+            cacheOrder.setStatus(LITEORDER_STATUS.ONE);
             liteOrderManager.save(cacheOrder);
 
             liteOrderMap.put(cacheOrder.getOrderNo(), cacheOrder);

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

@@ -777,7 +777,10 @@ public class OrderController {
         c.and("status").nin(LITEORDER_STATUS.CLOSED, LITEORDER_STATUS.NEW);
         Query query = new Query(c);
         int exeCount = liteOrderManager.countByQuery(query);
-        int abCount = 0;
+        Query query1=new Query();
+        query1.addCriteria(Criteria.where("status").is(LITEORDER_STATUS.CLOSED)
+                .and("appendData.shortage").is("true"));
+        int abCount =  liteOrderManager.countByQuery(query1);
         int waitCount = liteOrderManager.countByQuery(new Query(Criteria.where("status").is(LITEORDER_STATUS.NEW)));
         OrderKanbanDto dto = new OrderKanbanDto(allCount, endCount, exeCount, abCount, waitCount);
         return dto;

src/main/java/com/neotel/smfcore/core/order/service/po/LiteOrder.java

 package com.neotel.smfcore.core.order.service.po;
 
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import com.neotel.smfcore.common.base.BasePo;
 import com.neotel.smfcore.core.order.enums.LITEORDER_STATUS;
@@ -117,6 +118,26 @@ public class LiteOrder extends BasePo implements Serializable {
         }
     }
 
+    public void setStatus(int s) {
+
+        this.status = s;
+        if(s>LITEORDER_STATUS.NEW&&s<LITEORDER_STATUS.CLOSED){
+            String lastOutType = getAppend("outType");
+            int outtype =0;
+            if (ObjectUtil.isNotEmpty(lastOutType)) {
+                try {
+                      outtype = Convert.toInt(lastOutType);
+                } catch (Exception exception) {
+
+                }
+            }
+            if (outtype < s) {
+                outtype=s;
+                addAppendDate("outType", outtype + "");
+            }
+        }
+    }
+
     /**
      * 是否正在出首套料
      * @return