提交

src/main/java/cn/ezhizao/project/business/controller/BizInboundOrderController.java

@@ -178,18 +178,18 @@ public class BizInboundOrderController extends BaseController {
             if (maxCode != null) {
                 codeValue = maxCode.getInboundNumber();
                 // 获取4位尾数部分
-                int lastFourDigits = Integer.parseInt(codeValue.substring(beginIndex, beginIndex + 4));
+                int lastFourDigits = Integer.parseInt(codeValue.substring(beginIndex, beginIndex + 5));
                 lastFourDigits++; // 加1
-                codeValue = codeValue.substring(0, beginIndex) + String.format("%04d", lastFourDigits);
+                codeValue = codeValue.substring(0, beginIndex) + String.format("%05d", lastFourDigits);
                 previous = codeValue;
             } else {
-                previous = (beginCode + "0001");
+                previous = (beginCode + "00001");
             }
         } else {
-            codeValue = previous.startsWith(beginCode) ? previous : beginCode + "0000";
-            int lastFourDigits = Integer.parseInt(codeValue.substring(beginIndex, beginIndex + 4));
+            codeValue = previous.startsWith(beginCode) ? previous : beginCode + "00000";
+            int lastFourDigits = Integer.parseInt(codeValue.substring(beginIndex, beginIndex + 5));
             lastFourDigits++; // 加1
-            codeValue = codeValue.substring(0, beginIndex) + String.format("%04d", lastFourDigits);
+            codeValue = codeValue.substring(0, beginIndex) + String.format("%05d", lastFourDigits);
             previous = codeValue;
         }
 
@@ -332,6 +332,9 @@ public class BizInboundOrderController extends BaseController {
                 detail.setLabelNumber(packageItem != null ? packageItem.getSingleNumber() : null);
                 detail.setDeptCode(dept != null ? dept.getDeptCode() : null);
                 detail.setInboundOrderId(inputDetails.get(0).getInboundOrderId());
+                detail.setBgyna(packageItem != null ? packageItem.getBgyna() : null);
+                detail.setBgyno(packageItem != null ? packageItem.getBgyno() : null);
+                detail.setBgyId(packageItem != null ? packageItem.getBgyId() : null);
             }
             details.add(detail);
         });

src/main/resources/templates/inboundOrderPdf.html

@@ -78,7 +78,8 @@
 </div>
 <!-- 标题行 -->
 <div class="title-row" style="margin-top: 5px ; font-size: 12px ;">
-    <div class="right-align" style="margin-left: 5px; padding-right:310px;" >部门：${inboundOrder.deptCode} ${inboundOrder.deptName}</div>
+    <div class="right-align" style="margin-left: 5px; padding-right:5px;" >部门：${inboundOrder.deptCode} ${inboundOrder.deptName}</div>
+    <div class="right-align" style="margin-left 5px; padding-right: 160px;">转运托盘码： ${inboundOrder.transferCode}</div>
     <div class="center-align" style="font-size: 15px ; padding-right: 325px; font-weight: 600;">产成品入库单</div>
     <div class="left-align" style="margin-right: 5px">第${detail_index+1}页 共 ${inboundOrder.detailLists?size}页</div>
 </div>