细码单调整

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

@@ -23,7 +23,7 @@ public class Stock {
         @ApiModelProperty(value = "机器名")
     private String machineName;
     @ApiModelProperty(value = "编号")
-    private String stockNumber;
+    private Integer stockNumber;
         @ApiModelProperty(value = "长度")
     private BigDecimal length;
         @ApiModelProperty(value = "标签长度")

common/src/main/resources/mapper/base/Stock.xml

@@ -32,7 +32,7 @@
 #{id,jdbcType=VARCHAR}
 ,#{workId,jdbcType=VARCHAR}
 ,#{machineName,jdbcType=VARCHAR}
-,#{stockNumber,jdbcType=VARCHAR}
+,#{stockNumber,jdbcType=NUMERIC}
 ,#{length,jdbcType= NUMERIC }
 ,#{tagLength,jdbcType= NUMERIC }
 ,#{flaw,jdbcType=VARCHAR}
@@ -58,7 +58,7 @@
 		machine_name=#{machineName,jdbcType=VARCHAR},
 		</if>
 				<if test="stockNumber!=null">
-		stock_number=#{stockNumber,jdbcType=VARCHAR},
+		stock_number=#{stockNumber,jdbcType=NUMERIC},
 		</if>
 				<if test="length!=null">
 		length_=#{length,jdbcType= NUMERIC },

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

@@ -315,10 +315,10 @@ public class WorkController {
         List<Stock> stockList = stockService.findList(workId);
         for(int i=0; i<stockList.size(); i++){
             Stock stock = stockList.get(i);
-            totalLength = totalLength.add(stock.getLength());
+            totalLength = totalLength.add(stock.getTagLength());
 
             Map<String, Object> accMap = new HashMap<>();
-            accMap.put("sort", i+1);
+            accMap.put("sort", stock.getStockNumber());
             accMap.put("length", stock.getTagLength());
             mapList.add(accMap);
         }

web/src/main/resources/application-dev.yml

@@ -5,9 +5,9 @@ server:
 
 spring:
   datasource:
-    url: jdbc:log4jdbc:mysql://192.168.77.177:3306/printing?useSSL=false&autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+    url: jdbc:log4jdbc:mysql://192.168.77.122:3306/printing?useSSL=false&autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
     username: root
-    password: jpsoft2023
+    password: 123456
 
 logger:
   level: WARN