元器件增加尺寸确认功能

src/main/java/com/neotel/smfcore/core/barcode/rest/bean/dto/ComponentDto.java

@@ -146,4 +146,7 @@ public class ComponentDto implements Serializable {
 
     @ApiModelProperty("PN类型")
     private String pnType= "";
+
+    @ApiModelProperty("尺寸是否已经确认")
+    private boolean sizeConfirmed = false;
 }

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

@@ -120,6 +120,11 @@ public class Component extends BasePo implements Serializable {
     private int height;
 
     /**
+     * 尺寸是否已经确认
+     */
+    private boolean sizeConfirmed = false;
+
+    /**
      * 单台料仓可存储此种物料的最大数量
      */
     private int maxStoreNum = 999999999;

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

@@ -103,6 +103,12 @@ public class CodeResolve {
                 if(component != null){
                     validDay = component.getValidDay();
                     codeBeanFromRule.setShowImg(component.getShowImg());
+
+                    //如果已经确认尺寸，使用确认的尺寸
+                    if(component.isSizeConfirmed()){
+                        codeBeanFromRule.setReelWidth(component.getPlateSize());
+                        codeBeanFromRule.setReelHeight(component.getHeight());
+                    }
                 }
 
                 Barcode barcodeFromRule = codeBeanFromRule.getBarcode();
@@ -177,8 +183,13 @@ public class CodeResolve {
                             component.setType(type);
                             componentManager.save(component);
                         }else{
+                            //如果已经确认尺寸，使用确认的尺寸
+                            if(component.isSizeConfirmed()){
+                                codeBeanFromRule.setReelWidth(component.getPlateSize());
+                                codeBeanFromRule.setReelHeight(component.getHeight());
+                            }
                             //如果 barcode 里的料盘信息比 Component 中的大,使用比较大的,防止放不进去撞击
-                            if(codeBeanFromRule.getReelHeight() > component.getHeight() || codeBeanFromRule.getReelWidth() > component.getPlateSize()){
+                            else if(codeBeanFromRule.getReelHeight() > component.getHeight() || codeBeanFromRule.getReelWidth() > component.getPlateSize()){
                                 log.info("更新物料["+component.getPartNumber()+"]档案尺寸["+component.getPlateSize()+"x"+component.getHeight()+"]为["+codeBeanFromRule.getReelWidth()+"x"+codeBeanFromRule.getReelHeight()+"]");
                                 component.setPlateSize(barcodeFromRule.getPlateSize());
                                 component.setHeight(barcodeFromRule.getHeight());
@@ -198,8 +209,13 @@ public class CodeResolve {
                             log.info("档案["+barcodeFromRule.getPartNumber()+"]不存在");
 //                            throw new ValidateException("component.error.notExist",new String[]{barcodeFromRule.getPartNumber()});
                             throw new ValidateException("smfcore.valueNotExist","{0}[{1}]不存在",new String[]{"component",barcodeFromRule.getPartNumber()});
+                        }else if(component.isSizeConfirmed()) {
+                            //如果已经确认尺寸，使用确认的尺寸
+                            codeBeanFromRule.setReelWidth(component.getPlateSize());
+                            codeBeanFromRule.setReelHeight(component.getHeight());
                         }
 
+
                         codeBeanFromRule.setShowImg(component.getShowImg());
                         Date produceDate = barcodeFromRule.getProduceDate();
                         if(produceDate != null && barcodeFromRule.getExpireDate() == null){