已存在的条码不更改尺寸

src/main/java/com/neotel/smfcore/core/barcode/service/po/Barcode.java

@@ -242,6 +242,9 @@ public class Barcode extends BasePo implements Serializable {
      * @param appendValue
      * @param appendValue
      */
      */
     public void updateAppendData(String appendKey, Object appendValue){
     public void updateAppendData(String appendKey, Object appendValue){
+        if(appendData==null){
+            appendData=new HashMap<>();
+        }
         appendData.put(appendKey, appendValue);
         appendData.put(appendKey, appendValue);
     }
     }
 
 
@@ -252,6 +255,9 @@ public class Barcode extends BasePo implements Serializable {
      * @return
      * @return
      */
      */
     public <T> T getAppendData(String appendKey){
     public <T> T getAppendData(String appendKey){
+        if(appendData==null){
+            return null;
+        }
         Object value = appendData.get(appendKey);
         Object value = appendData.get(appendKey);
         if(value != null){
         if(value != null){
             return (T)value;
             return (T)value;

src/main/java/com/neotel/smfcore/core/barcode/service/po/Component.java

@@ -216,6 +216,9 @@ public class Component extends BasePo implements Serializable {
      * @param appendValue
      * @param appendValue
      */
      */
     public void updateAppendData(String appendKey, String appendValue){
     public void updateAppendData(String appendKey, String appendValue){
+        if(appendData==null){
+            appendData=new HashMap<>();
+        }
         appendData.put(appendKey, appendValue);
         appendData.put(appendKey, appendValue);
     }
     }
 
 
@@ -226,6 +229,9 @@ public class Component extends BasePo implements Serializable {
      * @return
      * @return
      */
      */
     public <T> T getAppendData(String appendKey){
     public <T> T getAppendData(String appendKey){
+        if(appendData==null){
+            return null;
+        }
         Object value = appendData.get(appendKey);
         Object value = appendData.get(appendKey);
         if(value != null){
         if(value != null){
             return (T)value;
             return (T)value;

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

@@ -128,6 +128,10 @@ public class CodeResolve {
                     validDay = component.getValidDay();
                     validDay = component.getValidDay();
                     codeBeanFromRule.setShowImg(component.getShowImg());
                     codeBeanFromRule.setShowImg(component.getShowImg());
 
 
+                    if(!codeBeanFromRule.hasReelSizeInfo()) {
+                        codeBeanFromRule.setReelHeight(barcode.getHeight());
+                        codeBeanFromRule.setReelWidth(barcode.getPlateSize());
+                    }
                     //如果已经确认尺寸，使用确认的尺寸
                     //如果已经确认尺寸，使用确认的尺寸
                     if (component.isSizeConfirmed() || ((component.hasSizeInfo()) && (!codeBeanFromRule.hasReelSizeInfo()))) {
                     if (component.isSizeConfirmed() || ((component.hasSizeInfo()) && (!codeBeanFromRule.hasReelSizeInfo()))) {
                         codeBeanFromRule.setReelWidth(component.getPlateSize());
                         codeBeanFromRule.setReelWidth(component.getPlateSize());