From a9c869b1e831ec2fd2bee8eb3fbaa16ad0fcb511 Mon Sep 17 00:00:00 2001 From: zch Date: Mon, 13 Apr 2026 08:46:53 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0Mapper=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E6=B3=A8=E8=A7=A3=E4=BB=A5=E6=94=AF=E6=8C=81=E5=A4=9A?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/mapper/BaseDeviceLedgerMapper.java | 7 ++++--- .../aucma/base/mapper/BaseDeviceParamMapper.java | 12 ++++++------ .../base/mapper/BaseDeviceParamValMapper.java | 8 ++++---- .../base/mapper/BaseMaterialinfoMapper.java | 8 ++++---- .../aucma/base/mapper/ProcessAlertMapper.java | 11 ++++++----- .../aucma/base/mapper/ProcessDocumentMapper.java | 7 ++++--- .../service/impl/ProcessAlertServiceImpl.java | 2 ++ .../dms/mapper/DmsBaseDeviceLedgerMapper.java | 8 ++++---- .../mapper/DmsBillsInspectInstanceMapper.java | 6 +++--- .../dms/mapper/DmsBillsMaintInstanceMapper.java | 13 ++++++------- .../dms/mapper/DmsInspectRouteDetailMapper.java | 8 ++++---- .../aucma/dms/mapper/DmsPlanInspectMapper.java | 10 +++++----- .../dms/mapper/DmsPlanMaintDetailMapper.java | 10 +++++----- .../com/aucma/dms/mapper/DmsPlanMaintMapper.java | 16 ++++++++-------- .../dms/mapper/DmsRecordShutDownMapper.java | 6 +++--- .../mapper/AndonBoardConfigMapper.java | 7 ++++--- .../mapper/AndonEventAssignmentMapper.java | 7 ++++--- .../production/mapper/AndonEventLogMapper.java | 7 ++++--- .../production/mapper/AndonEventMapper.java | 7 ++++--- .../aucma/production/mapper/AndonRuleMapper.java | 7 ++++--- .../production/mapper/BaseBomInfoMapper.java | 8 ++++---- .../production/mapper/CalendarInfoMapper.java | 7 ++++--- .../mapper/MrpComponentWeeklyReqMapper.java | 9 +++++---- .../mapper/MrpProdWeeklyPlanMapper.java | 9 +++++---- .../production/mapper/ProdOrderNoteMapper.java | 7 ++++--- .../aucma/production/mapper/ProdRouteMapper.java | 13 +++++++------ .../mapper/ProdStationCapabilityMapper.java | 7 ++++--- .../production/mapper/ProdTaskPoolMapper.java | 5 +++-- .../production/mapper/ProdTeamShiftMapper.java | 7 ++++--- .../production/mapper/ProductPlanInfoMapper.java | 7 ++++--- .../ProductionReportQualityInspectionMapper.java | 3 ++- 31 files changed, 134 insertions(+), 115 deletions(-) diff --git a/aucma-base/src/main/java/com/aucma/base/mapper/BaseDeviceLedgerMapper.java b/aucma-base/src/main/java/com/aucma/base/mapper/BaseDeviceLedgerMapper.java index 295bd60..ca20aeb 100644 --- a/aucma-base/src/main/java/com/aucma/base/mapper/BaseDeviceLedgerMapper.java +++ b/aucma-base/src/main/java/com/aucma/base/mapper/BaseDeviceLedgerMapper.java @@ -2,6 +2,7 @@ package com.aucma.base.mapper; import java.util.List; import com.aucma.base.domain.BaseDeviceLedger; +import org.apache.ibatis.annotations.Param; /** * 设备台账Mapper接口 @@ -17,7 +18,7 @@ public interface BaseDeviceLedgerMapper * @param objId 设备台账主键 * @return 设备台账 */ - public BaseDeviceLedger selectBaseDeviceLedgerByObjId(Long objId); + public BaseDeviceLedger selectBaseDeviceLedgerByObjId(@Param("objId") Long objId); /** * 查询设备台账列表 @@ -49,7 +50,7 @@ public interface BaseDeviceLedgerMapper * @param objId 设备台账主键 * @return 结果 */ - public int deleteBaseDeviceLedgerByObjId(Long objId); + public int deleteBaseDeviceLedgerByObjId(@Param("objId") Long objId); /** * 批量删除设备台账 @@ -57,7 +58,7 @@ public interface BaseDeviceLedgerMapper * @param objIds 需要删除的数据主键集合 * @return 结果 */ - public int deleteBaseDeviceLedgerByObjIds(Long[] objIds); + public int deleteBaseDeviceLedgerByObjIds(@Param("objIds") Long[] objIds); /** * 获取设备编号 diff --git a/aucma-base/src/main/java/com/aucma/base/mapper/BaseDeviceParamMapper.java b/aucma-base/src/main/java/com/aucma/base/mapper/BaseDeviceParamMapper.java index f448cc5..38c205f 100644 --- a/aucma-base/src/main/java/com/aucma/base/mapper/BaseDeviceParamMapper.java +++ b/aucma-base/src/main/java/com/aucma/base/mapper/BaseDeviceParamMapper.java @@ -18,7 +18,7 @@ public interface BaseDeviceParamMapper * @param objId 设备参数主键 * @return 设备参数 */ - public BaseDeviceParam selectBaseDeviceParamByObjId(Long objId); + public BaseDeviceParam selectBaseDeviceParamByObjId(@Param("objId") Long objId); /** * 查询设备参数列表 @@ -50,7 +50,7 @@ public interface BaseDeviceParamMapper * @param objId 设备参数主键 * @return 结果 */ - public int deleteBaseDeviceParamByObjId(Long objId); + public int deleteBaseDeviceParamByObjId(@Param("objId") Long objId); /** * 批量删除设备参数 @@ -58,7 +58,7 @@ public interface BaseDeviceParamMapper * @param objIds 需要删除的数据主键集合 * @return 结果 */ - public int deleteBaseDeviceParamByObjIds(Long[] objIds); + public int deleteBaseDeviceParamByObjIds(@Param("objIds") Long[] objIds); /** * 根据参数编号列表查询已存在的参数 @@ -66,7 +66,7 @@ public interface BaseDeviceParamMapper * @param paramCodes 参数编号列表 * @return 设备参数集合 */ - public List selectByParamCodes(List paramCodes); + public List selectByParamCodes(@Param("paramCodes") List paramCodes); /** * 校验参数编号唯一性 @@ -83,7 +83,7 @@ public interface BaseDeviceParamMapper * @param list 设备参数列表 * @return 结果 */ - public int batchInsertDeviceParam(List list); + public int batchInsertDeviceParam(@Param("list") List list); /** * 批量更新设备参数 @@ -91,5 +91,5 @@ public interface BaseDeviceParamMapper * @param list 设备参数列表 * @return 结果 */ - public int batchUpdateDeviceParam(List list); + public int batchUpdateDeviceParam(@Param("list") List list); } diff --git a/aucma-base/src/main/java/com/aucma/base/mapper/BaseDeviceParamValMapper.java b/aucma-base/src/main/java/com/aucma/base/mapper/BaseDeviceParamValMapper.java index 72092b0..c7a48b8 100644 --- a/aucma-base/src/main/java/com/aucma/base/mapper/BaseDeviceParamValMapper.java +++ b/aucma-base/src/main/java/com/aucma/base/mapper/BaseDeviceParamValMapper.java @@ -20,7 +20,7 @@ public interface BaseDeviceParamValMapper * @param recordId 设备工艺参数当前值主键 * @return 设备工艺参数当前值 */ - public BaseDeviceParamVal selectBaseDeviceParamValByRecordId(String recordId); + public BaseDeviceParamVal selectBaseDeviceParamValByRecordId(@Param("recordId") String recordId); /** * 查询设备工艺参数当前值列表 @@ -70,7 +70,7 @@ public interface BaseDeviceParamValMapper * @param recordId 设备工艺参数当前值主键 * @return 结果 */ - public int deleteBaseDeviceParamValByRecordId(String recordId); + public int deleteBaseDeviceParamValByRecordId(@Param("recordId") String recordId); /** * 批量删除设备工艺参数当前值 @@ -78,7 +78,7 @@ public interface BaseDeviceParamValMapper * @param recordIds 需要删除的数据主键集合 * @return 结果 */ - public int deleteBaseDeviceParamValByRecordIds(String[] recordIds); + public int deleteBaseDeviceParamValByRecordIds(@Param("recordIds") String[] recordIds); /** * 查询设备状态统计（基于三色灯参数） @@ -131,5 +131,5 @@ public interface BaseDeviceParamValMapper * @param paramCode 参数编号 * @return 参数名称 */ - public String selectParamNameByCode(String paramCode); + public String selectParamNameByCode(@Param("paramCode") String paramCode); } diff --git a/aucma-base/src/main/java/com/aucma/base/mapper/BaseMaterialinfoMapper.java b/aucma-base/src/main/java/com/aucma/base/mapper/BaseMaterialinfoMapper.java index 9f05418..e124dfa 100644 --- a/aucma-base/src/main/java/com/aucma/base/mapper/BaseMaterialinfoMapper.java +++ b/aucma-base/src/main/java/com/aucma/base/mapper/BaseMaterialinfoMapper.java @@ -18,7 +18,7 @@ public interface BaseMaterialinfoMapper * @param objId 物料信息主键 * @return 物料信息 */ - public BaseMaterialInfo selectBaseMaterialInfoByObjId(Long objId); + public BaseMaterialInfo selectBaseMaterialInfoByObjId(@Param("objId") Long objId); /** * 查询物料信息列表 @@ -34,7 +34,7 @@ public interface BaseMaterialinfoMapper * @param keyword 物料关键字 * @return 物料集合 */ - public List selectPdaMaterialListByKeyword(String keyword); + public List selectPdaMaterialListByKeyword(@Param("keyword") String keyword); /** * 按物料编码集合查询物料 @@ -66,7 +66,7 @@ public interface BaseMaterialinfoMapper * @param objId 物料信息主键 * @return 结果 */ - public int deleteBaseMaterialInfoByObjId(Long objId); + public int deleteBaseMaterialInfoByObjId(@Param("objId") Long objId); /** * 批量删除物料信息 @@ -74,5 +74,5 @@ public interface BaseMaterialinfoMapper * @param objIds 需要删除的数据主键集合 * @return 结果 */ - public int deleteBaseMaterialInfoByObjIds(Long[] objIds); + public int deleteBaseMaterialInfoByObjIds(@Param("objIds") Long[] objIds); } diff --git a/aucma-base/src/main/java/com/aucma/base/mapper/ProcessAlertMapper.java b/aucma-base/src/main/java/com/aucma/base/mapper/ProcessAlertMapper.java index b5cc59d..54f9db4 100644 --- a/aucma-base/src/main/java/com/aucma/base/mapper/ProcessAlertMapper.java +++ b/aucma-base/src/main/java/com/aucma/base/mapper/ProcessAlertMapper.java @@ -1,6 +1,7 @@ package com.aucma.base.mapper; import com.aucma.base.domain.ProcessAlert; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -17,7 +18,7 @@ public interface ProcessAlertMapper { * @param alertId 工艺预警主键 * @return 工艺预警 */ - public ProcessAlert selectProcessAlertByAlertId(Long alertId); + public ProcessAlert selectProcessAlertByAlertId(@Param("alertId") Long alertId); /** * 查询工艺预警列表 @@ -49,7 +50,7 @@ public interface ProcessAlertMapper { * @param alertId 工艺预警主键 * @return 结果 */ - public int deleteProcessAlertByAlertId(Long alertId); + public int deleteProcessAlertByAlertId(@Param("alertId") Long alertId); /** * 批量删除工艺预警 @@ -57,7 +58,7 @@ public interface ProcessAlertMapper { * @param alertIds 需要删除的数据主键集合 * @return 结果 */ - public int deleteProcessAlertByAlertIds(Long[] alertIds); + public int deleteProcessAlertByAlertIds(@Param("alertIds") Long[] alertIds); /** * 查询指定设备和参数的未处理预警 @@ -66,7 +67,7 @@ public interface ProcessAlertMapper { * @param paramCode 参数编码 * @return 工艺预警 */ - public ProcessAlert selectUnhandledAlert(String deviceCode, String paramCode); + public ProcessAlert selectUnhandledAlert(@Param("deviceCode") String deviceCode, @Param("paramCode") String paramCode); /** * 查询指定设备和参数的最新预警（包含已处理） @@ -75,5 +76,5 @@ public interface ProcessAlertMapper { * @param paramCode 参数编码 * @return 工艺预警 */ - public ProcessAlert selectLatestAlert(String deviceCode, String paramCode); + public ProcessAlert selectLatestAlert(@Param("deviceCode") String deviceCode, @Param("paramCode") String paramCode); } diff --git a/aucma-base/src/main/java/com/aucma/base/mapper/ProcessDocumentMapper.java b/aucma-base/src/main/java/com/aucma/base/mapper/ProcessDocumentMapper.java index ef17afc..4d757e7 100644 --- a/aucma-base/src/main/java/com/aucma/base/mapper/ProcessDocumentMapper.java +++ b/aucma-base/src/main/java/com/aucma/base/mapper/ProcessDocumentMapper.java @@ -1,6 +1,7 @@ package com.aucma.base.mapper; import com.aucma.base.domain.ProcessDocument; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -17,7 +18,7 @@ public interface ProcessDocumentMapper { * @param docId 工艺文档主键 * @return 工艺文档 */ - public ProcessDocument selectProcessDocumentByDocId(Long docId); + public ProcessDocument selectProcessDocumentByDocId(@Param("docId") Long docId); /** * 查询工艺文档列表 @@ -49,7 +50,7 @@ public interface ProcessDocumentMapper { * @param docId 工艺文档主键 * @return 结果 */ - public int deleteProcessDocumentByDocId(Long docId); + public int deleteProcessDocumentByDocId(@Param("docId") Long docId); /** * 批量删除工艺文档 @@ -57,5 +58,5 @@ public interface ProcessDocumentMapper { * @param docIds 需要删除的数据主键集合 * @return 结果 */ - public int deleteProcessDocumentByDocIds(Long[] docIds); + public int deleteProcessDocumentByDocIds(@Param("docIds") Long[] docIds); } diff --git a/aucma-base/src/main/java/com/aucma/base/service/impl/ProcessAlertServiceImpl.java b/aucma-base/src/main/java/com/aucma/base/service/impl/ProcessAlertServiceImpl.java index d5de749..4a829a7 100644 --- a/aucma-base/src/main/java/com/aucma/base/service/impl/ProcessAlertServiceImpl.java +++ b/aucma-base/src/main/java/com/aucma/base/service/impl/ProcessAlertServiceImpl.java @@ -12,6 +12,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.text.SimpleDateFormat; import java.util.Date; @@ -181,6 +182,7 @@ public class ProcessAlertServiceImpl implements IProcessAlertService { } @Override + @Transactional public int batchMarkAsProcessed(Long[] alertIds, String handleUser) { if (alertIds == null || alertIds.length == 0) { return 0; diff --git a/aucma-dms/src/main/java/com/aucma/dms/mapper/DmsBaseDeviceLedgerMapper.java b/aucma-dms/src/main/java/com/aucma/dms/mapper/DmsBaseDeviceLedgerMapper.java index d07e21e..1ef100e 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/mapper/DmsBaseDeviceLedgerMapper.java +++ b/aucma-dms/src/main/java/com/aucma/dms/mapper/DmsBaseDeviceLedgerMapper.java @@ -21,7 +21,7 @@ public interface DmsBaseDeviceLedgerMapper * @param deviceId 设备台账信息主键 * @return 设备台账信息 */ - public DmsBaseDeviceLedger selectDmsBaseDeviceLedgerByDeviceId(Long deviceId); + public DmsBaseDeviceLedger selectDmsBaseDeviceLedgerByDeviceId(@Param("deviceId") Long deviceId); /** * 查询设备台账信息列表 @@ -53,7 +53,7 @@ public interface DmsBaseDeviceLedgerMapper * @param deviceId 设备台账信息主键 * @return 结果 */ - public int deleteDmsBaseDeviceLedgerByDeviceId(Long deviceId); + public int deleteDmsBaseDeviceLedgerByDeviceId(@Param("deviceId") Long deviceId); /** * 批量删除设备台账信息 @@ -61,7 +61,7 @@ public interface DmsBaseDeviceLedgerMapper * @param deviceIds 需要删除的数据主键集合 * @return 结果 */ - public int deleteDmsBaseDeviceLedgerByDeviceIds(Long[] deviceIds); + public int deleteDmsBaseDeviceLedgerByDeviceIds(@Param("deviceIds") Long[] deviceIds); @@ -71,7 +71,7 @@ public interface DmsBaseDeviceLedgerMapper * @param deviceCode 设备CODE * @return 设备台账信息 */ - public DmsBaseDeviceLedger selectDmsBaseDeviceLedgerByDeviceCode(String deviceCode); + public DmsBaseDeviceLedger selectDmsBaseDeviceLedgerByDeviceCode(@Param("deviceCode") String deviceCode); List likeDeviceName(@Param("deviceName") String deviceName); diff --git a/aucma-dms/src/main/java/com/aucma/dms/mapper/DmsBillsInspectInstanceMapper.java b/aucma-dms/src/main/java/com/aucma/dms/mapper/DmsBillsInspectInstanceMapper.java index cb3d1d0..f3341b9 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/mapper/DmsBillsInspectInstanceMapper.java +++ b/aucma-dms/src/main/java/com/aucma/dms/mapper/DmsBillsInspectInstanceMapper.java @@ -21,7 +21,7 @@ public interface DmsBillsInspectInstanceMapper * @param inspectInstanceId 巡检工单主键 * @return 巡检工单 */ - public DmsBillsInspectInstance selectDmsBillsInspectInstanceByInspectInstanceId(Long inspectInstanceId); + public DmsBillsInspectInstance selectDmsBillsInspectInstanceByInspectInstanceId(@Param("inspectInstanceId") Long inspectInstanceId); public List selectPoint(); public List selectInspection(); /** @@ -54,7 +54,7 @@ public interface DmsBillsInspectInstanceMapper * @param inspectInstanceId 巡检工单主键 * @return 结果 */ - public int deleteDmsBillsInspectInstanceByInspectInstanceId(Long inspectInstanceId); + public int deleteDmsBillsInspectInstanceByInspectInstanceId(@Param("inspectInstanceId") Long inspectInstanceId); /** * 批量删除巡检工单 @@ -62,7 +62,7 @@ public interface DmsBillsInspectInstanceMapper * @param inspectInstanceIds 需要删除的数据主键集合 * @return 结果 */ - public int deleteDmsBillsInspectInstanceByInspectInstanceIds(Long[] inspectInstanceIds); + public int deleteDmsBillsInspectInstanceByInspectInstanceIds(@Param("inspectInstanceIds") Long[] inspectInstanceIds); int insertDmsBillsInspectInstancePDA(DmsBillsInspectInstance dmsBillsInspectInstance); diff --git a/aucma-dms/src/main/java/com/aucma/dms/mapper/DmsBillsMaintInstanceMapper.java b/aucma-dms/src/main/java/com/aucma/dms/mapper/DmsBillsMaintInstanceMapper.java index 9275774..d72671f 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/mapper/DmsBillsMaintInstanceMapper.java +++ b/aucma-dms/src/main/java/com/aucma/dms/mapper/DmsBillsMaintInstanceMapper.java @@ -22,7 +22,7 @@ public interface DmsBillsMaintInstanceMapper { * @param maintInstanceId 保养工单主键 * @return 保养工单 */ - public DmsBillsMaintInstance selectDmsBillsMaintInstanceByMaintInstanceId(Long maintInstanceId); + public DmsBillsMaintInstance selectDmsBillsMaintInstanceByMaintInstanceId(@Param("maintInstanceId") Long maintInstanceId); /** * 查询保养工单列表 @@ -54,7 +54,7 @@ public interface DmsBillsMaintInstanceMapper { * @param maintInstanceId 保养工单主键 * @return 结果 */ - public int deleteDmsBillsMaintInstanceByMaintInstanceId(Long maintInstanceId); + public int deleteDmsBillsMaintInstanceByMaintInstanceId(@Param("maintInstanceId") Long maintInstanceId); /** * 批量删除保养工单 @@ -62,7 +62,7 @@ public interface DmsBillsMaintInstanceMapper { * @param maintInstanceIds 需要删除的数据主键集合 * @return 结果 */ - public int deleteDmsBillsMaintInstanceByMaintInstanceIds(Long[] maintInstanceIds); + public int deleteDmsBillsMaintInstanceByMaintInstanceIds(@Param("maintInstanceIds") Long[] maintInstanceIds); @@ -73,7 +73,7 @@ public interface DmsBillsMaintInstanceMapper { * @param dmsBillsMaintDetailList 保养工单明细列表 * @return 结果 */ - public int batchDmsBillsMaintDetail(List dmsBillsMaintDetailList); + public int batchDmsBillsMaintDetail(@Param("dmsBillsMaintDetailList") List dmsBillsMaintDetailList); /** * 新增保养工单明细（单条） @@ -91,9 +91,9 @@ public interface DmsBillsMaintInstanceMapper { */ public DmsBillsMaintInstance selectNewestDmsBillsMaintInstance(DmsBillsMaintInstance dmsBillsMaintInstance); - int batchDmsProject(List list); + int batchDmsProject(@Param("list") List list); - List selectDmsMaintInfo(Long maintInstanceId); + List selectDmsMaintInfo(@Param("maintInstanceId") Long maintInstanceId); /** * 检查指定计划今天是否已生成工单 @@ -108,4 +108,3 @@ public interface DmsBillsMaintInstanceMapper { */ Date selectDbNow(); } - diff --git a/aucma-dms/src/main/java/com/aucma/dms/mapper/DmsInspectRouteDetailMapper.java b/aucma-dms/src/main/java/com/aucma/dms/mapper/DmsInspectRouteDetailMapper.java index ec355bb..0848632 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/mapper/DmsInspectRouteDetailMapper.java +++ b/aucma-dms/src/main/java/com/aucma/dms/mapper/DmsInspectRouteDetailMapper.java @@ -19,7 +19,7 @@ public interface DmsInspectRouteDetailMapper * @param routeDetailId 巡检线路明细主键 * @return 巡检线路明细 */ - public DmsInspectRouteDetail selectDmsInspectRouteDetailByRouteDetailId(Long routeDetailId); + public DmsInspectRouteDetail selectDmsInspectRouteDetailByRouteDetailId(@Param("routeDetailId") Long routeDetailId); /** * 查询巡检线路明细列表 @@ -51,7 +51,7 @@ public interface DmsInspectRouteDetailMapper * @param routeDetailId 巡检线路明细主键 * @return 结果 */ - public int deleteDmsInspectRouteDetailByRouteDetailId(Long routeDetailId); + public int deleteDmsInspectRouteDetailByRouteDetailId(@Param("routeDetailId") Long routeDetailId); /** * 批量删除巡检线路明细 @@ -59,9 +59,9 @@ public interface DmsInspectRouteDetailMapper * @param routeDetailIds 需要删除的数据主键集合 * @return 结果 */ - public int deleteDmsInspectRouteDetailByRouteDetailIds(Long[] routeDetailIds); + public int deleteDmsInspectRouteDetailByRouteDetailIds(@Param("routeDetailIds") Long[] routeDetailIds); - List selectInspectRouteListByInspectRouteId(Long inspectRouteId); + List selectInspectRouteListByInspectRouteId(@Param("inspectRouteId") Long inspectRouteId); /** * 查询巡检路线下的所有设备ID列表 diff --git a/aucma-dms/src/main/java/com/aucma/dms/mapper/DmsPlanInspectMapper.java b/aucma-dms/src/main/java/com/aucma/dms/mapper/DmsPlanInspectMapper.java index 3eb09ff..a49ece7 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/mapper/DmsPlanInspectMapper.java +++ b/aucma-dms/src/main/java/com/aucma/dms/mapper/DmsPlanInspectMapper.java @@ -20,7 +20,7 @@ public interface DmsPlanInspectMapper * @param planInspectId 巡检计划信息主键 * @return 巡检计划信息 */ - public DmsPlanInspect selectDmsPlanInspectByPlanInspectId(Long planInspectId); + public DmsPlanInspect selectDmsPlanInspectByPlanInspectId(@Param("planInspectId") Long planInspectId); /** * 查询巡检计划信息列表 @@ -52,7 +52,7 @@ public interface DmsPlanInspectMapper * @param planInspectId 巡检计划信息主键 * @return 结果 */ - public int deleteDmsPlanInspectByPlanInspectId(Long planInspectId); + public int deleteDmsPlanInspectByPlanInspectId(@Param("planInspectId") Long planInspectId); /** * 批量删除巡检计划信息 @@ -60,10 +60,10 @@ public interface DmsPlanInspectMapper * @param planInspectIds 需要删除的数据主键集合 * @return 结果 */ - public int deleteDmsPlanInspectByPlanInspectIds(Long[] planInspectIds); + public int deleteDmsPlanInspectByPlanInspectIds(@Param("planInspectIds") Long[] planInspectIds); - DmsPlanInspect selectPlanInspectJoinJobByInspectId(Long planInspectId); - DmsPlanInspect selectPlanInspectJoinJobByInspectId1(String planInspectId); + DmsPlanInspect selectPlanInspectJoinJobByInspectId(@Param("planInspectId") Long planInspectId); + DmsPlanInspect selectPlanInspectJoinJobByInspectId1(@Param("planInspectId") String planInspectId); /** * 查询待执行的巡检计划列表 diff --git a/aucma-dms/src/main/java/com/aucma/dms/mapper/DmsPlanMaintDetailMapper.java b/aucma-dms/src/main/java/com/aucma/dms/mapper/DmsPlanMaintDetailMapper.java index e9029f0..e9c5fb1 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/mapper/DmsPlanMaintDetailMapper.java +++ b/aucma-dms/src/main/java/com/aucma/dms/mapper/DmsPlanMaintDetailMapper.java @@ -19,9 +19,9 @@ public interface DmsPlanMaintDetailMapper * @param planMaintDetailId 保养计划明细主键 * @return 保养计划明细 */ - public DmsPlanMaintDetail selectDmsPlanMaintDetailByPlanMaintDetailId(Long planMaintDetailId); + public DmsPlanMaintDetail selectDmsPlanMaintDetailByPlanMaintDetailId(@Param("planMaintDetailId") Long planMaintDetailId); - public Long selectStationIdByCode(String maintStationCode); + public Long selectStationIdByCode(@Param("maintStationCode") String maintStationCode); /** * 查询保养计划明细列表 @@ -53,7 +53,7 @@ public interface DmsPlanMaintDetailMapper * @param planMaintDetailId 保养计划明细主键 * @return 结果 */ - public int deleteDmsPlanMaintDetailByPlanMaintDetailId(Long planMaintDetailId); + public int deleteDmsPlanMaintDetailByPlanMaintDetailId(@Param("planMaintDetailId") Long planMaintDetailId); /** * 批量删除保养计划明细 @@ -61,7 +61,7 @@ public interface DmsPlanMaintDetailMapper * @param planMaintDetailIds 需要删除的数据主键集合 * @return 结果 */ - public int deleteDmsPlanMaintDetailByPlanMaintDetailIds(Long[] planMaintDetailIds); + public int deleteDmsPlanMaintDetailByPlanMaintDetailIds(@Param("planMaintDetailIds") Long[] planMaintDetailIds); @@ -73,7 +73,7 @@ public interface DmsPlanMaintDetailMapper */ public List selectDmsPlanMaintDetailJoinList(DmsPlanMaintDetail dmsPlanMaintDetail); - List selectDmsPlanMaintDetailListByPlanMaintId(Long planMaintId); + List selectDmsPlanMaintDetailListByPlanMaintId(@Param("planMaintId") Long planMaintId); Long selectStandardId(@Param("stationId") Long stationId); diff --git a/aucma-dms/src/main/java/com/aucma/dms/mapper/DmsPlanMaintMapper.java b/aucma-dms/src/main/java/com/aucma/dms/mapper/DmsPlanMaintMapper.java index 11d5754..317d215 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/mapper/DmsPlanMaintMapper.java +++ b/aucma-dms/src/main/java/com/aucma/dms/mapper/DmsPlanMaintMapper.java @@ -21,7 +21,7 @@ public interface DmsPlanMaintMapper * @param planMaintId 保养计划信息主键 * @return 保养计划信息 */ - public DmsPlanMaint selectDmsPlanMaintByPlanMaintId(Long planMaintId); + public DmsPlanMaint selectDmsPlanMaintByPlanMaintId(@Param("planMaintId") Long planMaintId); /** * 查询保养计划信息列表 @@ -53,7 +53,7 @@ public interface DmsPlanMaintMapper * @param planMaintId 保养计划信息主键 * @return 结果 */ - public int deleteDmsPlanMaintByPlanMaintId(Long planMaintId); + public int deleteDmsPlanMaintByPlanMaintId(@Param("planMaintId") Long planMaintId); /** * 批量删除保养计划信息 @@ -61,7 +61,7 @@ public interface DmsPlanMaintMapper * @param planMaintIds 需要删除的数据主键集合 * @return 结果 */ - public int deleteDmsPlanMaintByPlanMaintIds(Long[] planMaintIds); + public int deleteDmsPlanMaintByPlanMaintIds(@Param("planMaintIds") Long[] planMaintIds); /** * 批量删除保养计划明细 @@ -69,7 +69,7 @@ public interface DmsPlanMaintMapper * @param planMaintIds 需要删除的数据主键集合 * @return 结果 */ - public int deleteDmsPlanMaintDetailByPlanMaintIds(Long[] planMaintIds); + public int deleteDmsPlanMaintDetailByPlanMaintIds(@Param("planMaintIds") Long[] planMaintIds); /** * 批量新增保养计划明细 @@ -77,7 +77,7 @@ public interface DmsPlanMaintMapper * @param dmsPlanMaintDetailList 保养计划明细列表 * @return 结果 */ - public int batchDmsPlanMaintDetail(List dmsPlanMaintDetailList); + public int batchDmsPlanMaintDetail(@Param("dmsPlanMaintDetailList") List dmsPlanMaintDetailList); /** @@ -86,7 +86,7 @@ public interface DmsPlanMaintMapper * @param planMaintId 保养计划信息ID * @return 结果 */ - public int deleteDmsPlanMaintDetailByPlanMaintId(Long planMaintId); + public int deleteDmsPlanMaintDetailByPlanMaintId(@Param("planMaintId") Long planMaintId); @@ -96,7 +96,7 @@ public interface DmsPlanMaintMapper * @param planMaintCode 保养计划信息Code * @return 保养计划信息 */ - public DmsPlanMaint selectDmsPlanMaintJoinByPlanMaintCode(String planMaintCode); + public DmsPlanMaint selectDmsPlanMaintJoinByPlanMaintCode(@Param("planMaintCode") String planMaintCode); @@ -106,7 +106,7 @@ public interface DmsPlanMaintMapper * @param planMaintId 保养计划信息主键 * @return 保养计划信息 */ - public DmsPlanMaint selectPlanMaintJoinJobByPlanMaintId(Long planMaintId); + public DmsPlanMaint selectPlanMaintJoinJobByPlanMaintId(@Param("planMaintId") Long planMaintId); /** * 查询待执行的保养计划列表 diff --git a/aucma-dms/src/main/java/com/aucma/dms/mapper/DmsRecordShutDownMapper.java b/aucma-dms/src/main/java/com/aucma/dms/mapper/DmsRecordShutDownMapper.java index bc4649b..ae41756 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/mapper/DmsRecordShutDownMapper.java +++ b/aucma-dms/src/main/java/com/aucma/dms/mapper/DmsRecordShutDownMapper.java @@ -19,7 +19,7 @@ public interface DmsRecordShutDownMapper * @param recordShutDownId 停机记录主键 * @return 停机记录 */ - public DmsRecordShutDown selectDmsRecordShutDownByRecordShutDownId(Long recordShutDownId); + public DmsRecordShutDown selectDmsRecordShutDownByRecordShutDownId(@Param("recordShutDownId") Long recordShutDownId); /** * 查询停机记录列表 @@ -51,7 +51,7 @@ public interface DmsRecordShutDownMapper * @param recordShutDownId 停机记录主键 * @return 结果 */ - public int deleteDmsRecordShutDownByRecordShutDownId(Long recordShutDownId); + public int deleteDmsRecordShutDownByRecordShutDownId(@Param("recordShutDownId") Long recordShutDownId); /** * 批量删除停机记录 @@ -59,7 +59,7 @@ public interface DmsRecordShutDownMapper * @param recordShutDownIds 需要删除的数据主键集合 * @return 结果 */ - public int deleteDmsRecordShutDownByRecordShutDownIds(Long[] recordShutDownIds); + public int deleteDmsRecordShutDownByRecordShutDownIds(@Param("recordShutDownIds") Long[] recordShutDownIds); /** * 查询PDA待处理停机记录（结束时间为空 或 停机原因ID=1） diff --git a/aucma-production/src/main/java/com/aucma/production/mapper/AndonBoardConfigMapper.java b/aucma-production/src/main/java/com/aucma/production/mapper/AndonBoardConfigMapper.java index a4528ce..79a9f85 100644 --- a/aucma-production/src/main/java/com/aucma/production/mapper/AndonBoardConfigMapper.java +++ b/aucma-production/src/main/java/com/aucma/production/mapper/AndonBoardConfigMapper.java @@ -1,6 +1,7 @@ package com.aucma.production.mapper; import com.aucma.production.domain.AndonBoardConfig; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -18,7 +19,7 @@ public interface AndonBoardConfigMapper * @param boardId 安灯看板配置主键 * @return 安灯看板配置 */ - public AndonBoardConfig selectAndonBoardConfigByBoardId(Long boardId); + public AndonBoardConfig selectAndonBoardConfigByBoardId(@Param("boardId") Long boardId); /** * 查询安灯看板配置列表 @@ -50,7 +51,7 @@ public interface AndonBoardConfigMapper * @param boardId 安灯看板配置主键 * @return 结果 */ - public int deleteAndonBoardConfigByBoardId(Long boardId); + public int deleteAndonBoardConfigByBoardId(@Param("boardId") Long boardId); /** * 批量删除安灯看板配置 @@ -58,5 +59,5 @@ public interface AndonBoardConfigMapper * @param boardIds 需要删除的数据主键集合 * @return 结果 */ - public int deleteAndonBoardConfigByBoardIds(Long[] boardIds); + public int deleteAndonBoardConfigByBoardIds(@Param("boardIds") Long[] boardIds); } diff --git a/aucma-production/src/main/java/com/aucma/production/mapper/AndonEventAssignmentMapper.java b/aucma-production/src/main/java/com/aucma/production/mapper/AndonEventAssignmentMapper.java index 619b61e..83a6492 100644 --- a/aucma-production/src/main/java/com/aucma/production/mapper/AndonEventAssignmentMapper.java +++ b/aucma-production/src/main/java/com/aucma/production/mapper/AndonEventAssignmentMapper.java @@ -1,6 +1,7 @@ package com.aucma.production.mapper; import com.aucma.production.domain.AndonEventAssignment; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -18,7 +19,7 @@ public interface AndonEventAssignmentMapper * @param assignmentId 安灯派工记录（派工即通知/待办）主键 * @return 安灯派工记录（派工即通知/待办） */ - public AndonEventAssignment selectAndonEventAssignmentByAssignmentId(Long assignmentId); + public AndonEventAssignment selectAndonEventAssignmentByAssignmentId(@Param("assignmentId") Long assignmentId); /** * 查询安灯派工记录（派工即通知/待办）列表 @@ -50,7 +51,7 @@ public interface AndonEventAssignmentMapper * @param assignmentId 安灯派工记录（派工即通知/待办）主键 * @return 结果 */ - public int deleteAndonEventAssignmentByAssignmentId(Long assignmentId); + public int deleteAndonEventAssignmentByAssignmentId(@Param("assignmentId") Long assignmentId); /** * 批量删除安灯派工记录（派工即通知/待办） @@ -58,5 +59,5 @@ public interface AndonEventAssignmentMapper * @param assignmentIds 需要删除的数据主键集合 * @return 结果 */ - public int deleteAndonEventAssignmentByAssignmentIds(Long[] assignmentIds); + public int deleteAndonEventAssignmentByAssignmentIds(@Param("assignmentIds") Long[] assignmentIds); } diff --git a/aucma-production/src/main/java/com/aucma/production/mapper/AndonEventLogMapper.java b/aucma-production/src/main/java/com/aucma/production/mapper/AndonEventLogMapper.java index 3f5e0d6..91c4cfa 100644 --- a/aucma-production/src/main/java/com/aucma/production/mapper/AndonEventLogMapper.java +++ b/aucma-production/src/main/java/com/aucma/production/mapper/AndonEventLogMapper.java @@ -1,6 +1,7 @@ package com.aucma.production.mapper; import com.aucma.production.domain.AndonEventLog; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -18,7 +19,7 @@ public interface AndonEventLogMapper * @param logId 安灯事件操作日志（审计与追踪）主键 * @return 安灯事件操作日志（审计与追踪） */ - public AndonEventLog selectAndonEventLogByLogId(Long logId); + public AndonEventLog selectAndonEventLogByLogId(@Param("logId") Long logId); /** * 查询安灯事件操作日志（审计与追踪）列表 @@ -50,7 +51,7 @@ public interface AndonEventLogMapper * @param logId 安灯事件操作日志（审计与追踪）主键 * @return 结果 */ - public int deleteAndonEventLogByLogId(Long logId); + public int deleteAndonEventLogByLogId(@Param("logId") Long logId); /** * 批量删除安灯事件操作日志（审计与追踪） @@ -58,5 +59,5 @@ public interface AndonEventLogMapper * @param logIds 需要删除的数据主键集合 * @return 结果 */ - public int deleteAndonEventLogByLogIds(Long[] logIds); + public int deleteAndonEventLogByLogIds(@Param("logIds") Long[] logIds); } diff --git a/aucma-production/src/main/java/com/aucma/production/mapper/AndonEventMapper.java b/aucma-production/src/main/java/com/aucma/production/mapper/AndonEventMapper.java index 5574ac0..8ffe24b 100644 --- a/aucma-production/src/main/java/com/aucma/production/mapper/AndonEventMapper.java +++ b/aucma-production/src/main/java/com/aucma/production/mapper/AndonEventMapper.java @@ -1,6 +1,7 @@ package com.aucma.production.mapper; import com.aucma.production.domain.AndonEvent; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -18,7 +19,7 @@ public interface AndonEventMapper * @param eventId 安灯事件主键 * @return 安灯事件 */ - public AndonEvent selectAndonEventByEventId(Long eventId); + public AndonEvent selectAndonEventByEventId(@Param("eventId") Long eventId); /** * 查询安灯事件列表 @@ -50,7 +51,7 @@ public interface AndonEventMapper * @param eventId 安灯事件主键 * @return 结果 */ - public int deleteAndonEventByEventId(Long eventId); + public int deleteAndonEventByEventId(@Param("eventId") Long eventId); /** * 批量删除安灯事件 @@ -58,5 +59,5 @@ public interface AndonEventMapper * @param eventIds 需要删除的数据主键集合 * @return 结果 */ - public int deleteAndonEventByEventIds(Long[] eventIds); + public int deleteAndonEventByEventIds(@Param("eventIds") Long[] eventIds); } diff --git a/aucma-production/src/main/java/com/aucma/production/mapper/AndonRuleMapper.java b/aucma-production/src/main/java/com/aucma/production/mapper/AndonRuleMapper.java index f8d330f..4ddc5dc 100644 --- a/aucma-production/src/main/java/com/aucma/production/mapper/AndonRuleMapper.java +++ b/aucma-production/src/main/java/com/aucma/production/mapper/AndonRuleMapper.java @@ -1,6 +1,7 @@ package com.aucma.production.mapper; import com.aucma.production.domain.AndonRule; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -18,7 +19,7 @@ public interface AndonRuleMapper * @param ruleId 安灯规则配置主键 * @return 安灯规则配置 */ - public AndonRule selectAndonRuleByRuleId(Long ruleId); + public AndonRule selectAndonRuleByRuleId(@Param("ruleId") Long ruleId); /** * 查询安灯规则配置列表 @@ -50,7 +51,7 @@ public interface AndonRuleMapper * @param ruleId 安灯规则配置主键 * @return 结果 */ - public int deleteAndonRuleByRuleId(Long ruleId); + public int deleteAndonRuleByRuleId(@Param("ruleId") Long ruleId); /** * 批量删除安灯规则配置 @@ -58,5 +59,5 @@ public interface AndonRuleMapper * @param ruleIds 需要删除的数据主键集合 * @return 结果 */ - public int deleteAndonRuleByRuleIds(Long[] ruleIds); + public int deleteAndonRuleByRuleIds(@Param("ruleIds") Long[] ruleIds); } diff --git a/aucma-production/src/main/java/com/aucma/production/mapper/BaseBomInfoMapper.java b/aucma-production/src/main/java/com/aucma/production/mapper/BaseBomInfoMapper.java index 49fd5ea..7ec7a7c 100644 --- a/aucma-production/src/main/java/com/aucma/production/mapper/BaseBomInfoMapper.java +++ b/aucma-production/src/main/java/com/aucma/production/mapper/BaseBomInfoMapper.java @@ -18,7 +18,7 @@ public interface BaseBomInfoMapper * @param objId 生产BOM主键 * @return 生产BOM */ - public BaseBomInfo selectBaseBomInfoByObjId(Long objId); + public BaseBomInfo selectBaseBomInfoByObjId(@Param("objId") Long objId); /** * 根据BOM编号查询生产BOM @@ -58,7 +58,7 @@ public interface BaseBomInfoMapper * @param objId 生产BOM主键 * @return 结果 */ - public int deleteBaseBomInfoByObjId(Long objId); + public int deleteBaseBomInfoByObjId(@Param("objId") Long objId); /** * 批量删除生产BOM @@ -66,14 +66,14 @@ public interface BaseBomInfoMapper * @param objIds 需要删除的数据主键集合 * @return 结果 */ - public int deleteBaseBomInfoByObjIds(Long[] objIds); + public int deleteBaseBomInfoByObjIds(@Param("objIds") Long[] objIds); /** * 根据ID查询所有子Bom * @param materialCode * @return */ - List selectChildrenBomById(String materialCode); + List selectChildrenBomById(@Param("materialCode") String materialCode); /** * 修改子元素关系 diff --git a/aucma-production/src/main/java/com/aucma/production/mapper/CalendarInfoMapper.java b/aucma-production/src/main/java/com/aucma/production/mapper/CalendarInfoMapper.java index 2b8cbd8..5096819 100644 --- a/aucma-production/src/main/java/com/aucma/production/mapper/CalendarInfoMapper.java +++ b/aucma-production/src/main/java/com/aucma/production/mapper/CalendarInfoMapper.java @@ -2,6 +2,7 @@ package com.aucma.production.mapper; import java.util.List; import com.aucma.production.domain.CalendarInfo; +import org.apache.ibatis.annotations.Param; /** * 生产日历Mapper接口 @@ -17,7 +18,7 @@ public interface CalendarInfoMapper * @param objId 生产日历主键 * @return 生产日历 */ - public CalendarInfo selectCalendarInfoByObjId(Long objId); + public CalendarInfo selectCalendarInfoByObjId(@Param("objId") Long objId); /** * 查询生产日历列表 @@ -49,7 +50,7 @@ public interface CalendarInfoMapper * @param objId 生产日历主键 * @return 结果 */ - public int deleteCalendarInfoByObjId(Long objId); + public int deleteCalendarInfoByObjId(@Param("objId") Long objId); /** * 批量删除生产日历 @@ -57,5 +58,5 @@ public interface CalendarInfoMapper * @param objIds 需要删除的数据主键集合 * @return 结果 */ - public int deleteCalendarInfoByObjIds(Long[] objIds); + public int deleteCalendarInfoByObjIds(@Param("objIds") Long[] objIds); } diff --git a/aucma-production/src/main/java/com/aucma/production/mapper/MrpComponentWeeklyReqMapper.java b/aucma-production/src/main/java/com/aucma/production/mapper/MrpComponentWeeklyReqMapper.java index 45e9d32..994c034 100644 --- a/aucma-production/src/main/java/com/aucma/production/mapper/MrpComponentWeeklyReqMapper.java +++ b/aucma-production/src/main/java/com/aucma/production/mapper/MrpComponentWeeklyReqMapper.java @@ -2,6 +2,7 @@ package com.aucma.production.mapper; import java.util.List; import com.aucma.production.domain.MrpComponentWeeklyReq; +import org.apache.ibatis.annotations.Param; /** * 子件物料周需求Mapper接口 @@ -17,7 +18,7 @@ public interface MrpComponentWeeklyReqMapper * @param id 子件物料周需求主键 * @return 子件物料周需求 */ - public MrpComponentWeeklyReq selectMrpComponentWeeklyReqById(Long id); + public MrpComponentWeeklyReq selectMrpComponentWeeklyReqById(@Param("id") Long id); /** * 查询子件物料周需求列表 @@ -49,7 +50,7 @@ public interface MrpComponentWeeklyReqMapper * @param id 子件物料周需求主键 * @return 结果 */ - public int deleteMrpComponentWeeklyReqById(Long id); + public int deleteMrpComponentWeeklyReqById(@Param("id") Long id); /** * 批量删除子件物料周需求 @@ -57,7 +58,7 @@ public interface MrpComponentWeeklyReqMapper * @param ids 需要删除的数据主键集合 * @return 结果 */ - public int deleteMrpComponentWeeklyReqByIds(Long[] ids); + public int deleteMrpComponentWeeklyReqByIds(@Param("ids") Long[] ids); /** * 批量插入子件物料周需求 @@ -65,5 +66,5 @@ public interface MrpComponentWeeklyReqMapper * @param list 子件物料周需求列表 * @return 结果 */ - public int batchInsert(List list); + public int batchInsert(@Param("list") List list); } diff --git a/aucma-production/src/main/java/com/aucma/production/mapper/MrpProdWeeklyPlanMapper.java b/aucma-production/src/main/java/com/aucma/production/mapper/MrpProdWeeklyPlanMapper.java index 4b10d7c..50cbf38 100644 --- a/aucma-production/src/main/java/com/aucma/production/mapper/MrpProdWeeklyPlanMapper.java +++ b/aucma-production/src/main/java/com/aucma/production/mapper/MrpProdWeeklyPlanMapper.java @@ -2,6 +2,7 @@ package com.aucma.production.mapper; import java.util.List; import com.aucma.production.domain.MrpProdWeeklyPlan; +import org.apache.ibatis.annotations.Param; /** * 周排产计划Mapper接口 @@ -17,7 +18,7 @@ public interface MrpProdWeeklyPlanMapper * @param id 周排产计划主键 * @return 周排产计划 */ - public MrpProdWeeklyPlan selectMrpProdWeeklyPlanById(Long id); + public MrpProdWeeklyPlan selectMrpProdWeeklyPlanById(@Param("id") Long id); /** * 查询周排产计划列表 @@ -49,7 +50,7 @@ public interface MrpProdWeeklyPlanMapper * @param id 周排产计划主键 * @return 结果 */ - public int deleteMrpProdWeeklyPlanById(Long id); + public int deleteMrpProdWeeklyPlanById(@Param("id") Long id); /** * 批量删除周排产计划 @@ -57,7 +58,7 @@ public interface MrpProdWeeklyPlanMapper * @param ids 需要删除的数据主键集合 * @return 结果 */ - public int deleteMrpProdWeeklyPlanByIds(Long[] ids); + public int deleteMrpProdWeeklyPlanByIds(@Param("ids") Long[] ids); /** * 批量插入周排产计划 @@ -65,5 +66,5 @@ public interface MrpProdWeeklyPlanMapper * @param list 周排产计划列表 * @return 结果 */ - public int batchInsert(List list); + public int batchInsert(@Param("list") List list); } diff --git a/aucma-production/src/main/java/com/aucma/production/mapper/ProdOrderNoteMapper.java b/aucma-production/src/main/java/com/aucma/production/mapper/ProdOrderNoteMapper.java index 5f29c10..830f3ce 100644 --- a/aucma-production/src/main/java/com/aucma/production/mapper/ProdOrderNoteMapper.java +++ b/aucma-production/src/main/java/com/aucma/production/mapper/ProdOrderNoteMapper.java @@ -3,6 +3,7 @@ package com.aucma.production.mapper; import java.util.List; import com.aucma.production.domain.ProdOrderNote; +import org.apache.ibatis.annotations.Param; /** * 工单备注与异常记录Mapper接口 @@ -11,7 +12,7 @@ import com.aucma.production.domain.ProdOrderNote; * @date 2026-03-18 */ public interface ProdOrderNoteMapper { - ProdOrderNote selectProdOrderNoteByObjId(Long objId); + ProdOrderNote selectProdOrderNoteByObjId(@Param("objId") Long objId); List selectProdOrderNoteList(ProdOrderNote prodOrderNote); @@ -19,7 +20,7 @@ public interface ProdOrderNoteMapper { int updateProdOrderNote(ProdOrderNote prodOrderNote); - int deleteProdOrderNoteByObjId(Long objId); + int deleteProdOrderNoteByObjId(@Param("objId") Long objId); - int deleteProdOrderNoteByObjIds(Long[] objIds); + int deleteProdOrderNoteByObjIds(@Param("objIds") Long[] objIds); } diff --git a/aucma-production/src/main/java/com/aucma/production/mapper/ProdRouteMapper.java b/aucma-production/src/main/java/com/aucma/production/mapper/ProdRouteMapper.java index 3bc2a18..580466e 100644 --- a/aucma-production/src/main/java/com/aucma/production/mapper/ProdRouteMapper.java +++ b/aucma-production/src/main/java/com/aucma/production/mapper/ProdRouteMapper.java @@ -4,6 +4,7 @@ import java.util.List; import com.aucma.production.domain.ProdRoute; import com.aucma.production.domain.ProdRouteDetail; +import org.apache.ibatis.annotations.Param; /** * 生产工艺路线Mapper接口 @@ -12,23 +13,23 @@ import com.aucma.production.domain.ProdRouteDetail; * @date 2026-03-18 */ public interface ProdRouteMapper { - ProdRoute selectProdRouteByObjId(Long objId); + ProdRoute selectProdRouteByObjId(@Param("objId") Long objId); - ProdRoute selectProdRouteByRouteCode(String routeCode); + ProdRoute selectProdRouteByRouteCode(@Param("routeCode") String routeCode); List selectProdRouteList(ProdRoute prodRoute); - List selectProdRouteDetailListByRouteCode(String routeCode); + List selectProdRouteDetailListByRouteCode(@Param("routeCode") String routeCode); int insertProdRoute(ProdRoute prodRoute); int updateProdRoute(ProdRoute prodRoute); - int deleteProdRouteByObjId(Long objId); + int deleteProdRouteByObjId(@Param("objId") Long objId); - int deleteProdRouteByObjIds(Long[] objIds); + int deleteProdRouteByObjIds(@Param("objIds") Long[] objIds); int insertProdRouteDetail(ProdRouteDetail detail); - int deleteProdRouteDetailByRouteCode(String routeCode); + int deleteProdRouteDetailByRouteCode(@Param("routeCode") String routeCode); } diff --git a/aucma-production/src/main/java/com/aucma/production/mapper/ProdStationCapabilityMapper.java b/aucma-production/src/main/java/com/aucma/production/mapper/ProdStationCapabilityMapper.java index d568add..dc2f335 100644 --- a/aucma-production/src/main/java/com/aucma/production/mapper/ProdStationCapabilityMapper.java +++ b/aucma-production/src/main/java/com/aucma/production/mapper/ProdStationCapabilityMapper.java @@ -3,6 +3,7 @@ package com.aucma.production.mapper; import java.util.List; import com.aucma.production.domain.ProdStationCapability; +import org.apache.ibatis.annotations.Param; /** * 工位能力维护Mapper接口 @@ -11,7 +12,7 @@ import com.aucma.production.domain.ProdStationCapability; * @date 2026-03-18 */ public interface ProdStationCapabilityMapper { - ProdStationCapability selectProdStationCapabilityByObjId(Long objId); + ProdStationCapability selectProdStationCapabilityByObjId(@Param("objId") Long objId); List selectProdStationCapabilityList(ProdStationCapability prodStationCapability); @@ -21,7 +22,7 @@ public interface ProdStationCapabilityMapper { int updateProdStationCapability(ProdStationCapability prodStationCapability); - int deleteProdStationCapabilityByObjId(Long objId); + int deleteProdStationCapabilityByObjId(@Param("objId") Long objId); - int deleteProdStationCapabilityByObjIds(Long[] objIds); + int deleteProdStationCapabilityByObjIds(@Param("objIds") Long[] objIds); } diff --git a/aucma-production/src/main/java/com/aucma/production/mapper/ProdTaskPoolMapper.java b/aucma-production/src/main/java/com/aucma/production/mapper/ProdTaskPoolMapper.java index efbbb10..c49fa55 100644 --- a/aucma-production/src/main/java/com/aucma/production/mapper/ProdTaskPoolMapper.java +++ b/aucma-production/src/main/java/com/aucma/production/mapper/ProdTaskPoolMapper.java @@ -3,6 +3,7 @@ package com.aucma.production.mapper; import java.util.List; import com.aucma.production.domain.ProdTaskPool; +import org.apache.ibatis.annotations.Param; /** * 生产任务池Mapper接口 @@ -11,7 +12,7 @@ import com.aucma.production.domain.ProdTaskPool; * @date 2026-03-18 */ public interface ProdTaskPoolMapper { - ProdTaskPool selectProdTaskPoolByOrderCode(String orderCode); + ProdTaskPool selectProdTaskPoolByOrderCode(@Param("orderCode") String orderCode); List selectProdTaskPoolList(ProdTaskPool prodTaskPool); @@ -19,7 +20,7 @@ public interface ProdTaskPoolMapper { int updateProdTaskPool(ProdTaskPool prodTaskPool); - int deleteProdTaskPoolByOrderCodes(String[] orderCodes); + int deleteProdTaskPoolByOrderCodes(@Param("orderCodes") String[] orderCodes); int updateOrderExecutionStatus(ProdTaskPool prodTaskPool); } diff --git a/aucma-production/src/main/java/com/aucma/production/mapper/ProdTeamShiftMapper.java b/aucma-production/src/main/java/com/aucma/production/mapper/ProdTeamShiftMapper.java index 0ae4454..e6fe02a 100644 --- a/aucma-production/src/main/java/com/aucma/production/mapper/ProdTeamShiftMapper.java +++ b/aucma-production/src/main/java/com/aucma/production/mapper/ProdTeamShiftMapper.java @@ -3,6 +3,7 @@ package com.aucma.production.mapper; import java.util.List; import com.aucma.production.domain.ProdTeamShift; +import org.apache.ibatis.annotations.Param; /** * 班组排班维护Mapper接口 @@ -11,7 +12,7 @@ import com.aucma.production.domain.ProdTeamShift; * @date 2026-03-18 */ public interface ProdTeamShiftMapper { - ProdTeamShift selectProdTeamShiftByObjId(Long objId); + ProdTeamShift selectProdTeamShiftByObjId(@Param("objId") Long objId); List selectProdTeamShiftList(ProdTeamShift prodTeamShift); @@ -21,7 +22,7 @@ public interface ProdTeamShiftMapper { int updateProdTeamShift(ProdTeamShift prodTeamShift); - int deleteProdTeamShiftByObjId(Long objId); + int deleteProdTeamShiftByObjId(@Param("objId") Long objId); - int deleteProdTeamShiftByObjIds(Long[] objIds); + int deleteProdTeamShiftByObjIds(@Param("objIds") Long[] objIds); } diff --git a/aucma-production/src/main/java/com/aucma/production/mapper/ProductPlanInfoMapper.java b/aucma-production/src/main/java/com/aucma/production/mapper/ProductPlanInfoMapper.java index c185c65..9a8c50a 100644 --- a/aucma-production/src/main/java/com/aucma/production/mapper/ProductPlanInfoMapper.java +++ b/aucma-production/src/main/java/com/aucma/production/mapper/ProductPlanInfoMapper.java @@ -2,6 +2,7 @@ package com.aucma.production.mapper; import java.util.List; import com.aucma.production.domain.ProductPlanInfo; +import org.apache.ibatis.annotations.Param; /** * 生产计划Mapper接口 @@ -17,7 +18,7 @@ public interface ProductPlanInfoMapper * @param objId 生产计划主键 * @return 生产计划 */ - public ProductPlanInfo selectProductPlanInfoByObjId(Long objId); + public ProductPlanInfo selectProductPlanInfoByObjId(@Param("objId") Long objId); /** * 查询生产计划列表 @@ -49,7 +50,7 @@ public interface ProductPlanInfoMapper * @param objId 生产计划主键 * @return 结果 */ - public int deleteProductPlanInfoByObjId(Long objId); + public int deleteProductPlanInfoByObjId(@Param("objId") Long objId); /** * 批量删除生产计划 @@ -57,5 +58,5 @@ public interface ProductPlanInfoMapper * @param objIds 需要删除的数据主键集合 * @return 结果 */ - public int deleteProductPlanInfoByObjIds(Long[] objIds); + public int deleteProductPlanInfoByObjIds(@Param("objIds") Long[] objIds); } diff --git a/aucma-production/src/main/java/com/aucma/production/mapper/ProductionReportQualityInspectionMapper.java b/aucma-production/src/main/java/com/aucma/production/mapper/ProductionReportQualityInspectionMapper.java index e388423..5e9dd19 100644 --- a/aucma-production/src/main/java/com/aucma/production/mapper/ProductionReportQualityInspectionMapper.java +++ b/aucma-production/src/main/java/com/aucma/production/mapper/ProductionReportQualityInspectionMapper.java @@ -2,6 +2,7 @@ package com.aucma.production.mapper; import java.util.List; import com.aucma.production.domain.ProductionReportQualityInspection; +import org.apache.ibatis.annotations.Param; /** * 质检记录管理Mapper接口（生产模块专用） @@ -20,7 +21,7 @@ public interface ProductionReportQualityInspectionMapper { * @param objId 质检记录管理主键 * @return 质检记录管理 */ - public ProductionReportQualityInspection selectReportQualityInspectionByObjId(Long objId); + public ProductionReportQualityInspection selectReportQualityInspectionByObjId(@Param("objId") Long objId); /** * 查询质检记录管理列表