楚江ERP-发货单批量导出模板更换

@@ -34,6 +34,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
@@ -47,11 +48,15 @@ import java.math.RoundingMode;
 import java.nio.file.Files;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.Paths;
+import java.time.Duration;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.Comparator;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 import java.util.zip.ZipOutputStream;
@@ -74,6 +79,8 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
     private ShipmentsPlanDetailService shipmentsPlanDetailService;
     private ShipmentsPlanDetailService shipmentsPlanDetailService;
     @Resource
     @Resource
     private SysUserService sysUserService;
     private SysUserService sysUserService;
+    @Resource
+    private RedisTemplate redisTemplate;
 
 
 
 
     /**
     /**
@@ -366,7 +373,7 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
                 }
                 }
                 String latex = LatexFormulaExcelExporterUtil.convertToLatex(formulaComponentList);
                 String latex = LatexFormulaExcelExporterUtil.convertToLatex(formulaComponentList);
                 if (StringUtils.isNotBlank(latex)) {
                 if (StringUtils.isNotBlank(latex)) {
-                    LatexFormulaExcelExporterUtil.insertLatexImageToCell(workbook, sheet, latex, startRow, 4, 1, 7);
+                    LatexFormulaExcelExporterUtil.insertLatexImageToCell(workbook, sheet, latex, startRow, 2, 1, 7);
                 }
                 }
                 ExcelUtil.setCellValue(sheet, startRow, 9, detail.getQuantity());
                 ExcelUtil.setCellValue(sheet, startRow, 9, detail.getQuantity());
                 if ("TYPE_2".equals(type)) {
                 if ("TYPE_2".equals(type)) {
@@ -375,9 +382,11 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
                     ExcelUtil.setCellValue(sheet, startRow, 12, detail.getSalesPrice());
                     ExcelUtil.setCellValue(sheet, startRow, 12, detail.getSalesPrice());
                     ExcelUtil.setCellValue(sheet, startRow, 13, detail.getOrderType());
                     ExcelUtil.setCellValue(sheet, startRow, 13, detail.getOrderType());
                     ExcelUtil.setCellValue(sheet, startRow, 14, detail.getYieldBatchNo());
                     ExcelUtil.setCellValue(sheet, startRow, 14, detail.getYieldBatchNo());
+                    ExcelUtil.setCellValue(sheet, startRow, 15, " -- ");
                 } else {
                 } else {
                     ExcelUtil.setCellValue(sheet, startRow, 13, detail.getPackagingFee());
                     ExcelUtil.setCellValue(sheet, startRow, 13, detail.getPackagingFee());
                     ExcelUtil.setCellValue(sheet, startRow, 15, detail.getOrderType());
                     ExcelUtil.setCellValue(sheet, startRow, 15, detail.getOrderType());
+                    ExcelUtil.setCellValue(sheet, startRow, 16, " -- ");
                 }
                 }
                 startRow++;
                 startRow++;
             }
             }
@@ -386,12 +395,13 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
             dataMap.put("createDate", dateFormatter.format(orderInfo.getCreateTime()));
             dataMap.put("createDate", dateFormatter.format(orderInfo.getCreateTime()));
             SysUser user = sysUserService.findById(orderInfo.getCreateById());
             SysUser user = sysUserService.findById(orderInfo.getCreateById());
             dataMap.put("createBy", user.getName());
             dataMap.put("createBy", user.getName());
-            dataMap.put("totalQuantity", totalQuantity.setScale(2, RoundingMode.HALF_UP));
-            dataMap.put("totalActualQuantity", totalActualQuantity.setScale(2, RoundingMode.HALF_UP));
-            dataMap.put("totalNum", totalNum.setScale(2, RoundingMode.HALF_UP));
-            dataMap.put("totalPrice", totalPrice.setScale(2, RoundingMode.HALF_UP));
+            dataMap.put("totalQuantity", totalQuantity.doubleValue() > 0 ? totalQuantity.setScale(2, RoundingMode.HALF_UP) : null);
+            dataMap.put("totalActualQuantity", totalActualQuantity.doubleValue() > 0 ? totalActualQuantity.setScale(2, RoundingMode.HALF_UP) : null);
+            dataMap.put("totalNum", totalNum.doubleValue() > 0 ? totalNum.setScale(2, RoundingMode.HALF_UP) : null);
+            dataMap.put("totalPrice", totalPrice.doubleValue() > 0 ? totalPrice.setScale(2, RoundingMode.HALF_UP) : null);
             // 流水号
             // 流水号
-            String serialNumber = "";
+            String serialNumber = createSerialNumber(null, "SHIPMENT_ORDER_SERIAL_NUMBER");
+            dataMap.put("serialNumber", serialNumber);
             // 处理模板中的占位符
             // 处理模板中的占位符
             ExcelUtil.processTemplate(workbook, dataMap);
             ExcelUtil.processTemplate(workbook, dataMap);
             // 生成文件名
             // 生成文件名
@@ -490,4 +500,36 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
             log.warn("清理临时文件失败", e);
             log.warn("清理临时文件失败", e);
         }
         }
     }
     }
+
+
+
+    /**
+     * 生成当天流水号
+     *
+     * @return String
+     */
+    public String createSerialNumber(String pre, String key) {
+        // 1. 获取当前年月日（格式：yyyyMMdd）
+        String datePart = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+        // 2. Redis自增序列
+        Long id = redisTemplate.opsForValue().increment(key, 1);
+        if (id != null && id == 1) {
+            // 计算到次日零点的秒数
+            LocalDateTime now = LocalDateTime.now();
+            LocalDateTime midnight = now.toLocalDate().plusDays(1).atStartOfDay();
+            long secondsUntilMidnight = Duration.between(now, midnight).getSeconds();
+
+            redisTemplate.expire(key, secondsUntilMidnight, TimeUnit.SECONDS);
+        }
+        // 3. 补零到4位
+        String incrPart = String.format("%04d", id);
+        // 4. 拼接最终结果
+        String result = "";
+        if (StringUtils.isBlank(pre)) {
+            result = datePart + incrPart;
+        } else {
+            result = pre + datePart + incrPart;
+        }
+        return result;
+    }
 }
 }