只发等待中的箱子

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

@@ -139,14 +139,14 @@ public class CodeResolve {
                 Barcode barcodeFromRule = codeBeanFromRule.getBarcode();
                 Barcode barcodeFromRule = codeBeanFromRule.getBarcode();
                 if(barcodeFromRule != null){
                 if(barcodeFromRule != null){
                     boolean needUpdate = false;
                     boolean needUpdate = false;
-                    String lastLabelPartNumber = barcode.getPartNumber();
+                    /*String lastLabelPartNumber = barcode.getPartNumber();
                     String currentLabelPartNumber = barcodeFromRule.getPartNumber();
                     String currentLabelPartNumber = barcodeFromRule.getPartNumber();
                     if (!lastLabelPartNumber.equals(currentLabelPartNumber)) {
                     if (!lastLabelPartNumber.equals(currentLabelPartNumber)) {
                         //本次解析出来的数量与上次条码解析出来的数量不一样,重新设置数量
                         //本次解析出来的数量与上次条码解析出来的数量不一样,重新设置数量
                         log.info("重新设置" + codeBeanFromRule.getCodeStr() + "partNumber为:" + currentLabelPartNumber);
                         log.info("重新设置" + codeBeanFromRule.getCodeStr() + "partNumber为:" + currentLabelPartNumber);
                         barcode.setPartNumber(currentLabelPartNumber);
                         barcode.setPartNumber(currentLabelPartNumber);
                         needUpdate = true;
                         needUpdate = true;
-                    }
+                    }*/
                     Date produceDate = barcodeFromRule.getProduceDate();
                     Date produceDate = barcodeFromRule.getProduceDate();
                     if(produceDate != null){
                     if(produceDate != null){
                         //抓取到了生产日期,未抓取到过期日期,重新设置过期日期
                         //抓取到了生产日期,未抓取到过期日期,重新设置过期日期

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/wipstor/controller/AgvDeviceController.java

@@ -67,7 +67,7 @@ public class AgvDeviceController {
                 break;
                 break;
             }
             }
             if (dataLog.isCheckOutTask()) {
             if (dataLog.isCheckOutTask()) {
-                if (dataLog.isWait() || dataLog.isExecuting()) {
+                if (dataLog.isWait()) {
                     if (StringUtils.isEmpty(dataLog.getLoc())) {
                     if (StringUtils.isEmpty(dataLog.getLoc())) {
                         dataLog.setLoc(TaskLocUtil.OUT);
                         dataLog.setLoc(TaskLocUtil.OUT);
                     }
                     }