1.更改任务状态,增加锁优化

src/main/java/com/neotel/smfcore/custom/luxsan/api/LuxsanApi.java

@@ -81,7 +81,7 @@ public class LuxsanApi extends DefaultSmfApiListener {
                 kafkaService.sendPosChange(task.getPosName(), "0");
                 kafkaService.sendPosChange(task.getPosName(), "0");
             }
             }
         }
         }
-        if (task.isFinished() || task.isCancel()) {
+        /*if (task.isFinished() || task.isCancel()) {
             String subSourceId = task.getSubSourceId();
             String subSourceId = task.getSubSourceId();
             if (StringUtils.isNotEmpty(subSourceId)) {
             if (StringUtils.isNotEmpty(subSourceId)) {
                 LiteOrderItem orderItem = liteOrderItemManager.get(subSourceId);
                 LiteOrderItem orderItem = liteOrderItemManager.get(subSourceId);
@@ -99,7 +99,7 @@ public class LuxsanApi extends DefaultSmfApiListener {
                     }
                     }
                 }
                 }
             }
             }
-        }
+        }*/
     }
     }
 
 
 
 
@@ -1500,7 +1500,7 @@ public class LuxsanApi extends DefaultSmfApiListener {
     @Override
     @Override
     public void onOrderStatusChange(String orderNotifyUrl, LiteOrder liteOrder) {
     public void onOrderStatusChange(String orderNotifyUrl, LiteOrder liteOrder) {
         //更新水位预警的待发料信息
         //更新水位预警的待发料信息
-        if (liteOrder.isTaskFinished() || liteOrder.isClosed()) {
+        /*if (liteOrder.isTaskFinished() || liteOrder.isClosed()) {
             List<LiteOrderItem> orderItems = liteOrder.getOrderItems();
             List<LiteOrderItem> orderItems = liteOrder.getOrderItems();
             for (LiteOrderItem orderItem : orderItems) {
             for (LiteOrderItem orderItem : orderItems) {
                 String warningItemId = orderItem.getWarningItemId();
                 String warningItemId = orderItem.getWarningItemId();
@@ -1519,7 +1519,7 @@ public class LuxsanApi extends DefaultSmfApiListener {
                     }
                     }
                 }
                 }
             }
             }
-        }
+        }*/
     }
     }
 
 
     @Override
     @Override

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/CDeviceController.java

@@ -1911,6 +1911,8 @@ public class CDeviceController {
         if (StringUtils.isNotEmpty(currentLoc)) {
         if (StringUtils.isNotEmpty(currentLoc)) {
             dataLog.setCurrentLoc(currentLoc);
             dataLog.setCurrentLoc(currentLoc);
         }
         }
+        log.info(barcode.getBarcode()+"物料扫码出库,更改工单任务数开始");
         taskService.updateFinishedTask(dataLog);
         taskService.updateFinishedTask(dataLog);
+        log.info(barcode.getBarcode()+"物料扫码出库,更改工单任务数结束");
     }
     }
 }
 }