1.异动报表优化

2.出库时不重新设置数量
3.看板优化

src/main/java/com/neotel/smfcore/core/barcode/utils/CodeResolve.java

@@ -134,7 +134,7 @@ public class CodeResolve {
                 Barcode barcodeFromRule = codeBeanFromRule.getBarcode();
                 if(barcodeFromRule != null){
                     boolean needUpdate = false;
-                    int lastLabelAmount = barcode.getLabelAmount();
+                    /*int lastLabelAmount = barcode.getLabelAmount();
                     int currentLabelAmount = barcodeFromRule.getAmount();
                     if(currentLabelAmount != lastLabelAmount){
                         //本次解析出来的数量与上次条码解析出来的数量不一样,重新设置数量
@@ -142,7 +142,7 @@ public class CodeResolve {
                         barcode.setAmount(currentLabelAmount);
                         barcode.setLabelAmount(currentLabelAmount);
                         needUpdate = true;
-                    }
+                    }*/
                     Date produceDate = barcodeFromRule.getProduceDate();
                     if(produceDate != null){
                         //抓取到了生产日期,未抓取到过期日期,重新设置过期日期

src/main/java/com/neotel/smfcore/core/system/service/po/DataLog.java

@@ -333,6 +333,11 @@ public class DataLog extends BasePo implements Serializable {
      */
     private int extendType = -1;
 
+    /**
+     * 料箱
+     */
+    private String box = "";
+
     public String getBarcode() {
         if(barcode == null){
             return "";

src/main/java/com/neotel/smfcore/custom/lizhen/agvBox/rest/TaskRestController.java

@@ -51,7 +51,7 @@ public class TaskRestController {
     /**
      * 初始化putInDate
      */
-    @PostConstruct
+    //@PostConstruct
     public void initPutInDate() {
         Criteria c = Criteria.where("putInTime").is(-1);
         List<Barcode> barcodeList = barcodeManager.findByQuery(new Query(c));

src/main/java/com/neotel/smfcore/custom/lizhen/innerBox/rest/InnerBoxRestController.java

@@ -278,7 +278,9 @@ public class InnerBoxRestController {
     public ResultBean finishPrintLabel(HttpServletRequest request) {
         String cid = request.getParameter("cid");
         log.info("移除打印标签");
-        labelOrderItemMap.remove(cid);
+        if(StringUtils.isNotBlank(cid)) {
+            labelOrderItemMap.remove(cid);
+        }
         return ResultBean.newOkResult("");
     }
 

src/main/java/com/neotel/smfcore/custom/lizhen/kanban/inner/InnerKanbanController.java

@@ -142,6 +142,8 @@ public class InnerKanbanController {
     @AnonymousAccess
     public ResultBean getAllUsage(){
         int usage = 0;
+        int total = 0;
+        int use = 0;
         List<Storage> resultList = new ArrayList<>();
         Collection<Storage> collection = dataCache.getAllStorage().values();
         for (Storage storage : collection) {
@@ -154,7 +156,11 @@ public class InnerKanbanController {
             int emptySlots = resultList.stream().mapToInt(Storage::getEmptySlots).sum();
             usage = (int) (((double) (totalSlots - emptySlots) / totalSlots) * 100); //库位使用率
         }
-        return ResultBean.newOkResult(usage);
+        Map<String,Integer> resultMap = new HashMap<>();
+        resultMap.put("usage",usage);
+        resultMap.put("total",total);
+        resultMap.put("use",use);
+        return ResultBean.newOkResult(resultMap);
     }
 
 

src/main/java/com/neotel/smfcore/custom/lizhen/report/outer/OuterReportController.java

@@ -402,6 +402,8 @@ public class OuterReportController {
                 if ("CS".equals(dataLog.getPartNumber()) || "CM".equals(dataLog.getPartNumber()) || "CB".equals(dataLog.getPartNumber())) {
                     dataLog.setStoragePosName(dataLog.getPosName());
                     dataLog.setPosName(null);
+                    dataLog.setBox(dataLog.getBarcode());
+                    dataLog.setBarcode("");
                 }
                 if (StringUtils.isBlank(dataLog.getChangeType())) {
                     dataLog.setChangeType(ExtendType.getName(dataLog.getExtendType()));
@@ -429,6 +431,7 @@ public class OuterReportController {
                 resultMap.put("异动数量", getData(dataLog.getNum()));
                 resultMap.put("储位", getData(dataLog.getStoragePosName()));
                 resultMap.put("异动类型", getData(dataLog.getChangeType()));
+                resultMap.put("箱号", getData(dataLog.getBox()));
                 resultMap.put("ID NO", getData(dataLog.getBarcode()));
                 resultMap.put("LOT", getData(dataLog.getBatchInfo()));
                 resultMap.put("D/C", getData(dataLog.getDateCode()));