点过料的料盘再次入库使用标签数量。

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

@@ -307,10 +307,10 @@ public class CodeResolve {
                     if(   currentLabelAmount != lastLabelAmount) {
                         barcode.setLabelAmount(currentLabelAmount);
                         if (barcode.getXrayCount() > 0) {
-                            log.info("重新设置" + codeBeanFromRule.getCodeStr() + "标签数量为:" + currentLabelAmount);
-                        } else {
-                            log.info("重新设置" + codeBeanFromRule.getCodeStr() + "标签数量和实时数量为:" + currentLabelAmount);
+                            log.info("重新设置" + codeBeanFromRule.getCodeStr() + "标签数量和实时数量为:" + currentLabelAmount + "，点料次数=" + barcode.getXrayCount());
                             barcode.setAmount(currentLabelAmount);
+                        } else {
+                            log.info("重新设置" + codeBeanFromRule.getCodeStr() + "标签数量为:" + currentLabelAmount + "，点料次数=" + barcode.getXrayCount());
                         }
                         needUpdate = true;
                     }

src/main/java/com/neotel/smfcore/core/device/rest/DeviceController.java

@@ -731,6 +731,7 @@ public class DeviceController {
                 barcode.setXrayCount(barcode.getXrayCount() + 1);
                 barcodeManager.save(barcode);
 
+                log.info("点料信息:barcode:" + barcodeStr + ",旧数量:" + oldQty+",新数量="+qty+", 已点料次数="+barcode.getXrayCount());
 
                 //处理入库单
                 boolean isInlistReel = loadingUtil.IsInlistReel(barcode.getBarcode());