元器件增加物料间距

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

@@ -244,4 +244,8 @@ public class BarcodeDto implements Serializable {
 
 
     @ApiModelProperty("是否是冻结的湿敏物料")
     @ApiModelProperty("是否是冻结的湿敏物料")
     private boolean lockMsl;
     private boolean lockMsl;
+
+    @ApiModelProperty("物料间距")
+    private int distance=0;
 }
 }
+

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

@@ -168,4 +168,7 @@ public class ComponentDto implements Serializable {
 
 
     @ApiModelProperty("散盘比")
     @ApiModelProperty("散盘比")
     private  int halfReel=0;
     private  int halfReel=0;
+
+    @ApiModelProperty("物料间距")
+    private int distance=0;
 }
 }

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

@@ -246,6 +246,10 @@ public class Barcode extends BasePo implements Serializable {
 
 
 
 
     /**
     /**
+     * 物料间距
+     */
+    private int distance=0;
+    /**
      * 添加相关联条码
      * 添加相关联条码
      *
      *
      * @param relationCode
      * @param relationCode

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

@@ -96,6 +96,15 @@ public class CodeResolve {
                         codeBeanFromRule.setReelWidth(component.getPlateSize());
                         codeBeanFromRule.setReelWidth(component.getPlateSize());
                         codeBeanFromRule.setReelHeight(component.getHeight());
                         codeBeanFromRule.setReelHeight(component.getHeight());
                     }
                     }
+                    if(component.getDistance()!=barcode.getDistance()){
+                        barcode.setDistance(component.getDistance());
+                        log.info("重新设置"+codeBeanFromRule.getCodeStr()+"物料间距为:"+barcode.getDistance());
+                        try {
+                            barcodeManager.save(barcode);
+                        }catch (Exception e){
+                            log.error("",e);
+                        }
+                    }
                 }
                 }
                 if(codeBeanFromRule.hasReelSizeInfo()){
                 if(codeBeanFromRule.hasReelSizeInfo()){
                     //如果客户端传入的有尺寸,但尺寸不一致,使用上传上来的尺寸
                     //如果客户端传入的有尺寸,但尺寸不一致,使用上传上来的尺寸
@@ -232,7 +241,7 @@ public class CodeResolve {
                             }
                             }
                         }
                         }
 
 
-
+                        barcodeFromRule.setDistance(component.getDistance());
                         barcode = barcodeManager.save(barcodeFromRule);
                         barcode = barcodeManager.save(barcodeFromRule);
 
 
                         codeBeanFromRule.setCodeStr(barcode.getBarcode());
                         codeBeanFromRule.setCodeStr(barcode.getBarcode());