From c6abb3aa7bb910f80d08d8dae34c153a3eb8b43c Mon Sep 17 00:00:00 2001 From: zch Date: Tue, 14 Jan 2025 15:15:29 +0800 Subject: [PATCH] =?UTF-8?q?change(hwmom-mes):=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改 BaseMaterialInfoController 中的方法名 getBaseMaterialInfolist 为 getBaseMaterialInfoList - 更新 IProdBaseRouteService 中的方法名 selectMesBaseRouteByRouteId 为 selectProdBaseRouteByRouteId - 调整 ProdBaseRouteMapper 中的方法命名，将 mesBaseRoute 改为 prodBaseRoute - 更新 XML 映射文件中的表名引用，从 mes_base_process_info 改为 prod_base_process_info - 修正 ProdBaseRouteServiceImpl 中的变量命名，提高代码可读性 --- .../controller/BaseMaterialInfoController.java | 2 +- .../dromara/mes/mapper/ProdBaseRouteMapper.java | 16 ++++++++-------- .../mes/service/IProdBaseRouteService.java | 2 +- .../service/impl/ProdBaseRouteServiceImpl.java | 12 ++++++------ .../resources/mapper/mes/ProdBaseRouteMapper.xml | 4 ++-- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/BaseMaterialInfoController.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/BaseMaterialInfoController.java index e7388049..9c55bacb 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/BaseMaterialInfoController.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/BaseMaterialInfoController.java @@ -110,7 +110,7 @@ public class BaseMaterialInfoController extends BaseController { */ @GetMapping("getBaseMaterialInfoList") - public R> getBaseMaterialInfolist(BaseMaterialInfoBo bo) { + public R> getBaseMaterialInfoList(BaseMaterialInfoBo bo) { List list = baseMaterialInfoService.queryList(bo); return R.ok(list); } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdBaseRouteMapper.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdBaseRouteMapper.java index f1d55ab4..ba4a97a0 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdBaseRouteMapper.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdBaseRouteMapper.java @@ -30,26 +30,26 @@ public interface ProdBaseRouteMapper extends BaseMapperPlus selectProdBaseRouteList(ProdBaseRoute mesBaseRoute); + public List selectProdBaseRouteList(ProdBaseRoute prodBaseRoute); /** * 新增工艺路线 * - * @param mesBaseRoute 工艺路线 + * @param prodBaseRoute 工艺路线 * @return 结果 */ - public int insertProdBaseRoute(ProdBaseRoute mesBaseRoute); + public int insertProdBaseRoute(ProdBaseRoute prodBaseRoute); /** * 修改工艺路线 * - * @param mesBaseRoute 工艺路线 + * @param prodBaseRoute 工艺路线 * @return 结果 */ - public int updateProdBaseRoute(ProdBaseRoute mesBaseRoute); + public int updateProdBaseRoute(ProdBaseRoute prodBaseRoute); /** * 删除工艺路线 @@ -78,10 +78,10 @@ public interface ProdBaseRouteMapper extends BaseMapperPlus mesBaseRouteProcessList); + public int batchProdBaseRouteProcess(List prodBaseRouteProcessList); /** diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdBaseRouteService.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdBaseRouteService.java index b1cc0941..9818db01 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdBaseRouteService.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdBaseRouteService.java @@ -76,5 +76,5 @@ public interface IProdBaseRouteService { * @param routeId 工艺路线主键 * @return 工艺路线 */ - public ProdBaseRouteVo selectMesBaseRouteByRouteId(Long routeId); + public ProdBaseRouteVo selectProdBaseRouteByRouteId(Long routeId); } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdBaseRouteServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdBaseRouteServiceImpl.java index 359c4fa8..530dec03 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdBaseRouteServiceImpl.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdBaseRouteServiceImpl.java @@ -166,22 +166,22 @@ public class ProdBaseRouteServiceImpl implements IProdBaseRouteService { public void insertProdBaseRouteProcess(ProdBaseRouteBo bo) { // 获取工艺路线中的工艺步骤列表 - List mesBaseRouteProcessList = bo.getRouteProcessBoList(); + List prodBaseRouteProcessList = bo.getRouteProcessBoList(); // 获取工艺路线ID Long routeId = bo.getRouteId(); // 如果工艺步骤列表不为空 - if (ObjectUtil.isNotNull(mesBaseRouteProcessList)) + if (ObjectUtil.isNotNull(prodBaseRouteProcessList)) { // 创建一个新的工艺步骤列表 List list = new ArrayList(); // 遍历每一个工艺步骤 - for (ProdBaseRouteProcessBo mesBaseRouteProcess : mesBaseRouteProcessList) + for (ProdBaseRouteProcessBo prodBaseRouteProcess : prodBaseRouteProcessList) { // 设置工艺步骤的工艺路线ID - mesBaseRouteProcess.setRouteId(routeId); + prodBaseRouteProcess.setRouteId(routeId); // 将工艺步骤添加到新的列表中 - list.add(mesBaseRouteProcess); + list.add(prodBaseRouteProcess); } // 如果新的工艺步骤列表不为空 if (!list.isEmpty()) @@ -209,7 +209,7 @@ public class ProdBaseRouteServiceImpl implements IProdBaseRouteService { * @return 工艺路线 */ @Override - public ProdBaseRouteVo selectMesBaseRouteByRouteId(Long routeId) + public ProdBaseRouteVo selectProdBaseRouteByRouteId(Long routeId) { return routeMapper.selectProdBaseRouteByRouteId(routeId); } diff --git a/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdBaseRouteMapper.xml b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdBaseRouteMapper.xml index bbcd36e0..d4493af2 100644 --- a/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdBaseRouteMapper.xml +++ b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdBaseRouteMapper.xml @@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from prod_base_route a left join prod_base_route_process b on b.route_id = a.route_id - left join mes_base_process_info p on p.process_id = b.process_id + left join prod_base_process_info p on p.process_id = b.process_id