From 8fb8d37784ce6c466f7142275e1eace2cb012e44 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 15 五月 2025 15:40:53 +0800
Subject: [PATCH] art: 设备管理-设备处置 报废 基础代码修改

---
 /dev/null                                                                                          |   19 ---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentScrapMapper.java            |   17 +++
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentScrapMapper.xml         |    2 
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentScrapServiceImpl.java |   19 +++
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentScrapController.java    |  167 +++++++++++++++++++++++++++++++++
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentScrap.java                  |   22 ++-
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentScrapService.java         |   14 ++
 7 files changed, 231 insertions(+), 29 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentDisposeController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentDisposeController.java
deleted file mode 100644
index eb9c193..0000000
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentDisposeController.java
+++ /dev/null
@@ -1,167 +0,0 @@
-package org.jeecg.modules.eam.controller;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.eam.entity.EamEquipmentDispose;
-import org.jeecg.modules.eam.service.IEamEquipmentDisposeService;
-import java.util.Date;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
- /**
- * @Description: 璁惧澶勭疆(杞鎶ュ簾)
- * @Author: jeecg-boot
- * @Date:   2025-05-13
- * @Version: V1.0
- */
-@Slf4j
-@Api(tags="璁惧澶勭疆(杞鎶ュ簾)")
-@RestController
-@RequestMapping("/eam/eamEquipmentDispose")
-public class EamEquipmentDisposeController extends JeecgController<EamEquipmentDispose, IEamEquipmentDisposeService> {
-	@Autowired
-	private IEamEquipmentDisposeService eamEquipmentDisposeService;
-	
-	/**
-	 * 鍒嗛〉鍒楄〃鏌ヨ
-	 *
-	 * @param eamEquipmentDispose
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	@AutoLog(value = "璁惧澶勭疆(杞鎶ュ簾)-鍒嗛〉鍒楄〃鏌ヨ")
-	@ApiOperation(value="璁惧澶勭疆(杞鎶ュ簾)-鍒嗛〉鍒楄〃鏌ヨ", notes="璁惧澶勭疆(杞鎶ュ簾)-鍒嗛〉鍒楄〃鏌ヨ")
-	@GetMapping(value = "/list")
-	public Result<?> queryPageList(EamEquipmentDispose eamEquipmentDispose,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		QueryWrapper<EamEquipmentDispose> queryWrapper = QueryGenerator.initQueryWrapper(eamEquipmentDispose, req.getParameterMap());
-		Page<EamEquipmentDispose> page = new Page<EamEquipmentDispose>(pageNo, pageSize);
-		IPage<EamEquipmentDispose> pageList = eamEquipmentDisposeService.page(page, queryWrapper);
-		return Result.OK(pageList);
-	}
-	
-	/**
-	 * 娣诲姞
-	 *
-	 * @param eamEquipmentDispose
-	 * @return
-	 */
-	@AutoLog(value = "璁惧澶勭疆(杞鎶ュ簾)-娣诲姞")
-	@ApiOperation(value="璁惧澶勭疆(杞鎶ュ簾)-娣诲姞", notes="璁惧澶勭疆(杞鎶ュ簾)-娣诲姞")
-	@PostMapping(value = "/add")
-	public Result<?> add(@RequestBody EamEquipmentDispose eamEquipmentDispose) {
-		eamEquipmentDisposeService.save(eamEquipmentDispose);
-		return Result.OK("娣诲姞鎴愬姛锛�");
-	}
-	
-	/**
-	 * 缂栬緫
-	 *
-	 * @param eamEquipmentDispose
-	 * @return
-	 */
-	@AutoLog(value = "璁惧澶勭疆(杞鎶ュ簾)-缂栬緫")
-	@ApiOperation(value="璁惧澶勭疆(杞鎶ュ簾)-缂栬緫", notes="璁惧澶勭疆(杞鎶ュ簾)-缂栬緫")
-	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<?> edit(@RequestBody EamEquipmentDispose eamEquipmentDispose) {
-		eamEquipmentDisposeService.updateById(eamEquipmentDispose);
-		return Result.OK("缂栬緫鎴愬姛!");
-	}
-	
-	/**
-	 * 閫氳繃id鍒犻櫎
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "璁惧澶勭疆(杞鎶ュ簾)-閫氳繃id鍒犻櫎")
-	@ApiOperation(value="璁惧澶勭疆(杞鎶ュ簾)-閫氳繃id鍒犻櫎", notes="璁惧澶勭疆(杞鎶ュ簾)-閫氳繃id鍒犻櫎")
-	@DeleteMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-		eamEquipmentDisposeService.removeById(id);
-		return Result.OK("鍒犻櫎鎴愬姛!");
-	}
-	
-	/**
-	 * 鎵归噺鍒犻櫎
-	 *
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "璁惧澶勭疆(杞鎶ュ簾)-鎵归噺鍒犻櫎")
-	@ApiOperation(value="璁惧澶勭疆(杞鎶ュ簾)-鎵归噺鍒犻櫎", notes="璁惧澶勭疆(杞鎶ュ簾)-鎵归噺鍒犻櫎")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.eamEquipmentDisposeService.removeByIds(Arrays.asList(ids.split(",")));
-		return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�");
-	}
-	
-	/**
-	 * 閫氳繃id鏌ヨ
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "璁惧澶勭疆(杞鎶ュ簾)-閫氳繃id鏌ヨ")
-	@ApiOperation(value="璁惧澶勭疆(杞鎶ュ簾)-閫氳繃id鏌ヨ", notes="璁惧澶勭疆(杞鎶ュ簾)-閫氳繃id鏌ヨ")
-	@GetMapping(value = "/queryById")
-	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
-		EamEquipmentDispose eamEquipmentDispose = eamEquipmentDisposeService.getById(id);
-		return Result.OK(eamEquipmentDispose);
-	}
-
-  /**
-   * 瀵煎嚭excel
-   *
-   * @param request
-   * @param eamEquipmentDispose
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, EamEquipmentDispose eamEquipmentDispose) {
-      return super.exportXls(request, eamEquipmentDispose, EamEquipmentDispose.class, "璁惧澶勭疆(杞鎶ュ簾)");
-  }
-
-  /**
-   * 閫氳繃excel瀵煎叆鏁版嵁
-   *
-   * @param request
-   * @param response
-   * @return
-   */
-  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-      return super.importExcel(request, response, EamEquipmentDispose.class);
-  }
-
-}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentScrapController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentScrapController.java
new file mode 100644
index 0000000..dee0f33
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentScrapController.java
@@ -0,0 +1,167 @@
+package org.jeecg.modules.eam.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.eam.entity.EamEquipmentScrap;
+import org.jeecg.modules.eam.service.IEamEquipmentScrapService;
+import java.util.Date;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+ /**
+ * @Description: 璁惧鎶ュ簾(杞)
+ * @Author: jeecg-boot
+ * @Date:   2025-05-15
+ * @Version: V1.0
+ */
+@Slf4j
+@Api(tags="璁惧鎶ュ簾(杞)")
+@RestController
+@RequestMapping("/eam/eamEquipmentScrap")
+public class EamEquipmentScrapController extends JeecgController<EamEquipmentScrap, IEamEquipmentScrapService> {
+	@Autowired
+	private IEamEquipmentScrapService eamEquipmentScrapService;
+	
+	/**
+	 * 鍒嗛〉鍒楄〃鏌ヨ
+	 *
+	 * @param eamEquipmentScrap
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "璁惧鎶ュ簾(杞)-鍒嗛〉鍒楄〃鏌ヨ")
+	@ApiOperation(value="璁惧鎶ュ簾(杞)-鍒嗛〉鍒楄〃鏌ヨ", notes="璁惧鎶ュ簾(杞)-鍒嗛〉鍒楄〃鏌ヨ")
+	@GetMapping(value = "/list")
+	public Result<?> queryPageList(EamEquipmentScrap eamEquipmentScrap,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<EamEquipmentScrap> queryWrapper = QueryGenerator.initQueryWrapper(eamEquipmentScrap, req.getParameterMap());
+		Page<EamEquipmentScrap> page = new Page<EamEquipmentScrap>(pageNo, pageSize);
+		IPage<EamEquipmentScrap> pageList = eamEquipmentScrapService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 * 娣诲姞
+	 *
+	 * @param eamEquipmentScrap
+	 * @return
+	 */
+	@AutoLog(value = "璁惧鎶ュ簾(杞)-娣诲姞")
+	@ApiOperation(value="璁惧鎶ュ簾(杞)-娣诲姞", notes="璁惧鎶ュ簾(杞)-娣诲姞")
+	@PostMapping(value = "/add")
+	public Result<?> add(@RequestBody EamEquipmentScrap eamEquipmentScrap) {
+		eamEquipmentScrapService.save(eamEquipmentScrap);
+		return Result.OK("娣诲姞鎴愬姛锛�");
+	}
+	
+	/**
+	 * 缂栬緫
+	 *
+	 * @param eamEquipmentScrap
+	 * @return
+	 */
+	@AutoLog(value = "璁惧鎶ュ簾(杞)-缂栬緫")
+	@ApiOperation(value="璁惧鎶ュ簾(杞)-缂栬緫", notes="璁惧鎶ュ簾(杞)-缂栬緫")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<?> edit(@RequestBody EamEquipmentScrap eamEquipmentScrap) {
+		eamEquipmentScrapService.updateById(eamEquipmentScrap);
+		return Result.OK("缂栬緫鎴愬姛!");
+	}
+	
+	/**
+	 * 閫氳繃id鍒犻櫎
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "璁惧鎶ュ簾(杞)-閫氳繃id鍒犻櫎")
+	@ApiOperation(value="璁惧鎶ュ簾(杞)-閫氳繃id鍒犻櫎", notes="璁惧鎶ュ簾(杞)-閫氳繃id鍒犻櫎")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		eamEquipmentScrapService.removeById(id);
+		return Result.OK("鍒犻櫎鎴愬姛!");
+	}
+	
+	/**
+	 * 鎵归噺鍒犻櫎
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "璁惧鎶ュ簾(杞)-鎵归噺鍒犻櫎")
+	@ApiOperation(value="璁惧鎶ュ簾(杞)-鎵归噺鍒犻櫎", notes="璁惧鎶ュ簾(杞)-鎵归噺鍒犻櫎")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.eamEquipmentScrapService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�");
+	}
+	
+	/**
+	 * 閫氳繃id鏌ヨ
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "璁惧鎶ュ簾(杞)-閫氳繃id鏌ヨ")
+	@ApiOperation(value="璁惧鎶ュ簾(杞)-閫氳繃id鏌ヨ", notes="璁惧鎶ュ簾(杞)-閫氳繃id鏌ヨ")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		EamEquipmentScrap eamEquipmentScrap = eamEquipmentScrapService.getById(id);
+		return Result.OK(eamEquipmentScrap);
+	}
+
+  /**
+   * 瀵煎嚭excel
+   *
+   * @param request
+   * @param eamEquipmentScrap
+   */
+  @RequestMapping(value = "/exportXls")
+  public ModelAndView exportXls(HttpServletRequest request, EamEquipmentScrap eamEquipmentScrap) {
+      return super.exportXls(request, eamEquipmentScrap, EamEquipmentScrap.class, "璁惧鎶ュ簾(杞)");
+  }
+
+  /**
+   * 閫氳繃excel瀵煎叆鏁版嵁
+   *
+   * @param request
+   * @param response
+   * @return
+   */
+  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+      return super.importExcel(request, response, EamEquipmentScrap.class);
+  }
+
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentDispose.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentScrap.java
similarity index 82%
rename from lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentDispose.java
rename to lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentScrap.java
index becbcf8..1cf0b3c 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentDispose.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentScrap.java
@@ -13,17 +13,17 @@
 import java.io.Serializable;
 import java.util.Date;
 /**
- * @Description: 璁惧澶勭疆(杞鎶ュ簾)
+ * @Description: 璁惧鎶ュ簾(杞)
  * @Author: jeecg-boot
- * @Date:   2025-05-13
+ * @Date:   2025-05-15
  * @Version: V1.0
  */
 @Data
