修复成本问题

klp-wms/src/main/java/com/klp/controller/WmsCostCoilDailyController.java

@@ -204,6 +204,22 @@ public class WmsCostCoilDailyController extends BaseController {
         return R.ok(result);
     }
 
+    /**
+     * 按当前钢卷号维度计算成本（单卷详情）
+     *
+     * @param currentCoilNo 当前钢卷号
+     * @param calcDate      计算日期（可选，默认当前日期）
+     */
+    @PostMapping("/calculateByCurrentCoilNo")
+    public R<Map<String, Object>> calculateCostByCurrentCoilNo(@RequestParam String currentCoilNo,
+                                                                @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate calcDate) {
+        Map<String, Object> result = iWmsCostCoilDailyService.calculateCostByCurrentCoilNo(currentCoilNo, calcDate);
+        if (result.containsKey("error")) {
+            return R.fail(result.get("error").toString());
+        }
+        return R.ok(result);
+    }
+
     /**
      * 现算成本检索（基于 wms_material_coil）
      */

klp-wms/src/main/java/com/klp/service/IWmsCostCoilDailyService.java

@@ -106,6 +106,15 @@ public interface IWmsCostCoilDailyService {
      */
     Map<String, Object> calculateCostByEnterCoilNo(String enterCoilNo, LocalDate calcDate);
 
+    /**
+     * 按当前钢卷号维度计算成本（单卷详情）
+     *
+     * @param currentCoilNo 当前钢卷号
+     * @param calcDate      计算日期（可选，默认当前日期）
+     * @return 单卷成本详情
+     */
+    Map<String, Object> calculateCostByCurrentCoilNo(String currentCoilNo, LocalDate calcDate);
+
     /**
      * 批量按入场钢卷号维度计算成本（定时任务使用）
      * 按入场钢卷号分组，计算每个入场钢卷号的总成本

klp-wms/src/main/java/com/klp/service/impl/WmsCostCoilDailyServiceImpl.java

@@ -573,6 +573,95 @@ public class WmsCostCoilDailyServiceImpl implements IWmsCostCoilDailyService {
         return result;
     }
 
+    /**
+     * 按当前钢卷号维度计算成本（单卷详情）
+     */
+    @Override
+    public Map<String, Object> calculateCostByCurrentCoilNo(String currentCoilNo, LocalDate calcDate) {
+        Map<String, Object> result = new HashMap<>();
+        result.put("currentCoilNo", currentCoilNo);
+
+        if (calcDate == null) {
+            calcDate = LocalDate.now();
+        }
+
+        // 查询单个钢卷
+        QueryWrapper<WmsMaterialCoil> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("current_coil_no", currentCoilNo)
+                .eq("data_type", 1)
+                .eq("del_flag", 0);
+
+        WmsMaterialCoil coil = coilMapper.selectOne(queryWrapper);
+        if (coil == null) {
+            result.put("error", "未找到当前钢卷号 " + currentCoilNo + " 的相关钢卷");
+            return result;
+        }
+
+        // 计算在库天数
+        LocalDate startDate = coil.getCreateTime() != null
+                ? coil.getCreateTime().toInstant().atZone(java.time.ZoneId.systemDefault()).toLocalDate()
+                : LocalDate.now();
+
+        LocalDate endDate;
+        if (coil.getExportTime() != null) {
+            endDate = coil.getExportTime().toInstant()
+                    .atZone(java.time.ZoneId.systemDefault())
+                    .toLocalDate()
+                    .minusDays(1);
+        } else {
+            endDate = calcDate;
+        }
+
+        if (endDate.isBefore(startDate)) {
+            endDate = startDate;
+        }
+
+        long days = ChronoUnit.DAYS.between(startDate, endDate) + 1;
+        if (days < 1) {
+            days = 1;
+        }
+
+        // 成本标准
+        WmsCostStandardConfigVo costStandard = costStandardConfigService.queryEffectiveByDate(startDate);
+        if (costStandard == null) {
+            costStandard = costStandardConfigService.queryCurrentEffective();
+        }
+
+        if (costStandard == null || costStandard.getUnitCost() == null) {
+            result.put("error", "未找到有效的成本标准配置");
+            return result;
+        }
+
+        BigDecimal unitCost = costStandard.getUnitCost();
+
+        // 重量与成本基础
+        WeightContext weightContext = resolveWeightContext(coil);
+        if (!weightContext.isValid()) {
+            result.put("error", "钢卷缺少有效重量，无法计算");
+            return result;
+        }
+
+        BigDecimal dailyCost = weightContext.getCostTon().multiply(unitCost).setScale(2, RoundingMode.HALF_UP);
+        BigDecimal totalCost = dailyCost.multiply(BigDecimal.valueOf(days)).setScale(2, RoundingMode.HALF_UP);
+
+        result.put("coilId", coil.getCoilId());
+        result.put("currentCoilNo", coil.getCurrentCoilNo());
+        result.put("isShipped", coil.getExportTime() != null);
+        result.put("netWeightTon", weightContext.getNetTon());
+        result.put("grossWeightTon", weightContext.getGrossTon());
+        result.put("weightBasis", weightContext.useGross() ? "gross" : "net");
+        result.put("storageDays", days);
+        result.put("unitCost", unitCost);
+        result.put("dailyCost", dailyCost);
+        result.put("totalCost", totalCost);
+        result.put("startDate", startDate);
+        result.put("endDate", endDate);
+        result.put("exportTime", coil.getExportTime());
+        result.put("calcDate", calcDate);
+
+        return result;
+    }
+
     /**
      * 批量按入场钢卷号维度计算成本（定时任务使用）
      */