二次入库更新供应商

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

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