From ede1b400397bce43fa8e91919b12c3aaf77bc33d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BD=97=E6=88=90?= <2847920761@qq.com>
Date: Wed, 6 Aug 2025 20:22:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=90=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusMaterialbatchdemandplanController.java | 18 +++----
 .../BusMaterialsorderController.java          | 12 +++++
 .../domain/BusMaterialsorder.java             | 16 +++---
 .../bo/BusMaterialbatchdemandplanBo.java      |  4 +-
 .../domain/bo/BusMaterialsorderBo.java        |  8 +--
 .../domain/bo/MasterDataListReq.java          |  2 +-
 .../bo/MaterialsorderPcPlanEditReq.java       | 14 ++++-
 .../dto/BusCailiaoshebeiEditPlanDto.java      |  7 ++-
 .../vo/BusMaterialbatchdemandplanVo.java      |  3 +-
 .../domain/vo/BusMaterialsorderVo.java        |  7 +--
 .../vo/BusSuppliespriceAddPlanSonRes.java     |  2 +-
 .../mapper/BusCailiaoshebeiMapper.java        |  2 +-
 .../impl/BusCailiaoshebeiServiceImpl.java     | 54 +++++++++++++++++--
 ...BusMaterialbatchdemandplanServiceImpl.java |  5 +-
 .../cailiaoshebei/BusCailiaoshebeiMapper.xml  |  9 ++--
 15 files changed, 122 insertions(+), 41 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusMaterialbatchdemandplanController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusMaterialbatchdemandplanController.java
