幅宽小数

common/src/main/java/com/jpsoft/printing/modules/base/entity/Work.java

@@ -24,7 +24,7 @@ public class Work {
         @ApiModelProperty(value = "品种及规格")
     private String name;
         @ApiModelProperty(value = "幅宽")
-    private Integer width;
+    private Double width;
         @ApiModelProperty(value = "编号")
     private String number;
         @DateTimeFormat(pattern="yyyy-MM-dd")

web/src/main/java/com/jpsoft/printing/modules/base/controller/WorkController.java

@@ -295,6 +295,14 @@ public class WorkController {
                         stock.setTagLength(stock.getTagLength().divide(new BigDecimal(0.914400), 1, BigDecimal.ROUND_HALF_UP));
                     }
                 }
+                else{
+                    if(work.getIsInteger()){
+                        stock.setTagLength(stock.getTagLength().setScale(0,BigDecimal.ROUND_HALF_UP));
+                    }
+                    else{
+                        stock.setTagLength(stock.getTagLength().setScale(1,BigDecimal.ROUND_HALF_UP));
+                    }
+                }
 
                 totalLength = totalLength.add(stock.getTagLength());
             }
@@ -349,10 +357,18 @@ public class WorkController {
 
             if(work.getTagUnit().equals("码")){
                 if(work.getIsInteger()){
-                    stock.setTagLength(stock.getTagLength().divide(new BigDecimal(0.914400), 0, BigDecimal.ROUND_HALF_UP));
+                    stock.setTagLength(stock.getTagLength().divide(new BigDecimal(0.914400),0,BigDecimal.ROUND_HALF_UP));
+                }
+                else{
+                    stock.setTagLength(stock.getTagLength().divide(new BigDecimal(0.914400),1,BigDecimal.ROUND_HALF_UP));
+                }
+            }
+            else{
+                if(work.getIsInteger()){
+                    stock.setTagLength(stock.getTagLength().setScale(0,BigDecimal.ROUND_HALF_UP));
                 }
                 else{
-                    stock.setTagLength(stock.getTagLength().divide(new BigDecimal(0.914400), 1, BigDecimal.ROUND_HALF_UP));
+                    stock.setTagLength(stock.getTagLength().setScale(1,BigDecimal.ROUND_HALF_UP));
                 }
             }