解析条码时重置批次

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

@@ -208,6 +208,18 @@ public class CodeResolve {
                     log.error("条码["+codeStr+"]重置 P20 出错："+ ex.getMessage());
                 }
                 try{
+                    if((codeBeanFromRule.getBarcode()!=null)&&(codeBeanFromRule.getBarcode().getBatch()!=null)) {
+                        String batch = codeBeanFromRule.getBarcode().getBatch();
+                        if (!barcode.getBatch().equals(batch)) {
+                            log.warn("[" + barcode.getBarcode() + "]重新设置batch[" + barcode.getBatch() + "]为[" + batch + "]");
+                            barcode.setBatch(batch);
+                            barcode = barcodeManager.save(barcode);
+                        }
+                    }
+                }catch (Exception ex){
+                    log.error("条码["+codeStr+"]重置batch出错："+ ex.getMessage());
+                }
+                try{
                     if((codeBeanFromRule.getBarcode()!=null) ) {
                         boolean needSave = false;
                         String q1Item = codeBeanFromRule.getBarcode().getQ1Item();