尺寸确认后使用确认的尺寸。

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

@@ -85,19 +85,33 @@ public class CodeResolve {
             barcode = barcodeManager.findByBarcode(codeStr);
             barcode = barcodeManager.findByBarcode(codeStr);
             if(barcode != null) {//数据库中已存在
             if(barcode != null) {//数据库中已存在
 
 
+                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;
-                if(component != null){
+                if(component != null) {
                     validDay = component.getValidDay();
                     validDay = component.getValidDay();
                     codeBeanFromRule.setShowImg(component.getShowImg());
                     codeBeanFromRule.setShowImg(component.getShowImg());
 
 
                     //如果已经确认尺寸，使用确认的尺寸
                     //如果已经确认尺寸，使用确认的尺寸
-                    if(component.isSizeConfirmed() || ((component.hasSizeInfo())&&(!codeBeanFromRule.hasReelSizeInfo()))){
+                    if (component.isSizeConfirmed() || ((component.hasSizeInfo()) && (!codeBeanFromRule.hasReelSizeInfo()))) {
                         codeBeanFromRule.setReelWidth(component.getPlateSize());
                         codeBeanFromRule.setReelWidth(component.getPlateSize());
                         codeBeanFromRule.setReelHeight(component.getHeight());
                         codeBeanFromRule.setReelHeight(component.getHeight());
+
+                        if (barcode.getHeight() != component.getHeight() || barcode.getPlateSize() != component.getPlateSize()) {
+                            try {
+                                log.warn("重新设置尺寸[" + barcode.getPlateSize() + "x" + barcode.getHeight() + "]为[" + component.getPlateSize() + "x" + component.getHeight() + "]");
+
+                                barcode.setPlateSize(component.getPlateSize());
+                                barcode.setHeight(component.getHeight());
+                                barcode = barcodeManager.save(barcode);
+                            } catch (Exception ve) {
+                                log.error("重设尺寸出错", ve);
                             }
                             }
                         }
                         }
-                if(codeBeanFromRule.hasReelSizeInfo()){
+                        setSize = true;
+                    }
+                }
+                if((!setSize)&& codeBeanFromRule.hasReelSizeInfo()){
                     //如果客户端传入的有尺寸,但尺寸不一致,使用上传上来的尺寸
                     //如果客户端传入的有尺寸,但尺寸不一致,使用上传上来的尺寸
                     if(barcode.getHeight() != codeBeanFromRule.getReelHeight() || barcode.getPlateSize() != codeBeanFromRule.getReelWidth()){
                     if(barcode.getHeight() != codeBeanFromRule.getReelHeight() || barcode.getPlateSize() != codeBeanFromRule.getReelWidth()){
                         try{
                         try{