1.回库缓存问题提交

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

@@ -748,7 +748,10 @@ public class BaseDeviceHandler implements IDeviceHandler {
             barcode.setInOpor(task.getOperator());
             barcode.setCheckOutDate(null, "");
             barcode.setPosName(task.getPosName());
-            barcode.setNeedReturnStorage(true);
+            if (!barcode.isNeedReturnStorage()){
+                task.setNeedReturnStorage(false);
+                barcode.setNeedReturnStorage(true);
+            }
             if (barcode.isSolder()) {
                 if (storagePos.isWarmPos()) {
                     //回温仓位

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

@@ -271,40 +271,50 @@ public class LiteOrderCache {
         return order;
     }
 
+    private Map<String,String> cacheOrderMap = new ConcurrentHashMap<>();
+
     /**
      * 更新工单状态信息
      */
-    private synchronized void finishedOrderTask(DataLog task) throws ValidateException {
+    private  void finishedOrderTask(DataLog task) throws ValidateException {
         if (OP.CHECKOUT == task.getType()) {
 
             //更新工单状态
             String orderNo = task.getSourceName();
             if (!Strings.isNullOrEmpty(orderNo)) {
-                LiteOrder order = getLiteOrder(orderNo);
-                if (order != null) {
-                    //任务是取消的,需要将总待出库数量-1
-                    if (task.isCancel()) {
-                        order.setTaskReelCount(order.getTaskReelCount() - 1);
-                        order.setTotalTaskReelCount(order.getTotalTaskReelCount() - 1);
-                        log.info("工单[" + orderNo + "]的任务" + task.getPartNumber() + "[" + task.getBarcode() + "]已取消,任务数-1=" + order.getFinishedReelCount() + "/" + order.getTaskReelCount());
-
-                        //checkoutAgain(task,order);
-                    } else if (task.isFinished() || task.isEnd()) {
-                        order.setFinishedReelCount(order.getFinishedReelCount() + 1);
-                        order.setTotalFinishedReelCount(order.getTotalFinishedReelCount() + 1);
-                        String orderItemId = task.getSubSourceId();
-                        List<LiteOrderItem> items = new ArrayList<>();
-                        for (LiteOrderItem liteOrderItem : order.getOrderItems()) {
-                            if (liteOrderItem.getId().equals(orderItemId)) {
-                                log.info("工单[" + orderNo + "]的任务" + task.getPartNumber() + "[" + task.getBarcode() + "]出库完成,已完成数量+1=" + order.getFinishedReelCount() + "/" + order.getTaskReelCount());
-                                //更新对应条目的已出库数量和出库盘数
-                                liteOrderItem.setOutNum(liteOrderItem.getOutNum() + task.getNum());
-                                liteOrderItem.setOutReelCount(liteOrderItem.getOutReelCount() + 1);
-                                liteOrderItem.setTotalOutNum(liteOrderItem.getTotalOutNum() + task.getNum());
-                                liteOrderItem.setTotalOutReelCount(liteOrderItem.getTotalOutReelCount() + 1);
-                                liteOrderItem.setBarcodeStr(task.getBarcode(), task.getNum());
-                                liteOrderItem.setOutBarcodeList(task.getBarcode(), task.getPartNumber(), task.getExport());
-                                liteOrderItem = liteOrderItemManager.save(liteOrderItem);
+
+                String lockObj = cacheOrderMap.get(orderNo);
+                if (StringUtils.isEmpty(lockObj)) {
+                    lockObj = orderNo;
+                    cacheOrderMap.put(orderNo, lockObj);
+                }
+                synchronized (cacheOrderMap.get(orderNo)) {
+
+                    LiteOrder order = getLiteOrder(orderNo);
+                    if (order != null) {
+                        //任务是取消的,需要将总待出库数量-1
+                        if (task.isCancel()) {
+                            order.setTaskReelCount(order.getTaskReelCount() - 1);
+                            order.setTotalTaskReelCount(order.getTotalTaskReelCount() - 1);
+                            log.info("工单[" + orderNo + "]的任务" + task.getPartNumber() + "[" + task.getBarcode() + "]已取消,任务数-1=" + order.getFinishedReelCount() + "/" + order.getTaskReelCount());
+
+                            //checkoutAgain(task,order);
+                        } else if (task.isFinished() || task.isEnd()) {
+                            order.setFinishedReelCount(order.getFinishedReelCount() + 1);
+                            order.setTotalFinishedReelCount(order.getTotalFinishedReelCount() + 1);
+                            String orderItemId = task.getSubSourceId();
+                            List<LiteOrderItem> items = new ArrayList<>();
+                            for (LiteOrderItem liteOrderItem : order.getOrderItems()) {
+                                if (liteOrderItem.getId().equals(orderItemId)) {
+                                    log.info("工单[" + orderNo + "]的任务" + task.getPartNumber() + "[" + task.getBarcode() + "]出库完成,已完成数量+1=" + order.getFinishedReelCount() + "/" + order.getTaskReelCount());
+                                    //更新对应条目的已出库数量和出库盘数
+                                    liteOrderItem.setOutNum(liteOrderItem.getOutNum() + task.getNum());
+                                    liteOrderItem.setOutReelCount(liteOrderItem.getOutReelCount() + 1);
+                                    liteOrderItem.setTotalOutNum(liteOrderItem.getTotalOutNum() + task.getNum());
+                                    liteOrderItem.setTotalOutReelCount(liteOrderItem.getTotalOutReelCount() + 1);
+                                    liteOrderItem.setBarcodeStr(task.getBarcode(), task.getNum());
+                                    liteOrderItem.setOutBarcodeList(task.getBarcode(), task.getPartNumber(), task.getExport());
+                                    liteOrderItem = liteOrderItemManager.save(liteOrderItem);
 //                                Barcode barcode = barcodeManager.findByBarcode(task.getBarcode());
 //                                if (barcode != null) {
 //                                    Float totalNeedNum = liteOrderItem.getNeedNum() * order.getOrderTimes();
@@ -320,43 +330,44 @@ public class LiteOrderCache {
 //                                        e.printStackTrace();
 //                                    }
 //                                }
-                            }
-                            items.add(liteOrderItem);
-                        }
-                        order.setOrderItems(items);
-                        if (!order.isClosed()) {
-                            //工单未关闭的话,检查状态,全部都出完进行关闭
-                            boolean closed = true;
-                            for (LiteOrderItem liteOrderItem : order.getOrderItems()) {
-                                if (!liteOrderItem.isOutFinished()) {
-                                    closed = false;
-                                    break;
                                 }
-                                if (closed) {
-                                    if (StringUtils.isBlank(liteOrderItem.getRi()) && (StringUtils.isNotBlank(liteOrderItem.getPn()) || StringUtils.isNotBlank(liteOrderItem.getMpn()))) {
-                                        if (!liteOrderItem.isOutReelFinished()) {
-                                            closed = false;
-                                            break;
+                                items.add(liteOrderItem);
+                            }
+                            order.setOrderItems(items);
+                            if (!order.isClosed()) {
+                                //工单未关闭的话,检查状态,全部都出完进行关闭
+                                boolean closed = true;
+                                for (LiteOrderItem liteOrderItem : order.getOrderItems()) {
+                                    if (!liteOrderItem.isOutFinished()) {
+                                        closed = false;
+                                        break;
+                                    }
+                                    if (closed) {
+                                        if (StringUtils.isBlank(liteOrderItem.getRi()) && (StringUtils.isNotBlank(liteOrderItem.getPn()) || StringUtils.isNotBlank(liteOrderItem.getMpn()))) {
+                                            if (!liteOrderItem.isOutReelFinished()) {
+                                                closed = false;
+                                                break;
+                                            }
                                         }
                                     }
                                 }
+                                if (closed) {
+                                    order.setClosed(closed);
+                                }
                             }
-                            if (closed) {
-                                order.setClosed(closed);
-                            }
+                        } else {
+                            log.error("工单[" + orderNo + "]的任务[" + task.getBarcode() + "]完成时,状态为:" + task.getStatus());
                         }
-                    } else {
-                        log.error("工单[" + orderNo + "]的任务[" + task.getBarcode() + "]完成时,状态为:" + task.getStatus());
-                    }
 
-                    if (order.getTaskReelCount() > 0 && order.getFinishedReelCount() >= order.getTaskReelCount()) {
-                        log.info("工单[" + orderNo + "]的出库任务已完成,共出库:" + order.getFinishedReelCount() + " 盘");
-                        finishedOrderTasks(order);
+                        if (order.getTaskReelCount() > 0 && order.getFinishedReelCount() >= order.getTaskReelCount()) {
+                            log.info("工单[" + orderNo + "]的出库任务已完成,共出库:" + order.getFinishedReelCount() + " 盘");
+                            finishedOrderTasks(order);
+                        }
+                        liteOrderManager.save(order);
+                        liteOrderMap.put(orderNo, order);
+                    } else {
+                        log.error("完成任务时,未找到工单[" + orderNo + "]信息");
                     }
-                    liteOrderManager.save(order);
-                    liteOrderMap.put(orderNo, order);
-                } else {
-                    log.error("完成任务时,未找到工单[" + orderNo + "]信息");
                 }
             }
         }

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

@@ -268,6 +268,8 @@ public class DataLog extends BasePo implements Serializable ,Comparable<DataLog>
 
     private String remark = "";
 
+    private boolean needReturnStorage = true;
+
     public String getBarcode() {
         if(barcode == null){
             return "";

src/main/java/com/neotel/smfcore/custom/Jkem21481/manager/impl/ReturnStorageManagerImpl.java

@@ -89,10 +89,8 @@ public class ReturnStorageManagerImpl implements IReturnStorageManager {
         if (dataLog != null) {
             log.info(dataLog.getBarcode() + "找到上一个任务,对应的工单号为:" + dataLog.getStorageName() + "任务状态为:" + dataLog.getStatus() + ",上次出库的任务数量为:" + dataLog.getNum());
             //判断是否需要回库
-            Barcode barcode = barcodeManager.findByBarcode(dataLog.getBarcode());
-
             if (dataLog.isCheckOutTask() && dataLog.isFinished()) {
-                if (barcode.isNeedReturnStorage()) {
+                if (dataLog.isNeedReturnStorage()) {
                     //判断两次的partNumber是否相同,如果不同,则跳过
                     if (task.getPartNumber().equals(dataLog.getPartNumber())) {
                         String sourceId = dataLog.getSourceId();