解决启动错误

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusMaterialsorderController.java

@@ -42,7 +42,69 @@ public class BusMaterialsorderController extends BaseController {
     private final IBusMaterialsorderService busMaterialsorderService;
     private final IBusCailiaoshebeiPiciService busCailiaoshebeiPiciService;
 
-//    /**
+    //================================订货================================
+
+
+    /**
+     * 订货-批次号列表
+     */
+    @SaCheckPermission("cailiaoshebei:materialsorder:pcPlanList")
+    @GetMapping("/pcPlanList")
+    public TableDataInfo<BusCailiaoshebeiPiciVo> pcPlanList(BusCailiaoshebeiPiciPcListReq bo, PageQuery pageQuery) {
+        BusCailiaoshebeiPiciBo busCailiaoshebeiPiciBo = BeanUtil.copyProperties(bo, BusCailiaoshebeiPiciBo.class);
+        busCailiaoshebeiPiciBo.setBatchType("3");
+        return busCailiaoshebeiPiciService.queryPageList(busCailiaoshebeiPiciBo, pageQuery);
+    }
+
+    /**
+     * 订货-修改订货信息
+     */
+    @SaCheckPermission("cailiaoshebei:materialsorder:modifyTheOrderForm")
+    @Log(title = "订货-修改订货信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping("/modifyTheOrderForm")
+    public R<Void> modifyTheOrderForm(@Validated(EditGroup.class) @RequestBody MaterialsorderPcPlanEditReq req) {
+        return toAjax(busMaterialsorderService.modifyTheOrderForm(req));
+    }
+
+
+    /**
+     * 订货-查询物资设备订货列表
+     */
+    @SaCheckPermission("cailiaoshebei:materialsorder:list")
+    @GetMapping("/list")
+    public TableDataInfo<BusMaterialsorderVo> list(BusMaterialsorderListReq req, PageQuery pageQuery) {
+        BusMaterialsorderBo bo = BeanUtil.copyProperties(req, BusMaterialsorderBo.class);
+        return busMaterialsorderService.queryPageList(bo, pageQuery);
+    }
+
+
+    //================================物资设备批次需求计划执行跟踪================================
+
+    /**
+     * 跟踪-批次号列表
+     */
+    @SaCheckPermission("cailiaoshebei:materialsorder:trackPcPlanList")
+    @GetMapping("/trackPcPlanList")
+    public TableDataInfo<BusCailiaoshebeiPiciVo> trackPcPlanList(BusCailiaoshebeiPiciPcListReq bo, PageQuery pageQuery) {
+        BusCailiaoshebeiPiciBo busCailiaoshebeiPiciBo = BeanUtil.copyProperties(bo, BusCailiaoshebeiPiciBo.class);
+        busCailiaoshebeiPiciBo.setBatchType("3");
+        return busCailiaoshebeiPiciService.queryPageList(busCailiaoshebeiPiciBo, pageQuery);
+    }
+
+    /**
+     * 跟踪-计划执行跟踪列表
+     */
+    @SaCheckPermission("cailiaoshebei:materialsorder:planExecutionTrackingList")
+    @GetMapping("/planExecutionTrackingList")
+    public TableDataInfo<BusMaterialsorderVo> planExecutionTrackingList(PlanExecutionTrackingListReq req, PageQuery pageQuery) {
+        BusMaterialsorderBo bo = BeanUtil.copyProperties(req, BusMaterialsorderBo.class);
+        return busMaterialsorderService.queryPageList(bo, pageQuery);
+    }
+
+
+
+    //    /**
 //     * 查询物资-设备订货列表
 //     */
 //    @SaCheckPermission("cailiaoshebei:materialsorder:list")
@@ -109,37 +171,4 @@ public class BusMaterialsorderController extends BaseController {
 //        return toAjax(busMaterialsorderService.deleteWithValidByIds(List.of(ids), true));
 //    }
 
-
-    /**
-     * 订货-批次号列表
-     */
-    @SaCheckPermission("cailiaoshebei:materialsorder:pcPlanList")
-    @GetMapping("/pcPlanList")
-    public TableDataInfo<BusCailiaoshebeiPiciVo> pcPlanList(BusCailiaoshebeiPiciPcListReq bo, PageQuery pageQuery) {
-        BusCailiaoshebeiPiciBo busCailiaoshebeiPiciBo = BeanUtil.copyProperties(bo, BusCailiaoshebeiPiciBo.class);
-        busCailiaoshebeiPiciBo.setBatchType("3");
-        return busCailiaoshebeiPiciService.queryPageList(busCailiaoshebeiPiciBo, pageQuery);
-    }
-
-    /**
-     * 订货-修改订货信息
-     */
-    @SaCheckPermission("cailiaoshebei:materialsorder:modifyTheOrderForm")
-    @Log(title = "订货-修改订货信息", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
-    @PutMapping("/modifyTheOrderForm")
-    public R<Void> modifyTheOrderForm(@Validated(EditGroup.class) @RequestBody MaterialsorderPcPlanEditReq req) {
-        return toAjax(busMaterialsorderService.modifyTheOrderForm(req));
-    }
-
-
-    /**
-     * 订货-查询物资设备订货列表
-     */
-    @SaCheckPermission("cailiaoshebei:materialsorder:list")
-    @GetMapping("/list")
-    public TableDataInfo<BusMaterialsorderVo> list(BusMaterialsorderListReq req, PageQuery pageQuery) {
-        BusMaterialsorderBo bo = BeanUtil.copyProperties(req, BusMaterialsorderBo.class);
-        return busMaterialsorderService.queryPageList(bo, pageQuery);
-    }
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/bo/BusMaterialbatchdemandplanBo.java

@@ -29,9 +29,9 @@ public class BusMaterialbatchdemandplanBo extends BaseEntity {
     private Long id;
 
     /**
-     * 批次ID
+     * 批次号
      */
-    private String batchId;
+    private String batchNumber;
 
     /**
      * 项目ID

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/bo/BusMaterialsorderListReq.java

@@ -16,9 +16,9 @@ import java.io.Serializable;
 public class BusMaterialsorderListReq implements Serializable {
 
     /**
-     * 批次ID
+     * 批次号
      */
-    private String batchId;
+    private String batchNumber;
 
     /**
      * 项目ID

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/bo/PlanExecutionTrackingListReq.java

@@ -0,0 +1,31 @@
+package org.dromara.cailiaoshebei.domain.bo;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @Author 铁憨憨
+ * @Date 2025/8/4 15:06
+ * @Version 1.0
+ */
+
+@Data
+@Accessors(chain = true)
+public class PlanExecutionTrackingListReq implements Serializable {
+    /**
+     * 批次号
+     */
+    private String batchNumber;
+
+    /**
+     * 项目ID
+     */
+    private Long projectId;
+
+    /**
+     * 设备材料名称
+     */
+    private String name;
+}

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusMaterialbatchdemandplanServiceImpl.java

@@ -76,7 +76,7 @@ public class BusMaterialbatchdemandplanServiceImpl extends ServiceImpl<BusMateri
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<BusMaterialbatchdemandplan> lqw = Wrappers.lambdaQuery();
         lqw.orderByAsc(BusMaterialbatchdemandplan::getId);
-        lqw.eq(StringUtils.isNotBlank(bo.getBatchId()), BusMaterialbatchdemandplan::getBatchId, bo.getBatchId());
+        lqw.eq(StringUtils.isNotBlank(bo.getBatchNumber()), BusMaterialbatchdemandplan::getBatchNumber, bo.getBatchNumber());
         lqw.eq(bo.getProjectId() != null, BusMaterialbatchdemandplan::getProjectId, bo.getProjectId());
         lqw.eq(bo.getCailiaoshebeiId() != null, BusMaterialbatchdemandplan::getCailiaoshebeiId, bo.getCailiaoshebeiId());
         lqw.eq(bo.getSuppliespriceId() != null, BusMaterialbatchdemandplan::getSuppliespriceId, bo.getSuppliespriceId());