fix(工作交接): 修改交接单各个字段的长度限制

dev-file/src/main/java/com/tykj/dev/device/file/util/JavaToPdfHtmlFreeMarker.java

@@ -2098,9 +2098,9 @@ public class JavaToPdfHtmlFreeMarker {
             if (i+max==15){
                 String s=String.join("",toListString(documentDevice.getDeviceSerialNumber(),56));
                 documentDevice.setOneCount(max);
-                documentDevice.setModel(String.join("",toListString(documentDevice.getModel(),13)));
-                documentDevice.setParts(String.join("",toListString(documentDevice.getParts(),13)));
-                documentDevice.setRemark(String.join("",toListString(documentDevice.getRemark(),12)));
+                documentDevice.setModel(String.join("",toListString(documentDevice.getModel(),17)));
+                documentDevice.setParts(String.join("",toListString(documentDevice.getParts(),17)));
+                documentDevice.setRemark(String.join("",toListString(documentDevice.getRemark(),15)));
                 documentDevice.setDeviceSerialNumber(s);
                 code++;
                 documentDevice.setCode(code);
@@ -2111,10 +2111,10 @@ public class JavaToPdfHtmlFreeMarker {
             }else if (i+max>15){
                 //当前页面少了多少行
                 int differ=15-i;
-                List<String> modelList= toListString(documentDevice.getModel(),13);
+                List<String> modelList= toListString(documentDevice.getModel(),17);
                 List<String> seqList=toListString(documentDevice.getDeviceSerialNumber(),56);
-                List<String> pasList=toListString(documentDevice.getParts(),13);
-                List<String> remarkList=toListString(documentDevice.getRemark(),12);
+                List<String> pasList=toListString(documentDevice.getParts(),17);
+                List<String> remarkList=toListString(documentDevice.getRemark(),15);
                 DocumentDevice documentDevice1=new DocumentDevice();
                 if (modelList.size()>differ){
                     documentDevice.setModel(String.join("",modelList.subList(0,differ)));
@@ -2157,9 +2157,9 @@ public class JavaToPdfHtmlFreeMarker {
             }else {
                 String s=String.join("",toListString(documentDevice.getDeviceSerialNumber(),56));
                 code++;
-                documentDevice.setModel(String.join("",toListString(documentDevice.getModel(),13)));
-                documentDevice.setParts(String.join("",toListString(documentDevice.getParts(),13)));
-                documentDevice.setRemark(String.join("",toListString(documentDevice.getRemark(),12)));
+                documentDevice.setModel(String.join("",toListString(documentDevice.getModel(),17)));
+                documentDevice.setParts(String.join("",toListString(documentDevice.getParts(),17)));
+                documentDevice.setRemark(String.join("",toListString(documentDevice.getRemark(),15)));
                 documentDevice.setCode(code);
                 documentDevice.setOneCount(max);
                 documentDevice.setDeviceSerialNumber(s);
@@ -2179,10 +2179,10 @@ public class JavaToPdfHtmlFreeMarker {
         int deviceSerialNumberCount=String_length(documentDevice.getDeviceSerialNumber());
         int modelCount=String_length(documentDevice.getModel());
         int remarkCount=String_length(documentDevice.getRemark());
-        int parts = (partsCount%13>0) ? partsCount/13 + 1 :  partsCount/13;
+        int parts = (partsCount%17>0) ? partsCount/17 + 1 :  partsCount/17;
         int deviceSerialNumber=(deviceSerialNumberCount%56>0) ? deviceSerialNumberCount/56 + 1 :  deviceSerialNumberCount/56;
-        int model=(modelCount%13>0) ? modelCount/13 + 1 :  modelCount/13;
-        int remark=(remarkCount%12>0) ? remarkCount/12 + 1 :  remarkCount/12;
+        int model=(modelCount%17>0) ? modelCount/17 + 1 :  modelCount/17;
+        int remark=(remarkCount%15>0) ? remarkCount/15 + 1 :  remarkCount/15;
         int  max=parts;
         //求最大
         if(max<deviceSerialNumber){

dev-union/src/main/resources/htmlTemplate/bill13.html

@@ -429,7 +429,7 @@
                                     <th  width="150px" >型号</th>
                                     <th  width="150px" >名称</th>
                                     <th  width="80px">数量</th>
-                                    <th >装备序列号</th>
+                                    <th width="420px">装备序列号</th>
                                     <th width="160px">备注</th>
 
                                 </tr>
@@ -490,7 +490,7 @@
                                     <th  width="150px" ></th>
                                     <th  width="150px" ></th>
                                     <th  width="80px"></th>
-                                    <th ></th>
+                                    <th width="420px"></th>
                                     <th  width="160px"></th>
                                 </tr>
                                 <tr class="altrowstableTr">