index 2cede490..b8adced3 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusMaterialbatchdemandplanController.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusMaterialbatchdemandplanController.java
@@ -67,7 +67,7 @@ public class BusMaterialbatchdemandplanController extends BaseController {
     @GetMapping("/pcList")
     public TableDataInfo<BusCailiaoshebeiPiciVo> pcList(BusCailiaoshebeiPiciPcListReq bo, PageQuery pageQuery) {
         BusCailiaoshebeiPiciBo busCailiaoshebeiPiciBo = BeanUtil.copyProperties(bo, BusCailiaoshebeiPiciBo.class);
-        busCailiaoshebeiPiciBo.setBatchType("2  ");
+        busCailiaoshebeiPiciBo.setBatchType("2");
         return busCailiaoshebeiPiciService.queryPageList(busCailiaoshebeiPiciBo, pageQuery);
     }
 
@@ -104,14 +104,14 @@ public class BusMaterialbatchdemandplanController extends BaseController {
         return toAjax(busMaterialbatchdemandplanService.add(bo));
     }
 
-//    /**
-//     * 查询物资-批次需求计划列表
-//     */
-//    @SaCheckPermission("cailiaoshebei:materialbatchdemandplan:list")
-//    @GetMapping("/list")
-//    public TableDataInfo<BusMaterialbatchdemandplanVo> list(BusMaterialbatchdemandplanBo bo, PageQuery pageQuery) {
-//        return busMaterialbatchdemandplanService.queryPageList(bo, pageQuery);
-//    }
+    /**
+     * 查询物资-批次需求计划列表
+     */
+    @SaCheckPermission("cailiaoshebei:materialbatchdemandplan:list")
+    @GetMapping("/list")
+    public TableDataInfo<BusMaterialbatchdemandplanVo> list(BusMaterialbatchdemandplanBo bo, PageQuery pageQuery) {
+        return busMaterialbatchdemandplanService.queryPageList(bo, pageQuery);
+    }
 //
 //    /**
 //     * 导出物资-批次需求计划列表
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusMaterialsorderController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusMaterialsorderController.java
index f253519f..f49df7f8 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusMaterialsorderController.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusMaterialsorderController.java
@@ -44,6 +44,18 @@ public class BusMaterialsorderController extends BaseController {
 
     //================================订货================================
 
+    /**
+     * 测试
+     */
+    @SaCheckPermission("cailiaoshebei:materialsorder:cs")
+    @Log(title = "测试", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping("/cs")
+    public R<Void> cs(@Validated(EditGroup.class) @RequestBody MaterialsorderPcPlanEditReq req) {
+        busMaterialsorderService.extractDataNewAddition(req.getCbatchNumber(),req.getCprojectId() );
+        return toAjax(true);
+    }
+
 
     /**
      * 订货-批次号列表
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/BusMaterialsorder.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/BusMaterialsorder.java
index 40841fad..641f2a16 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/BusMaterialsorder.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/BusMaterialsorder.java
@@ -4,6 +4,8 @@ import org.dromara.common.mybatis.core.domain.BaseEntity;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
+import java.time.LocalDate;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
@@ -77,7 +79,7 @@ public class BusMaterialsorder extends BaseEntity {
     /**
      * 计划到场时间
      */
-    private Date arrivalTime;
+    private LocalDate arrivalTime;
 
     /**
      * 订货数量
@@ -87,12 +89,12 @@ public class BusMaterialsorder extends BaseEntity {
     /**
      * 预计到货时间
      */
-    private Date expectedArrival;
+    private LocalDate expectedArrival;
 
     /**
      * 预计生产完成时间
      */
-    private Date productionTime;
+    private LocalDate productionTime;
 
     /**
      * 备注
@@ -107,22 +109,22 @@ public class BusMaterialsorder extends BaseEntity {
     /**
      * 实际到货时间
      */
-    private Date actualArrival;
+    private LocalDate actualArrival;
 
     /**
      * 需求提交时间
      */
-    private Date requiredTime;
+    private LocalDate requiredTime;
 
     /**
      * 订货时间
      */
-    private Date orderTime;
+    private LocalDate orderTime;
 
     /**
      * 验收时间
      */
-    private Date receptionTime;
+    private LocalDate receptionTime;
 
     /**
      * 物资执行状态(字典)
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/bo/BusMaterialbatchdemandplanBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/bo/BusMaterialbatchdemandplanBo.java
index f063da88..69b57b93 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/bo/BusMaterialbatchdemandplanBo.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/bo/BusMaterialbatchdemandplanBo.java
@@ -8,6 +8,8 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
+
+import java.time.LocalDate;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
@@ -86,7 +88,7 @@ public class BusMaterialbatchdemandplanBo extends BaseEntity {
     /**
      * 计划到场时间
      */
-    private Date arrivalTime;
+    private LocalDate arrivalTime;
 
     /**
      * 备注
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/bo/BusMaterialsorderBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/bo/BusMaterialsorderBo.java
index bbee1034..286bab29 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/bo/BusMaterialsorderBo.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/bo/BusMaterialsorderBo.java
@@ -8,6 +8,8 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
+
+import java.time.LocalDate;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
@@ -76,7 +78,7 @@ public class BusMaterialsorderBo extends BaseEntity {
     /**
      * 计划到场时间
      */
-    private Date arrivalTime;
+    private LocalDate arrivalTime;
 
     /**
      * 订货数量
@@ -86,12 +88,12 @@ public class BusMaterialsorderBo extends BaseEntity {
     /**
      * 预计到货时间
      */
-    private Date expectedArrival;
+    private LocalDate expectedArrival;
 
     /**
      * 预计生产完成时间
      */
-    private Date productionTime;
+    private LocalDate productionTime;
 
     /**
      * 备注
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/bo/MasterDataListReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/bo/MasterDataListReq.java
index b377aa3c..c0790705 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/bo/MasterDataListReq.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/bo/MasterDataListReq.java
@@ -21,7 +21,7 @@ public class MasterDataListReq implements Serializable {
     private Long projectId;
 
     /**
-     * 批次ID
+     * 批次号
      */
     private String batchNumber;
 
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/bo/MaterialsorderPcPlanEditReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/bo/MaterialsorderPcPlanEditReq.java
index e9d5ad34..86e48500 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/bo/MaterialsorderPcPlanEditReq.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/bo/MaterialsorderPcPlanEditReq.java
@@ -7,6 +7,7 @@ import org.dromara.cailiaoshebei.domain.BusMaterialsorder;
 import org.dromara.common.core.validate.EditGroup;
 
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.util.Date;
 import java.util.List;
 
@@ -31,7 +32,7 @@ public class MaterialsorderPcPlanEditReq implements Serializable {
     /**
      * 订货-采购时间
      */
-    private Date purchasingPeriod;
+    private LocalDate purchasingPeriod;
     /**
      * 订货-合同号
      */
@@ -47,4 +48,15 @@ public class MaterialsorderPcPlanEditReq implements Serializable {
     private List<BusMaterialsorder> list;
 
 
+    /**
+     * 不管
+     */
+    private Long cprojectId;
+
+    /**
+     * 不管
+     */
+    private String cbatchNumber;
+
+
 }
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/dto/BusCailiaoshebeiEditPlanDto.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/dto/BusCailiaoshebeiEditPlanDto.java
index 9eb3c867..412834ec 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/dto/BusCailiaoshebeiEditPlanDto.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/dto/BusCailiaoshebeiEditPlanDto.java
@@ -1,12 +1,17 @@
 package org.dromara.cailiaoshebei.domain.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * @Author 铁憨憨
  * @Date 2025/7/31 18:26
  * @Version 1.0
  */
+
+@Data
 public class BusCailiaoshebeiEditPlanDto implements Serializable {
     /**
      * 材料设备ID
@@ -16,7 +21,7 @@ public class BusCailiaoshebeiEditPlanDto implements Serializable {
     /**
      * 单价
      */
-    private Long unitPrice;
+    private BigDecimal unitPrice;
 
     /**
      * 合同号
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/vo/BusMaterialbatchdemandplanVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/vo/BusMaterialbatchdemandplanVo.java
index 631e5b1f..ed297c80 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/vo/BusMaterialbatchdemandplanVo.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/vo/BusMaterialbatchdemandplanVo.java
@@ -1,5 +1,6 @@
 package org.dromara.cailiaoshebei.domain.vo;
 
+import java.time.LocalDate;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.dromara.cailiaoshebei.domain.BusMaterialbatchdemandplan;
@@ -106,7 +107,7 @@ public class BusMaterialbatchdemandplanVo implements Serializable {
      * 计划到场时间
      */
     @ExcelProperty(value = "计划到场时间")
-    private Date arrivalTime;
+    private LocalDate arrivalTime;
 
     /**
      * 备注
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/vo/BusMaterialsorderVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/vo/BusMaterialsorderVo.java
index b25a6824..2e447630 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/vo/BusMaterialsorderVo.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/vo/BusMaterialsorderVo.java
@@ -1,5 +1,6 @@
 package org.dromara.cailiaoshebei.domain.vo;
 
+import java.time.LocalDate;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.dromara.cailiaoshebei.domain.BusMaterialsorder;
@@ -94,7 +95,7 @@ public class BusMaterialsorderVo implements Serializable {
      * 计划到场时间
      */
     @ExcelProperty(value = "计划到场时间")
-    private Date arrivalTime;
+    private LocalDate arrivalTime;
 
     /**
      * 订货数量
@@ -106,13 +107,13 @@ public class BusMaterialsorderVo implements Serializable {
      * 预计到货时间
      */
     @ExcelProperty(value = "预计到货时间")
-    private Date expectedArrival;
+    private LocalDate expectedArrival;
 
     /**
      * 预计生产完成时间
      */
     @ExcelProperty(value = "预计生产完成时间")
-    private Date productionTime;
+    private LocalDate productionTime;
 
     /**
      * 备注
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/vo/BusSuppliespriceAddPlanSonRes.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/vo/BusSuppliespriceAddPlanSonRes.java
index ffec865b..8752c8e8 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/vo/BusSuppliespriceAddPlanSonRes.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/vo/BusSuppliespriceAddPlanSonRes.java
@@ -116,5 +116,5 @@ public class BusSuppliespriceAddPlanSonRes implements Serializable {
     /**
      * 材料设备ID
      */
-    private List<BusSuppliesprice> addPlanSonList;
+    private List<BusSuppliesprice> listOfMaterialInventory;
 }
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/mapper/BusCailiaoshebeiMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/mapper/BusCailiaoshebeiMapper.java
index bb2edffb..be96930d 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/mapper/BusCailiaoshebeiMapper.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/mapper/BusCailiaoshebeiMapper.java
@@ -18,5 +18,5 @@ import java.util.List;
  * @date 2025-07-31
  */
 public interface BusCailiaoshebeiMapper extends BaseMapperPlus<BusCailiaoshebei, BusCailiaoshebeiVo> {
-    Page<MasterDataListRes> masterDataList(@Param("bo") MasterDataListReq bo,@Param("ew") PageQuery pageQuery);
+    Page<MasterDataListRes> masterDataList(@Param("bo") MasterDataListReq bo,@Param("page") Page<MasterDataListReq> page);
 }
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusCailiaoshebeiServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusCailiaoshebeiServiceImpl.java
index 0006a533..0a3bbde8 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusCailiaoshebeiServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusCailiaoshebeiServiceImpl.java
@@ -1,7 +1,10 @@
 package org.dromara.cailiaoshebei.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
 import org.dromara.cailiaoshebei.domain.BusSuppliesprice;
 import org.dromara.cailiaoshebei.domain.bo.*;
 import org.dromara.cailiaoshebei.domain.dto.BusCailiaoshebeiEditPlanDto;
@@ -10,6 +13,10 @@ import org.dromara.cailiaoshebei.domain.vo.BusSuppliespriceAddPlanSonRes;
 import org.dromara.cailiaoshebei.domain.vo.MasterDataListRes;
 import org.dromara.cailiaoshebei.service.IBusRepertoryService;
 import org.dromara.cailiaoshebei.service.IBusSuppliespriceService;
+import org.dromara.common.core.domain.event.ProcessDeleteEvent;
+import org.dromara.common.core.domain.event.ProcessEvent;
+import org.dromara.common.core.domain.event.ProcessTaskEvent;
+import org.dromara.common.core.enums.BusinessStatusEnum;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -18,7 +25,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
+import org.dromara.common.oss.core.OssClient;
+import org.dromara.common.oss.factory.OssFactory;
 import org.dromara.common.utils.BatchNumberGenerator;
+import org.dromara.design.domain.DesTechnicalStandard;
+import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
 import org.dromara.cailiaoshebei.domain.vo.BusCailiaoshebeiVo;
 import org.dromara.cailiaoshebei.domain.BusCailiaoshebei;
@@ -37,6 +48,7 @@ import java.util.concurrent.atomic.AtomicInteger;
  */
 @RequiredArgsConstructor
 @Service
+@Slf4j
 public class BusCailiaoshebeiServiceImpl extends ServiceImpl<BusCailiaoshebeiMapper, BusCailiaoshebei> implements IBusCailiaoshebeiService {
 
     private final BusCailiaoshebeiMapper baseMapper;
@@ -183,7 +195,7 @@ public class BusCailiaoshebeiServiceImpl extends ServiceImpl<BusCailiaoshebeiMap
             new LambdaQueryWrapper<BusSuppliesprice>()
                 .eq(BusSuppliesprice::getCailiaoshebeiId, id)
         );
-        res.setAddPlanSonList(list);
+        res.setListOfMaterialInventory(list);
         //3、获取到实际数量
         AtomicInteger num = new AtomicInteger();
         list.forEach(
@@ -197,7 +209,7 @@ public class BusCailiaoshebeiServiceImpl extends ServiceImpl<BusCailiaoshebeiMap
 
     @Override
     public TableDataInfo<MasterDataListRes> masterDataList(MasterDataListReq bo, PageQuery pageQuery) {
-        Page<MasterDataListRes> masterDataListResPage = baseMapper.masterDataList(bo, pageQuery);
+        Page<MasterDataListRes> masterDataListResPage = baseMapper.masterDataList(bo, pageQuery.build());
         return TableDataInfo.build(masterDataListResPage);
     }
 
@@ -245,9 +257,45 @@ public class BusCailiaoshebeiServiceImpl extends ServiceImpl<BusCailiaoshebeiMap
         return TableDataInfo.build(convertedPage);
     }
 
+    /**
+     * 总体流程监听(例如: 草稿，撤销，退回，作废，终止，已完成，单任务完成等)
+     * 正常使用只需#processEvent.flowCode=='leave1'
+     * 示例为了方便则使用startsWith匹配了全部示例key
+     *
+     * @param processEvent 参数
+     */
+    @org.springframework.context.event.EventListener(condition = "#processEvent.flowCode.endsWith('technical')")
+    public void processHandler(ProcessEvent processEvent) {
+        log.info("技术标准文件审核任务执行了{}", processEvent.toString());
+        //1、根据批次号改编审核状态
 
+    }
 
+    /**
+     * 执行任务创建监听
+     * 示例：也可通过  @EventListener(condition = "#processTaskEvent.flowCode=='leave1'")进行判断
+     * 在方法中判断流程节点key
+     * if ("xxx".equals(processTaskEvent.getNodeCode())) {
+     * //执行业务逻辑
+     * }
+     *
+     * @param processTaskEvent 参数
+     */
+    @org.springframework.context.event.EventListener(condition = "#processTaskEvent.flowCode.endsWith('technical')")
+    public void processTaskHandler(ProcessTaskEvent processTaskEvent) {
+        log.info("技术标准文件审核任务创建了{}", processTaskEvent.toString());
+    }
 
-
+    /**
+     * 监听删除流程事件
+     * 正常使用只需#processDeleteEvent.flowCode=='leave1'
+     * 示例为了方便则使用startsWith匹配了全部示例key
+     *
+     * @param processDeleteEvent 参数
+     */
+    @EventListener(condition = "#processDeleteEvent.flowCode.endsWith('technical')")
+    public void processDeleteHandler(ProcessDeleteEvent processDeleteEvent) {
+        log.info("监听删除流程事件，技术标准文件审核任务执行了{}", processDeleteEvent.toString());
+    }
 
 }
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusMaterialbatchdemandplanServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusMaterialbatchdemandplanServiceImpl.java
index 59186431..1c7bdcbb 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusMaterialbatchdemandplanServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusMaterialbatchdemandplanServiceImpl.java
@@ -149,10 +149,7 @@ public class BusMaterialbatchdemandplanServiceImpl extends ServiceImpl<BusMateri
         //1、删除数据
         LambdaQueryWrapper<BusMaterialbatchdemandplan> eq = new LambdaQueryWrapper<BusMaterialbatchdemandplan>()
             .eq(BusMaterialbatchdemandplan::getBatchNumber, bo.getBatchNumber());
-        int delete = baseMapper.delete(eq);
-        if (delete != 1) {
-            throw new RuntimeException("删除失败");
-        }
+        baseMapper.delete(eq);
         //2、新增数据
         List<BusMaterialbatchdemandplan> ts = BeanUtil.copyToList(bo.getAddDataList(), BusMaterialbatchdemandplan.class);
         boolean b = baseMapper.insertBatch(ts);
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/cailiaoshebei/BusCailiaoshebeiMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/cailiaoshebei/BusCailiaoshebeiMapper.xml
index f13c6262..5ba2a657 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/cailiaoshebei/BusCailiaoshebeiMapper.xml
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/cailiaoshebei/BusCailiaoshebeiMapper.xml
@@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="masterDataList" resultType="org.dromara.cailiaoshebei.domain.vo.MasterDataListRes">
         select
-            bc.batch_id as batchId,
+            bc.batch_number as batchNumber,
             bc.project_id as projectId,
             bc.supplier_id as supplierId,
             bc.supplier as supplier,
@@ -16,7 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             bc.material_code as materialCode,
             bsp.id as id,
             bsp.cailiaoshebei_id as cailiaoshebeiId,
-            bsp.unit_price as unit_price,
+            bsp.unit_price as unitPrice,
             bsp.num as num,
             bsp.contract_num as contractNum,
             bsp.estimated_cycle as estimatedCycle,
@@ -28,8 +28,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bo.projectId != null">
                 and bc.project_id = #{bo.projectId}
             </if>
-            <if test="bo.batchId != null">
-                and bc.batch_id = #{bo.batchId}
+            <if test="bo.batchNumber != null">
+                and bc.batch_number = #{bo.batchNumber}
             </if>
             <if test="bo.materialCode != null">
                 and bc.material_code like concat('%', #{bo.materialCode}, '%')
@@ -44,7 +44,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 </foreach>
             </if>
         </where>
-        ${ew.customSqlSegment}
     </select>