-@TableName("eam_equipment_dispose")
+@TableName("eam_equipment_scrap")
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@ApiModel(value="eam_equipment_dispose瀵硅薄", description="璁惧澶勭疆(杞鎶ュ簾)")
-public class EamEquipmentDispose implements Serializable {
+@ApiModel(value="eam_equipment_scrap瀵硅薄", description="璁惧鎶ュ簾(杞)")
+public class EamEquipmentScrap implements Serializable {
     
 	/**涓婚敭*/
 	@TableId(type = IdType.ASSIGN_ID)
@@ -58,26 +58,30 @@
 	/**杞/鎶ュ簾*/
 	@Excel(name = "杞/鎶ュ簾", width = 15)
     @ApiModelProperty(value = "杞/鎶ュ簾")
-	private String disposeType;
+	private String scrapType;
 	/**鐢宠浜�*/
 	@Excel(name = "鐢宠浜�", width = 15)
     @ApiModelProperty(value = "鐢宠浜�")
 	private String reportUser;
 	/**澶勭疆鏃堕棿*/
     @ApiModelProperty(value = "澶勭疆鏃堕棿")
-	private Date disposeTime;
+	private Date scrapTime;
 	/**澶勭疆鐞嗙敱*/
 	@Excel(name = "澶勭疆鐞嗙敱", width = 15)
     @ApiModelProperty(value = "澶勭疆鐞嗙敱")
-	private String disposeReason;
+	private String scrapReason;
 	/**澶勭疆閲戦*/
 	@Excel(name = "澶勭疆閲戦", width = 15)
     @ApiModelProperty(value = "澶勭疆閲戦")
-	private java.math.BigDecimal disposeAmount;
+	private java.math.BigDecimal scrapAmount;
 	/**瀹℃牳浜�*/
 	@Excel(name = "瀹℃牳浜�", width = 15)
     @ApiModelProperty(value = "瀹℃牳浜�")
 	private String approvalUser;
+	/**瀹℃牳鎰忚*/
+	@Excel(name = "瀹℃牳鎰忚", width = 15)
+    @ApiModelProperty(value = "瀹℃牳鎰忚")
+	private String approvalComment;
 	/**瀹℃牳鏃堕棿*/
     @ApiModelProperty(value = "瀹℃牳鏃堕棿")
 	private Date approvalTime;
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentDisposeMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentDisposeMapper.java
deleted file mode 100644
index 23476a1..0000000
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentDisposeMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.jeecg.modules.eam.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.eam.entity.EamEquipmentDispose;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 璁惧澶勭疆(杞鎶ュ簾)
- * @Author: jeecg-boot
- * @Date:   2025-05-13
- * @Version: V1.0
- */
-public interface EamEquipmentDisposeMapper extends BaseMapper<EamEquipmentDispose> {
-
-}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentScrapMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentScrapMapper.java
new file mode 100644
index 0000000..949732a
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentScrapMapper.java
@@ -0,0 +1,17 @@
+package org.jeecg.modules.eam.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.eam.entity.EamEquipmentScrap;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 璁惧鎶ュ簾(杞)
+ * @Author: jeecg-boot
+ * @Date:   2025-05-15
+ * @Version: V1.0
+ */
+public interface EamEquipmentScrapMapper extends BaseMapper<EamEquipmentScrap> {
+
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentDisposeMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentScrapMapper.xml
similarity index 67%
rename from lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentDisposeMapper.xml
rename to lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentScrapMapper.xml
index 51d9e53..a0f001e 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentDisposeMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentScrapMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.eam.mapper.EamEquipmentDisposeMapper">
+<mapper namespace="org.jeecg.modules.eam.mapper.EamEquipmentScrapMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentDisposeService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentDisposeService.java
deleted file mode 100644
index 40da26f..0000000
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentDisposeService.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.jeecg.modules.eam.service;
-
-import org.jeecg.modules.eam.entity.EamEquipmentDispose;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 璁惧澶勭疆(杞鎶ュ簾)
- * @Author: jeecg-boot
- * @Date:   2025-05-13
- * @Version: V1.0
- */
-public interface IEamEquipmentDisposeService extends IService<EamEquipmentDispose> {
-
-}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentScrapService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentScrapService.java
new file mode 100644
index 0000000..a477fdf
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentScrapService.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.eam.service;
+
+import org.jeecg.modules.eam.entity.EamEquipmentScrap;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 璁惧鎶ュ簾(杞)
+ * @Author: jeecg-boot
+ * @Date:   2025-05-15
+ * @Version: V1.0
+ */
+public interface IEamEquipmentScrapService extends IService<EamEquipmentScrap> {
+
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentDisposeServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentDisposeServiceImpl.java
deleted file mode 100644
index a1f4389..0000000
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentDisposeServiceImpl.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.jeecg.modules.eam.service.impl;
-
-import org.jeecg.modules.eam.entity.EamEquipmentDispose;
-import org.jeecg.modules.eam.mapper.EamEquipmentDisposeMapper;
-import org.jeecg.modules.eam.service.IEamEquipmentDisposeService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 璁惧澶勭疆(杞鎶ュ簾)
- * @Author: jeecg-boot
- * @Date:   2025-05-13
- * @Version: V1.0
- */
-@Service
-public class EamEquipmentDisposeServiceImpl extends ServiceImpl<EamEquipmentDisposeMapper, EamEquipmentDispose> implements IEamEquipmentDisposeService {
-
-}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentScrapServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentScrapServiceImpl.java
new file mode 100644
index 0000000..21b9f00
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentScrapServiceImpl.java
@@ -0,0 +1,19 @@
+package org.jeecg.modules.eam.service.impl;
+
+import org.jeecg.modules.eam.entity.EamEquipmentScrap;
+import org.jeecg.modules.eam.mapper.EamEquipmentScrapMapper;
+import org.jeecg.modules.eam.service.IEamEquipmentScrapService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 璁惧鎶ュ簾(杞)
+ * @Author: jeecg-boot
+ * @Date:   2025-05-15
+ * @Version: V1.0
+ */
+@Service
+public class EamEquipmentScrapServiceImpl extends ServiceImpl<EamEquipmentScrapMapper, EamEquipmentScrap> implements IEamEquipmentScrapService {
+
+}

--
Gitblit v1.9.3