解析条码时重新设置Q1,Q

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

 package com.neotel.smfcore.core.barcode.utils;
 package com.neotel.smfcore.core.barcode.utils;
 
 
+import cn.hutool.core.util.ObjectUtil;
 import com.google.common.base.Strings;
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Lists;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.exception.ValidateException;
@@ -165,6 +166,29 @@ public class CodeResolve {
                 }catch (Exception ex){
                 }catch (Exception ex){
                     log.error("条码["+codeStr+"]重置过期时间出错："+ ex.getMessage());
                     log.error("条码["+codeStr+"]重置过期时间出错："+ ex.getMessage());
                 }
                 }
+
+                try{
+                    if((codeBeanFromRule.getBarcode()!=null) ) {
+                        boolean needSave = false;
+                        String q1Item = codeBeanFromRule.getBarcode().getQ1Item();
+                        String qItem = codeBeanFromRule.getBarcode().getQItem();
+                        if (ObjectUtil.isNotEmpty(q1Item) && (!barcode.getQ1Item().equals(q1Item))) {
+                            barcode.setQ1Item(q1Item);
+                            needSave = true;
+                        }
+                        if (ObjectUtil.isNotEmpty(qItem) && (!barcode.getQItem().equals(qItem))) {
+                            barcode.setQItem(qItem);
+                            needSave = true;
+                        }
+                        if (needSave) {
+                            barcode = barcodeManager.save(barcode);
+                            log.warn("[" + barcode.getBarcode() + "]重新设置Q1 =[" + q1Item + "],Q=[" + qItem + "]");
+                        }
+
+                    }
+                }catch (Exception ex){
+                    log.error("条码["+codeStr+"]重置Q1,Q 出错："+ ex.getMessage());
+                }
                 boolean setSize=false;
                 boolean setSize=false;
                 Component component = componentManager.findByPartNumberAndProvider(barcode.getPartNumber(),barcode.getProvider());
                 Component component = componentManager.findByPartNumberAndProvider(barcode.getPartNumber(),barcode.getProvider());
                 int validDay = 0;
                 int validDay = 0;