From b48c139589bfe7b6332d7d57ff85cb76d043876d Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Sun, 27 Apr 2025 14:16:17 +0800 Subject: [PATCH] =?UTF-8?q?2025-04-27=20=E7=82=B9=E6=A3=80=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E5=92=8C=E8=AE=A1=E5=88=92=E5=A2=9E=E5=8A=A0=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E4=BA=BA=EF=BC=8C=E5=8F=96=E6=B6=88=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/part/entity/CopyTempBomTree.java | 3 + .../sys/modules/pms/mapper/EamMapper.java | 836 +----------------- .../pms/service/Impl/EamServiceImpl.java | 1 + .../pms/service/Impl/QcServiceImpl.java | 533 ----------- .../mapper/part/BomSearch3Mapper.xml | 6 +- src/main/resources/mapper/pms/EamMapper.xml | 79 +- src/main/resources/mapper/pms/QcMapper.xml | 10 +- 7 files changed, 77 insertions(+), 1391 deletions(-) diff --git a/src/main/java/com/xujie/sys/modules/part/entity/CopyTempBomTree.java b/src/main/java/com/xujie/sys/modules/part/entity/CopyTempBomTree.java index 578857a4..506816da 100644 --- a/src/main/java/com/xujie/sys/modules/part/entity/CopyTempBomTree.java +++ b/src/main/java/com/xujie/sys/modules/part/entity/CopyTempBomTree.java @@ -44,6 +44,9 @@ public class CopyTempBomTree { @TableField(exist = false) private String partDesc; + @TableField(exist = false) + private String noteText; + /** * 递归方法生成树结构 */ diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java index 8528ac8f..73e1485f 100644 --- a/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java +++ b/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java @@ -22,989 +22,191 @@ import java.util.List; @Repository public interface EamMapper { - /** - * @Description TODO - * @Title eamAdminSearch - * @param page - * @param cRollinfoVo - * @author rq - * @date 2023/2/20 17:29 - * @return IPage - * @throw - */ IPage eamAdminSearch(Page page, @Param("query") EamAdminData inData); - - /** - * @Description TODO - * @Title eamAdminSearch - * @param page -  * @param cRollinfoVo - * @author rq - * @date 2023/2/20 17:29 - * @return IPage - * @throw - */ IPage eamFamilySearch(Page page, @Param("query") EamFamilyData inData); - /** - * @Description TODO - * @Title eamGroupSearch - * @param page -  * @param - * @author rq - * @date 2023/2/20 17:29 - * @return IPage - * @throw - */ IPage eamGroupSearch(Page page, @Param("query") EamGroupData inData); - /** - * @Description TODO - * @Title eamLocationSearch - * @param page -  * @param - * @author rq - * @date 2023/2/20 17:29 - * @return IPage - * @throw - */ IPage eamLocationSearch(Page page, @Param("query") EamLocationData inData); - /** - * @Description TODO - * @Title eamManufacturerSearch - * @param page -  * @param - * @author rq - * @date 2023/2/20 17:29 - * @return IPage - * @throw - */ IPage eamManufacturerSearch(Page page, @Param("query") EamManufacturerData inData); - - - /** - * @Description TODO - * @Title eamAdminLevelSearch - * @param page -  * @param - * @author rq - * @date 2023/2/20 17:29 - * @return IPage - * @throw - */ IPage eamAdminLevelSearch(Page page, @Param("query") EamAdminLevelData inData); - - /** - * @Description TODO - * @Title eamSupplierSearch - * @param page -  * @param - * @author rq - * @date 2023/2/20 17:29 - * @return IPage - * @throw - */ IPage eamSupplierSearch(Page page, @Param("query") EamSupplierData inData); - /** - * @Description TODO - * @Title searchItemAvailable - * @param inData - * @author rq - * @date 2023/2/23 10:52 - * @return List - * @throw - */ List searchItemAvailable(EamPropertiesItemAvailableData inData); - /** - * @Description 获取值编号 - * @Title getItemValueNo - * @param inData - * @author rq - * @date 2023/2/23 11:21 - * @return Float - * @throw - */ Double getItemValueNo(EamPropertiesItemAvailableData inData); - /** - * @Description 获取值编号(计划的) - * @Title getItemValueNo - * @param inData - * @author rq - * @date 2023/2/23 11:21 - * @return Float - * @throw - */ + Double getItemValueNoForPlan(EamWorkPlanItemAvailableData inData); - /** - * @Description TODO - * @Title saveItemAvailable - * @param inData - * @author rq - * @date 2023/2/23 11:38 - * @return void - * @throw - */ + void saveItemAvailable(EamPropertiesItemAvailableData inData); - /** - * @Description TODO - * @Title updateItemAvailable - * @param inData - * @author rq - * @date 2023/2/23 11:38 - * @return void - * @throw - */ void updateItemAvailable(EamPropertiesItemAvailableData inData); void deleteItemAvailable(EamPropertiesItemAvailableData inData); - //---------------点检模板------------------- -/** - * @Description 查询模板 - * @Title eamPropertiesModelSearch - * @param page - * @param inData - * @author rq - * @date 2023/2/23 17:18 - * @return IPage - * @throw - */ IPage eamPropertiesModelSearch(Page page, @Param("query") EamPropertiesModelHeaderData inData); - - /** - * @Description 点检模板新增 - * @Title EamPropertiesModelHeaderData - * @param - * @author rq - * @date 2023/2/23 17:41 - * @return void - * @throw - */ void eamPropertiesModelSave(EamPropertiesModelHeaderData inData); - /** - * @Description TODO - * @Title eamPropertiesModelEdit - * @param inData - * @author rq - * @date 2023/2/23 17:44 - * @return void - * @throw - */ void eamPropertiesModelEdit(EamPropertiesModelHeaderData inData); - /** - * @Description TODO - * @Title checkPropertiesModel - * @param inData - * @author rq - * @date 2023/2/23 17:58 - * @return List - * @throw - */ List checkPropertiesModel(EamPropertiesModelHeaderData inData); - /** - * @Description TODO - * @Title eamPropertiesModelDelete - * @param inData - * @author rq - * @date 2023/2/23 18:01 - * @return void - * @throw - */ void eamPropertiesModelDelete(EamPropertiesModelHeaderData inData); - /** - * @Description 查询模板中的项目 - * @Title searchModalDetails - * @param data - * @author rq - * @date 2023/2/24 13:33 - * @return List - * @throw - */ List searchModalDetails(EamPropertiesModelDetailData data); - /** - * @Description 查询模板中的项目是否存在 - * @Title checkModalDetails - * @param data - * @author rq - * @date 2023/2/24 13:48 - * @return List - * @throw - */ + List checkModalDetails(EamPropertiesModelDetailData data); - /** - * @Description 检查项目在不在 - * @Title checkItem - * @param data - * @author rq - * @date 2023/2/24 13:54 - * @return List - * @throw - */ List checkItem(EamPropertiesModelDetailData data); - /** - * @Description 添加模板中的项目 - * @Title saveModalDetails - * @param data - * @author rq - * @date 2023/2/24 13:33 - * @return void - * @throw - */ + void saveModalDetails(EamPropertiesModelDetailData data); - /** - * @Description 获取新的编号 - * @Title getModalDetailSeqNo - * @param data - * @author rq - * @date 2023/2/24 13:46 - * @return Integer - * @throw - */ + Integer getModalDetailSeqNo(EamPropertiesModelDetailData data); - /** - * @Description 删除模板中的项目 - * @Title deleteModalDetails - * @param data - * @author rq - * @date 2023/2/24 13:33 - * @return void - * @throw - */ + void deleteModalDetails(EamPropertiesModelDetailData data); //---------------点检计划------------------- - /** - * @param - * @return List - * @Description 查询点检或者其他计划 - * @Title - * @author rq - * @date 2023/1/29 13:34 - * @throw - */ - IPage eamWorkPlanSearch(Page page, @Param("query") EamWorkPlanInData inData); - - /** - * @Description 查询模板中的项目 - * @Title searchModalDetails - * @param data - * @author rq - * @date 2023/2/24 13:33 - * @return List - * @throw - */ List searchPlanItems(EamWorkPlanData data); - /** - * @Description TODO - * @Title searchItemAvailable - * @param inData - * @author rq - * @date 2023/2/23 10:52 - * @return List - * @throw - */ List searchPlanItemAvailable(EamWorkPlanItemData inData); - - /** - * @Description 点检xiugai - * @Title updatePlanItems - * @param - * @author rq - * @date 2023/2/23 17:41 - * @return void - * @throw - */ void updatePlanItems(EamWorkPlanItemData inData); void updatePlanItemsForNull(EamWorkPlanItemData inData); - /** - * @Description TODO - * @Title saveItemAvailable - * @param inData - * @author rq - * @date 2023/2/23 11:38 - * @return void - * @throw - */ void saveItemAvailableForPlan(EamWorkPlanItemAvailableData inData); - /** - * @Description TODO - * @Title updateItemAvailable - * @param inData - * @author rq - * @date 2023/2/23 11:38 - * @return void - * @throw - */ void updateItemAvailableForPlan(EamWorkPlanItemAvailableData inData); - - void deletePlanItemAvailable(EamWorkPlanItemAvailableData inData); - - /** - * @Description TODO - * @Title objectIDBlur - * @param inData - * @author rq - * @date 2023/3/3 13:49 - * @return List - * @throw - */ List objectIDBlur(EamObjectData inData); - /** - * @Description TODO - * @Title modalCodeBlur - * @param inData - * @author rq - * @date 2023/3/3 13:50 - * @return List - * @throw - */ + List modalCodeBlur(EamPropertiesModelHeaderData inData); //---------------点检工单------------------- - /** - * @Description TODO - * @Title eamWorkOrderSearch - * @param page -  * @param inData - * @author rq - * @date 2023/3/13 16:09 - * @return IPage - * @throw - */ IPage eamWorkOrderSearch(Page page, @Param("query") EamWorkOrderInData inData); - /** - * @Description TODO - * @Title eamWorkOrderSearchForDefect - * @param page - * @param inData - * @author rq - * @date 2023/3/13 17:47 - * @return IPage - * @throw - */ IPage eamWorkOrderSearchForDefect(Page page, @Param("query") EamWorkOrderInData inData); - - - /** - * @Description TODO - * @Title eamGroupSearch - * @param page -  * @param - * @author rq - * @date 2023/2/20 17:29 - * @return IPage - * @throw - */ IPage eamDefectSearch(Page page, @Param("query") EamDefectData inData); IPage eamObjectDefectSearch(Page page, @Param("query") EamObjectDefectInData inData); - /** - * @Description TODO - * @Title getObjectList - * @param inData - * @author rq - * @date 2023/3/7 14:30 - * @return List - * @throw - */ List getObjectList(EamObjectInData inData); - /** - * @Description 分类删除检验 - * @Title checkEamFamilyDelete - * @param - * @author rq - * @date 2023/3/7 17:28 - * @return List - * @throw - */ List checkEamFamilyDelete(EamFamilyData inData); - /** - * @Description 分组删除检验 - * @Title checkEamGroupDelete - * @param - * @author rq - * @date 2023/3/7 17:28 - * @return List - * @throw - */ List checkEamGroupDelete(EamGroupData inData); - /** - * @Description 分组删除检验 - * @Title checkEamLocationDelete - * @param - * @author rq - * @date 2023/3/7 17:28 - * @return List - * @throw - */ + List checkEamLocationDelete(EamLocationData inData); - /** - * @Description - * @Title eamWorkPlanItemSearchForReport - * @param - * @author rq - * @date 2023/3/7 17:28 - * @return List - * @throw - */ List eamWorkPlanItemSearchForReport(EamWorkOrderItemInData inData); - /** - * @Description TODO - * @Title checkEamOrderStatus - * @param inData - * @author rq - * @date 2023/3/10 17:25 - * @return List - * @throw - */ List checkEamOrderStatus(EamWorkOrderInData inData); - /** - * @Description 查询用户的机修编号 - * @Title getAdminIDWithMesUser - * @param - * @author rq - * @date 2023/3/12 16:26 - * @return List - * @throw - */ List getAdminIDWithMesUser(@Param("site")String site,@Param("mesUser")String mesUser); - /** - * @Description 更新结果 - * @Title reportWorkOrder - * @param inData - * @author rq - * @date 2023/3/12 16:40 - * @return void - * @throw - */ void reportWorkOrder(EamWorkOrderInData inData); - /** - * @Description TODO - * @Title updateDefectResult - * @param inData - * @author rq - * @date 2023/3/13 17:54 - * @return void - * @throw - */ + void updateDefectResult(EamWorkOrderInData inData); - /** - * @Description 保存报工实测值 - * @Title saveWorkOrderItem - * @param inData - * @author rq - * @date 2023/3/13 10:08 - * @return void - * @throw - */ + void saveWorkOrderItem(EamWorkOrderItemInData inData); - /** - * @Description 判断计划是否完成并关闭 - * @Title saveWorkOrderItem - * @param inData - * @author rq - * @date 2023/3/12 16:54 - * @return void - * @throw - */ void closePlanWithCheck(EamWorkOrderInData inData); - /** - * @Description 报工后更新下一个工作日期 - * @Title updatePlanNextDate - * @param inData - * @author rq - * @date 2023/3/13 10:08 - * @return void - * @throw - */ + void updatePlanNextDate(EamWorkOrderInData inData); - /** - * @Description 查询报工实测值 - * @Title eamWorkOrderReportSearch - * @param inData - * @author rq - * @date 2023/3/13 10:08 - * @return List - * @throw - */ List eamWorkOrderReportSearch(EamWorkOrderItemInData inData); - /** - * @Description TODO - * @Title cancelOrder - * @param inData - * @author rq - * @date 2023/3/13 10:46 - * @return void - * @throw - */ void cancelOrder(EamWorkOrderInData inData); - /** - * @Description TODO - * @Title checkPlanStatus - * @param inData - * @author rq - * @date 2023/3/13 11:37 - * @return List - * @throw - */ List checkPlanStatus(EamWorkPlanInData inData); - /** - * @Description TODO - * @Title planOrder - * @param inData - * @author rq - * @date 2023/3/13 11:38 - * @return void - * @throw - */ void planOrder(EamWorkPlanInData inData); - /** - * @Description 取消计划 - * @Title cancelPlan - * @param inData - * @author rq - * @date 2023/3/13 11:42 - * @return void - * @throw - */ + void cancelPlan(EamWorkPlanInData inData); - /** - * @Description TODO - * @Title cancelOrderWithPlanID - * @param inData - * @author rq - * @date 2023/3/13 11:41 - * @return void - * @throw - */ + void cancelOrderWithPlanID(EamWorkPlanInData inData); - /** - * @Description 删除工单明细 - * @Title deleteOrderDetailWithPlanID - * @param inData - * @author rq - * @date 2023/3/30 17:20 - * @return void - * @throw - */ + void deleteOrderDetailWithPlanID(EamWorkPlanInData inData); - /** - * @Description 删除工单明细 - * @Title deleteOrderDetailWithPlanID - * @param inData - * @author rq - * @date 2023/3/30 17:20 - * @return void - * @throw - */ void deleteOrderWithPlanID(EamWorkPlanInData inData); - /** - * @Description 修改操作员 - * @Title updateOrderPlanOperator - * @param inData - * @author rq - * @date 2023/3/13 14:38 - * @return void - * @throw - */ + void updateOrderPlanOperator(EamWorkOrderInData inData); - /** - * @Description TODO - * @Title getSpareSelectList - * @param inData - * @author rq - * @date 2023/3/15 13:26 - * @return List - * @throw - */ List getSpareSelectList(PartSpareInData inData); - /** - * @Description TODO - * @Title checkPartSpare - * @param inData - * @author rq - * @date 2023/3/15 14:37 - * @return List - * @throw - */ List checkPartSpare(PartSpareInData inData); - /** - * @Description 保存对应关系 - * @Title savePartSpare - * @param inData - * @author rq - * @date 2023/3/15 14:39 - * @return void - * @throw - */ void savePartSpare(PartSpareInData inData); - /** - * @Description 删除对应备件 - * @Title deletePartSpare - * @param inData - * @author rq - * @date 2023/3/15 15:39 - * @return void - * @throw - */ void deletePartSpare(List inData); - /** - * @Description 复制备件 - * @Title deletePartSpare - * @param inData - * @author rq - * @date 2023/3/15 15:39 - * @return void - * @throw - */ void copyPartSpare(List inData); - /** - * @Description TODO - * @Title getWorkPlanDataWithObjectID - * @param inData - * @author rq - * @date 2023/3/15 17:01 - * @return List - * @throw - */ List getWorkPlanDataWithObjectID(EamWorkPlanInData inData); - /** - * @Description 获取设备项目清单 - * @Title getObjectItemList - * @param inData - * @author rq - * @date 2023/3/15 17:50 - * @return List - * @throw - */ List getObjectItemList(EamObjectItemInData inData); - /** - * @Description TODO - * @Title getDefectWithObject - * @param inData - * @author rq - * @date 2023/3/15 18:10 - * @return List - * @throw - */ List getDefectWithObject(EamObjectDefectInData inData); - /** - * @Description TODO - * @Title checkamObjectItemInData - * @param inData - * @author rq - * @date 2023/3/16 10:20 - * @return List - * @throw - */ List checkEamObjectItemData(EamObjectItemInData inData); - /** - * @Description 保存设备项目 - * @Title saveNewEamObjectItem - * @param inData - * @author rq - * @date 2023/3/16 10:24 - * @return void - * @throw - */ void saveNewEamObjectItem(EamObjectItemInData inData); - /** - * @Description TODO - * @Title editEamObjectItem - * @param inData - * @author rq - * @date 2023/3/16 16:38 - * @return void - * @throw - */ void editEamObjectItem(EamObjectItemInData inData); - /** - * @Description TODO - * @Title deleteObjectItem - * @param inData - * @author rq - * @date 2023/3/16 18:22 - * @return void - * @throw - */ void deleteObjectItem(EamObjectItemInData inData); - /** - * @Description 新增项目时一起新增可选项 - * @Title saveNewEamObjectItemAvailable - * @param inData - * @author rq - * @date 2023/3/17 10:46 - * @return void - * @throw - */ + void saveNewEamObjectItemAvailable(EamObjectItemInData inData); - /** - * @Description 删除项目时一起删除可选项 - * @Title deleteEamObjectItemAvailable - * @param inData - * @author rq - * @date 2023/3/17 10:46 - * @return void - * @throw - */ + void deleteEamObjectItemAvailable(EamObjectItemInData inData); - /** - * @Description TODO - * @Title searchObjectItemAvailable - * @param inData - * @author rq - * @date 2023/3/17 10:45 - * @return List - * @throw - */ List searchObjectItemAvailable(EamObjectItemInData inData); - /** - * @Description TODO - * @Title getItemValueNoForObject - * @param - * @author rq - * @date 2023/3/17 11:27 - * @return Double - * @throw - */ Double getItemValueNoForObject(EamObjectItemAvailableData inData); - /** - * @Description 保存可选项 - * @Title saveObjectItemAvailableForPlan - * @param inData - * @author rq - * @date 2023/3/17 11:29 - * @return void - * @throw - */ void saveObjectItemAvailable(EamObjectItemAvailableData inData); - /** - * @Description 新增可选项 - * @Title updateObjectItemAvailable - * @param inData - * @author rq - * @date 2023/3/17 11:29 - * @return void - * @throw - */ + void updateObjectItemAvailable(EamObjectItemAvailableData inData); - /** - * @Description 删除可选项 - * @Title deleteObjectItemAvailable - * @param inData - * @author rq - * @date 2023/3/17 11:29 - * @return void - * @throw - */ + void deleteObjectItemAvailable(EamObjectItemAvailableData inData); - /** - * @Description 复制前删除旧项目信息 - * @Title deleteObjectItemForCopy - * @param inData - * @author rq - * @date 2023/3/17 12:54 - * @return void - * @throw - */ void deleteObjectItemForCopy(EamObjectInData inData); - /** - * @Description 复制前删除旧项目可选值 - * @Title deleteObjectItemAvailableForCopy - * @param inData - * @author rq - * @date 2023/3/17 12:58 - * @return void - * @throw - */ void deleteObjectItemAvailableForCopy(EamObjectInData inData); - /** - * @Description 复制项目信息 - * @Title copyObjectItem - * @param inData - * @author rq - * @date 2023/3/17 12:59 - * @return void - * @throw - */ void copyObjectItem(EamObjectInData inData); - /** - * @Description 复制项目可选值 - * @Title copyObjectItemAvailable - * @param inData - * @author rq - * @date 2023/3/17 12:59 - * @return void - * @throw - */ void copyObjectItemAvailable(EamObjectInData inData); - /** - * @Description 复制前删除旧故障 - * @Title deleteObjectDefectForCopy - * @param inData - * @author rq - * @date 2023/3/17 14:13 - * @return void - * @throw - */ void deleteObjectDefectForCopy(EamObjectInData inData); - /** - * @Description 拷贝复制故障 - * @Title copyObjectDefect - * @param inData - * @author rq - * @date 2023/3/17 14:13 - * @return void - * @throw - */ void copyObjectDefect(EamObjectInData inData); - /** - * @Description TODO - * @Title eamFeedBackSearch - * @param inData - * @author rq - * @date 2023/3/28 17:46 - * @return List - * @throw - */ IPage eamFeedBackSearch(Page page, @Param("query")EamDefectFeedBackInData inData); - /** - * @Description TODO - * @Title eamFeedBackCheck - * @param inData - * @author rq - * @date 2023/3/29 11:40 - * @return List - * @throw - */ List eamFeedBackCheck(EamDefectFeedBackInData inData); - /** - * @Description TODO - * @Title cancelFeedBack - * @param - * @author rq - * @date 2023/3/29 10:59 - * @return void - * @throw - */ void cancelFeedBack(EamDefectFeedBackInData inData); - /** - * @Description TODO - * @Title updateFeedBack - * @param inData - * @author rq - * @date 2023/3/29 14:47 - * @return void - * @throw - */ void updateFeedBack(EamDefectFeedBackInData inData); - /** - * @Description 保存维修工单 - * @Title saveDefectOrder - * @param inData - * @author rq - * @date 2023/3/29 14:33 - * @return void - * @throw - */ void saveDefectOrder(EamDefectFeedBackInData inData); - /** - * @Description TODO - * @Title getItemLists - * @param inData - * @author rq - * @date 2023/3/29 16:27 - * @return List - * @throw - */ List getItemLists(EamPropertiesModelHeaderData inData); - /** - * @Description TODO - * @Title getModelItemLists - * @param inData - * @author rq - * @date 2023/3/29 16:27 - * @return List - * @throw - */ List getModelItemLists(EamPropertiesModelHeaderData inData); - /** - * @Description TODO - * @Title deleteObjectFile - * @param inData - * @author rq - * @date 2023/4/5 14:48 - * @return void - * @throw - */ void deleteObjectFile(SysOssEntity inData); List checkSparPartImage(EamWorkOrderInData inData); diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java index 9002f316..55cabc58 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java @@ -2232,6 +2232,7 @@ public class EamServiceImpl implements EamService { } @Override + @Transactional public void changeOrderOperator (List inList) { EamAdminData inData = new EamAdminData(); diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java index a2146d02..80098aca 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java @@ -58,11 +58,6 @@ import java.util.stream.Collectors; import static org.apache.coyote.http11.Constants.a; -/** - * @description: 质量管理业务层 - * @author: fengyuan_yang - * @date: 2023/3/20 17:06 - **/ @Service public class QcServiceImpl implements QcService { @@ -103,10 +98,6 @@ public class QcServiceImpl implements QcService { /** * @description: 条件查询检验方法 - * @author: fengyuan_yang - * @date: 2023/3/24 11:33 - * @param: [data] - * @return: java.util.List **/ @Override public PageUtils qcMethodSearch(QcMethodData data) { @@ -116,10 +107,6 @@ public class QcServiceImpl implements QcService { /** * @description: 新增检验方法 - * @author: fengyuan_yang - * @date: 2023/3/24 11:33 - * @param: [data] - * @return: com.xujie.sys.modules.pms.util.ResponseData **/ @Override public void qcMethodSave(QcMethodData data) { @@ -153,10 +140,6 @@ public class QcServiceImpl implements QcService { /** * @description: 修改检验方法 - * @author: fengyuan_yang - * @date: 2023/3/24 11:33 - * @param: [data] - * @return: com.xujie.sys.modules.pms.util.ResponseData **/ @Override public void qcMethodUpdate(QcMethodData data) { @@ -177,10 +160,6 @@ public class QcServiceImpl implements QcService { /** * @description: 删除检验方法 - * @author: fengyuan_yang - * @date: 2023/3/24 11:33 - * @param: [data] - * @return: com.xujie.sys.modules.pms.util.ResponseData **/ @Override public void qcMethodDelete(QcMethodData data) { @@ -197,10 +176,6 @@ public class QcServiceImpl implements QcService { /** * @description: 根据条件查询检验项目 - * @author: fengyuan_yang - * @date: 2023/3/20 17:07 - * @param: [data] - * @return: java.util.List **/ @Override public PageUtils qcItemSearch(QcItemData data) { @@ -210,10 +185,6 @@ public class QcServiceImpl implements QcService { /** * @description: 新增检验项目 - * @author: fengyuan_yang - * @date: 2023/3/20 21:46 - * @param: [data] - * @return: com.xujie.sys.modules.pms.util.ResponseData **/ @Override @Transactional @@ -262,10 +233,6 @@ public class QcServiceImpl implements QcService { /** * @description: 修改检验项目 - * @author: fengyuan_yang - * @date: 2023/3/20 22:27 - * @param: [data] - * @return: com.xujie.sys.modules.pms.util.ResponseData **/ @Override @Transactional @@ -301,10 +268,6 @@ public class QcServiceImpl implements QcService { /** * @description: 删除检验项目 - * @author: fengyuan_yang - * @date: 2023/3/20 23:12 - * @param: [data] - * @return: com.xujie.sys.modules.pms.util.ResponseData **/ @Override @Transactional @@ -322,10 +285,6 @@ public class QcServiceImpl implements QcService { /** * @description: 检验项目导入 - * @author: fengyuan_yang - * @date: 2023/4/15 12:58 - * @param: [file] - * @return: void **/ @Override @Transactional @@ -406,10 +365,6 @@ public class QcServiceImpl implements QcService { /** * @description: 查询质检员信息列表 - * @author: fengyuan_yang - * @date: 2023/3/31 10:47 - * @param: [data] - * @return: java.util.List **/ @Override public List inspectorSearch() { @@ -419,10 +374,6 @@ public class QcServiceImpl implements QcService { /** * @description: 新增质检员信息 - * @author: fengyuan_yang - * @date: 2023/3/31 10:47 - * @param: [data] - * @return: com.xujie.sys.modules.pms.util.ResponseData **/ @Override public ResponseData inspectorSave(QcInspectorData data) { @@ -442,10 +393,6 @@ public class QcServiceImpl implements QcService { /** * @description: 修改质检员信息 - * @author: fengyuan_yang - * @date: 2023/3/31 10:48 - * @param: [data] - * @return: com.xujie.sys.modules.pms.util.ResponseData **/ @Override public ResponseData inspectorUpdate(QcInspectorData data) { @@ -460,10 +407,6 @@ public class QcServiceImpl implements QcService { /** * @description: 删除质检员信息 - * @author: fengyuan_yang - * @date: 2023/3/31 10:48 - * @param: [data] - * @return: com.xujie.sys.modules.pms.util.ResponseData **/ @Override public ResponseData inspectorDelete(QcInspectorData data) { @@ -477,13 +420,8 @@ public class QcServiceImpl implements QcService { } // ======================= 抽样方案维护 ======================= - /** * @description: 查询抽检方案 - * @author: fengyuan_yang - * @date: 2023/4/7 16:16 - * @param: [data] - * @return: com.xujie.sys.common.utils.PageUtils **/ @Override public PageUtils samplingInspectionPlanSearch(QcSamplingInspectionPlanData data) { @@ -493,10 +431,6 @@ public class QcServiceImpl implements QcService { /** * @description: 新增抽样方案 - * @author: fengyuan_yang - * @date: 2023/4/10 9:49 - * @param: [data] - * @return: void **/ @Override public void samplingInspectionPlanSave(QcSamplingInspectionPlanData data) { @@ -529,10 +463,6 @@ public class QcServiceImpl implements QcService { /** * @description: 修改抽样方案 - * @author: fengyuan_yang - * @date: 2023/4/10 12:59 - * @param: [data] - * @return: void **/ @Override public void samplingInspectionPlanUpdate(QcSamplingInspectionPlanData data) { @@ -553,10 +483,6 @@ public class QcServiceImpl implements QcService { /** * @description: 删除抽样方案 - * @author: fengyuan_yang - * @date: 2023/4/10 13:03 - * @param: [data] - * @return: void **/ @Override public void samplingInspectionPlanDelete(QcSamplingInspectionPlanData data) { @@ -567,10 +493,6 @@ public class QcServiceImpl implements QcService { /** * @description: 查询模板 - * @author: fengyuan_yang - * @date: 2023/4/10 15:56 - * @param: [data] - * @return: com.xujie.sys.common.utils.PageUtils **/ @Override public PageUtils templateSearch(QcTemplateData data) { @@ -580,10 +502,6 @@ public class QcServiceImpl implements QcService { /** * @description: 新增模板 - * @author: fengyuan_yang - * @date: 2023/4/10 17:18 - * @param: [data] - * @return: void **/ @Override public void templateSave(QcTemplateData data) { @@ -617,10 +535,6 @@ public class QcServiceImpl implements QcService { /** * @description: 修改模板 - * @author: fengyuan_yang - * @date: 2023/4/10 17:38 - * @param: [data] - * @return: void **/ @Override public void templateUpdate(QcTemplateData data) { @@ -640,10 +554,6 @@ public class QcServiceImpl implements QcService { /** * @description: 模板中的项目清单 - * @author: fengyuan_yang - * @date: 2023/4/11 9:41 - * @param: [data] - * @return: java.util.List **/ @Override public List templateDetailsSearch(QcTemplateData data) { @@ -653,10 +563,6 @@ public class QcServiceImpl implements QcService { /** * @description: 新增项目的检验明细 - * @author: fengyuan_yang - * @date: 2023/4/11 10:11 - * @param: [data] - * @return: void **/ @Override public void addItemDetails(QcTemplateData data) { @@ -681,10 +587,6 @@ public class QcServiceImpl implements QcService { /** * @description: 删除项目的检验明细 - * @author: fengyuan_yang - * @date: 2023/4/11 10:59 - * @param: [inData] - * @return: void **/ @Override @Transactional @@ -706,10 +608,6 @@ public class QcServiceImpl implements QcService { /** * @description: 获取当前项目不包含的明细 - * @author: fengyuan_yang - * @date: 2023/4/12 13:57 - * @param: [data] - * @return: java.util.List **/ @Override public List getItemList(QcTemplateData data) { @@ -719,10 +617,6 @@ public class QcServiceImpl implements QcService { /** * @description: 查询项目 - * @author: fengyuan_yang - * @date: 2023/11/19 13:04 - * @param: [data] - * @return: java.util.List **/ @Override public List getItem(QcTemplateData data) { @@ -732,8 +626,6 @@ public class QcServiceImpl implements QcService { /** * 获取检验方法列表 - * @param data - * @return */ @Override public List queryMethodList(QcMethodData data) { @@ -750,10 +642,6 @@ public class QcServiceImpl implements QcService { /** * @description: 删除项目 - * @author: fengyuan_yang - * @date: 2023/4/12 15:26 - * @param: [data] - * @return: void **/ @Override @Transactional @@ -766,10 +654,6 @@ public class QcServiceImpl implements QcService { /** * @description: 新增项目明细的自定义最大最小值 - * @author: fengyuan_yang - * @date: 2023/4/16 17:26 - * @param: [data] - * @return: void **/ @Override @Transactional @@ -784,10 +668,6 @@ public class QcServiceImpl implements QcService { /** * @description: 检验模板导入 - * @author: fengyuan_yang - * @date: 16:32 - * @param: [file] - * @return: void **/ @Override @Transactional @@ -895,13 +775,8 @@ public class QcServiceImpl implements QcService { // ======================= 样本量维护 ======================= - /** * @description: 查询样本量 - * @author: fengyuan_yang - * @date: 2023/4/17 10:50 - * @param: [data] - * @return: void **/ @Override public PageUtils samplingQtySearch(QcSamplingInspectionQtyData data) { @@ -911,10 +786,6 @@ public class QcServiceImpl implements QcService { /** * @description: 新增样本量 - * @author: fengyuan_yang - * @date: 2023/4/17 11:25 - * @param: [data] - * @return: void **/ @Override public void samplingQtySave(QcSamplingInspectionQtyData data) { @@ -944,10 +815,6 @@ public class QcServiceImpl implements QcService { /** * @description: 修改样本量 - * @author: fengyuan_yang - * @date: 2023/4/17 13:01 - * @param: [data] - * @return: void **/ @Override public void samplingQtyUpdate(QcSamplingInspectionQtyData data) { @@ -970,10 +837,6 @@ public class QcServiceImpl implements QcService { /** * @description: 删除样本量 - * @author: fengyuan_yang - * @date: 2023/4/17 13:22 - * @param: [data] - * @return: void **/ @Override public void samplingQtyDelete(QcSamplingInspectionQtyData data) { @@ -990,10 +853,6 @@ public class QcServiceImpl implements QcService { /** * @description: 查询批量级次 - * @author: fengyuan_yang - * @date: 2023/4/17 13:40 - * @param: [data] - * @return: java.util.List **/ @Override public PageUtils samplingQtyRankSearch(QcSamplingInspectionQtyRankData data) { @@ -1003,10 +862,6 @@ public class QcServiceImpl implements QcService { /** * @description: 新增批量级次 - * @author: fengyuan_yang - * @date: 2023/4/17 14:01 - * @param: [data] - * @return: void **/ @Override public void samplingQtyRankSave(QcSamplingInspectionQtyRankData data) { @@ -1036,10 +891,6 @@ public class QcServiceImpl implements QcService { /** * @description: 修改批量级次 - * @author: fengyuan_yang - * @date: 2023/4/17 14:06 - * @param: [data] - * @return: void **/ @Override public void samplingQtyRankUpdate(QcSamplingInspectionQtyRankData data) { @@ -1062,10 +913,6 @@ public class QcServiceImpl implements QcService { /** * @description: 删除批量级次 - * @author: fengyuan_yang - * @date: 2023/4/17 14:06 - * @param: [data] - * @return: void **/ @Override public void samplingQtyRankDelete(QcSamplingInspectionQtyRankData data) { @@ -1081,10 +928,6 @@ public class QcServiceImpl implements QcService { /** * @description: 查询检验等级 - * @author: fengyuan_yang - * @date: 2023/4/17 15:05 - * @param: [data] - * @return: java.util.List **/ @Override public PageUtils samplingLevelSearch(QcSamplingInspectionLevelData data) { @@ -1094,10 +937,6 @@ public class QcServiceImpl implements QcService { /** * @description: 新增检验等级 - * @author: fengyuan_yang - * @date: 2023/4/17 15:07 - * @param: [data] - * @return: void **/ @Override public void samplingLevelSave(QcSamplingInspectionLevelData data) { @@ -1127,10 +966,6 @@ public class QcServiceImpl implements QcService { /** * @description: 修改检验等级 - * @author: fengyuan_yang - * @date: 2023/4/17 15:07 - * @param: [data] - * @return: void **/ @Override public void samplingLevelUpdate(QcSamplingInspectionLevelData data) { @@ -1153,10 +988,6 @@ public class QcServiceImpl implements QcService { /** * @description: 删除检验等级 - * @author: fengyuan_yang - * @date: 2023/4/17 15:07 - * @param: [data] - * @return: void **/ @Override public void samplingLevelDelete(QcSamplingInspectionLevelData data) { @@ -1170,10 +1001,6 @@ public class QcServiceImpl implements QcService { /** * @description: 搜索所有检验类型 - * @author: fengyuan_yang - * @date: 2023/4/18 17:17 - * @param: [] - * @return: java.util.List **/ @Override public List inspectionTypeSearch(QcInspectionTypeData data) { @@ -1183,10 +1010,6 @@ public class QcServiceImpl implements QcService { /** * @description: 搜索所有设备 - * @author: fengyuan_yang - * @date: 2023/4/19 14:41 - * @param: [] - * @return: java.util.List **/ @Override public List objectSearch(EamObjectData inData) { @@ -1201,10 +1024,6 @@ public class QcServiceImpl implements QcService { /** * @description: 查询物料属性 - * @author: fengyuan_yang - * @date: 2023/4/19 11:43 - * @param: [data] - * @return: com.xujie.sys.common.utils.PageUtils **/ @Override public PageUtils qcPartAttributeSearch(QcPartAttributeData data) { @@ -1214,10 +1033,6 @@ public class QcServiceImpl implements QcService { /** * @description: 新增物料属性 - * @author: fengyuan_yang - * @date: 2023/4/19 17:14 - * @param: [data] - * @return: void **/ @Override public void qcPartAttributeSave(QcPartAttributeData data) { @@ -1238,10 +1053,6 @@ public class QcServiceImpl implements QcService { /** * @description: 物料属性修改 - * @author: fengyuan_yang - * @date: 2023/10/27 13:26 - * @param: [data] - * @return: void **/ @Override public void qcPartAttributeEdit(QcPartAttributeData data) { @@ -1262,10 +1073,6 @@ public class QcServiceImpl implements QcService { /** * @description: 删除物料属性 - * @author: fengyuan_yang - * @date: 2023/4/20 16:45 - * @param: [data] - * @return: void **/ @Override @Transactional @@ -1278,10 +1085,6 @@ public class QcServiceImpl implements QcService { /** * @description: 查询物料模板 - * @author: fengyuan_yang - * @date: 2023/4/19 17:50 - * @param: [data] - * @return: void **/ @Override public List searchPartAttributeDetails(QcTemplateData data) { @@ -1291,10 +1094,6 @@ public class QcServiceImpl implements QcService { /** * @description: 新增物料属性模板 - * @author: fengyuan_yang - * @date: 2023/4/20 9:35 - * @param: [data] - * @return: void **/ @Override @Transactional @@ -1348,10 +1147,6 @@ public class QcServiceImpl implements QcService { /** * @description: 可选模板 - * @author: fengyuan_yang - * @date: 2023/4/20 11:21 - * @param: [data] - * @return: java.util.List **/ @Override public List getTemplateList(QcTemplateData data) { @@ -1361,10 +1156,6 @@ public class QcServiceImpl implements QcService { /** * @description: 已有模板 - * @author: fengyuan_yang - * @date: 2023/4/20 11:21 - * @param: [data] - * @return: java.util.List **/ @Override public List getPartTemplateList(QcTemplateData data) { @@ -1374,10 +1165,6 @@ public class QcServiceImpl implements QcService { /** * @description: 物料可选模板 - * @author: fengyuan_yang - * @date: 2023/4/20 11:21 - * @param: [data] - * @return: java.util.List **/ @Override public List getTemplateListAll(QcTemplateData data) { @@ -1387,10 +1174,6 @@ public class QcServiceImpl implements QcService { /** * @description: 删除物料属性模板 - * @author: fengyuan_yang - * @date: 2023/4/20 13:11 - * @param: [data] - * @return: void **/ @Override @Transactional @@ -1410,10 +1193,6 @@ public class QcServiceImpl implements QcService { /** * @description: 新增物料属性模板详情 - * @author: fengyuan_yang - * @date: 2023/4/20 15:32 - * @param: [data] - * @return: void **/ @Override @Transactional @@ -1425,10 +1204,6 @@ public class QcServiceImpl implements QcService { /** * @description: 物料属性导入 - * @author: fengyuan_yang - * @date: 2023/4/23 11:37 - * @param: [file] - * @return: void **/ @Override @Transactional @@ -1495,10 +1270,6 @@ public class QcServiceImpl implements QcService { /** * @description: 查询类别属性 - * @author: fengyuan_yang - * @date: 2023/4/21 9:10 - * @param: [data] - * @return: com.xujie.sys.common.utils.PageUtils **/ @Override public PageUtils qcFamilyAttributeSearch(QcPartAttributeData data) { @@ -1508,10 +1279,6 @@ public class QcServiceImpl implements QcService { /** * @description: 新增类别属性 - * @author: fengyuan_yang - * @date: 2023/4/21 9:30 - * @param: [data] - * @return: void **/ @Override public void qcFamilyAttributeSave(QcPartAttributeData data) { @@ -1527,10 +1294,6 @@ public class QcServiceImpl implements QcService { /** * @description: 删除类别属性 - * @author: fengyuan_yang - * @date: 2023/4/21 9:57 - * @param: [data] - * @return: void **/ @Override @Transactional @@ -1543,10 +1306,6 @@ public class QcServiceImpl implements QcService { /** * @description: 类别属性导入 - * @author: fengyuan_yang - * @date: 2023/4/23 15:59 - * @param: [file] - * @return: void **/ @Override @Transactional @@ -1611,10 +1370,6 @@ public class QcServiceImpl implements QcService { /** * @description: 查询抽样方案 - * @author: fengyuan_yang - * @date: 2023/4/21 13:34 - * @param: [data] - * @return: com.xujie.sys.common.utils.PageUtils **/ @Override public PageUtils samplingProgrammeSearch(QcSamplingInspectionProgrammeData data) { @@ -1624,10 +1379,6 @@ public class QcServiceImpl implements QcService { /** * @description: 新增抽样方案 - * @author: fengyuan_yang - * @date: 2023/4/21 13:47 - * @param: [data] - * @return: void **/ @Override public void samplingProgrammeSave(QcSamplingInspectionProgrammeData data) { @@ -1656,10 +1407,6 @@ public class QcServiceImpl implements QcService { /** * @description: 删除抽样方案 - * @author: fengyuan_yang - * @date: 2023/4/23 9:02 - * @param: [data] - * @return: void **/ @Override @Transactional @@ -1672,10 +1419,6 @@ public class QcServiceImpl implements QcService { /** * @description: 搜索抽样方案中的矩阵 - * @author: fengyuan_yang - * @date: 2023/4/21 15:53 - * @param: [data] - * @return: java.util.List **/ @Override public List searchSamplingProgrammeDetails(QcSamplingInspectionProgrammeData data) { @@ -1685,10 +1428,6 @@ public class QcServiceImpl implements QcService { /** * @description: 获取该方案不包含的矩阵 - * @author: fengyuan_yang - * @date: 2023/4/21 16:40 - * @param: [data] - * @return: java.util.List **/ @Override public List getPlanList(QcSamplingInspectionProgrammeData data) { @@ -1698,10 +1437,6 @@ public class QcServiceImpl implements QcService { /** * @description: 获取当前方案所包含的矩阵 - * @author: fengyuan_yang - * @date: 2023/4/21 16:40 - * @param: [data] - * @return: java.util.List **/ @Override public List getProgrammePlanList(QcSamplingInspectionProgrammeData data) { @@ -1711,10 +1446,6 @@ public class QcServiceImpl implements QcService { /** * @description: 新增抽样方案中的矩阵 - * @author: fengyuan_yang - * @date: 2023/4/21 17:42 - * @param: [data] - * @return: void **/ @Override @Transactional @@ -1736,10 +1467,6 @@ public class QcServiceImpl implements QcService { /** * @description: 删除抽样方案中的矩阵 - * @author: fengyuan_yang - * @date: 2023/4/21 17:53 - * @param: [data] - * @return: void **/ @Override @Transactional @@ -1765,10 +1492,6 @@ public class QcServiceImpl implements QcService { /** * @description: FAI检验记录查询 - * @author: fengyuan_yang - * @date: 2023/4/24 10:25 - * @param: [data] - * @return: com.xujie.sys.common.utils.PageUtils **/ @Override @Transactional @@ -1780,10 +1503,6 @@ public class QcServiceImpl implements QcService { /** * @description: 新增FAI检验 - * @author: fengyuan_yang - * @date: 2023/9/18 10:04 - * @param: [data] - * @return: void **/ @Override @Transactional @@ -2100,10 +1819,6 @@ public class QcServiceImpl implements QcService { /** * @description: FAI明细记录查询 - * @author: fengyuan_yang - * @date: 2023/4/25 9:17 - * @param: [data] - * @return: void **/ @Override public List faiDetailSearch(QcFAIRecordData data) { @@ -2113,10 +1828,6 @@ public class QcServiceImpl implements QcService { /** * @description: 保存检验记录 - * @author: fengyuan_yang - * @date: 2023/3/29 17:08 - * @param: [data] - * @return: void **/ @Override @Transactional @@ -2171,8 +1882,6 @@ public class QcServiceImpl implements QcService { /** * 发送邮件 - * @param data - * @param type */ public void sendMail(QcFAIRecordData data, String type) { // 获取数据库设置的邮件接收地址 @@ -2248,10 +1957,6 @@ public class QcServiceImpl implements QcService { /** * @description: 删除检验记录 - * @author: fengyuan_yang - * @date: 2023/3/30 9:04 - * @param: [data] - * @return: void **/ @Override @Transactional @@ -2284,10 +1989,6 @@ public class QcServiceImpl implements QcService { /** * @description: 审核 - * @author: fengyuan_yang - * @date: 2023/3/31 17:17 - * @param: [data] - * @return: void **/ @Override @Transactional @@ -2311,10 +2012,6 @@ public class QcServiceImpl implements QcService { /** * @description: 检查FAI是否已提交 - * @author: fengyuan_yang - * @date: 2023/4/5 9:51 - * @param: [data] - * @return: java.lang.Integer **/ @Override public Integer checkFAIIsSubmit(SubDetailValues data) { @@ -2328,10 +2025,6 @@ public class QcServiceImpl implements QcService { /** * @description: 新增FAI子明细信息 - * @author: fengyuan_yang - * @date: 2023/4/4 14:28 - * @param: [data] - * @return: void **/ @Override @Transactional @@ -2391,8 +2084,6 @@ public class QcServiceImpl implements QcService { /** * 正则表达式判断是否是数字字符串（可判断正数，负数和小数） - * @param str - * @return */ public boolean isNumberString(String str) { Pattern pattern = Pattern.compile("-?[0-9]+(\\.[0-9]+)?"); @@ -2402,10 +2093,6 @@ public class QcServiceImpl implements QcService { /** * @description: 查询FAI的子明细 - * @author: fengyuan_yang - * @date: 2023/4/4 16:08 - * @param: [data] - * @return: java.util.List **/ @Override public List selectFAISubDetailedRecord(SubDetailValues data) { @@ -2421,10 +2108,6 @@ public class QcServiceImpl implements QcService { /** * @description: 检查子明细中的实测值是否在规定范围 - * @author: fengyuan_yang - * @date: 2023/4/6 16:14 - * @param: [data] - * @return: java.lang.Integer **/ @Override public Integer checkFAISubDetailValue(CheckSubDetailValueVo data) { @@ -2442,10 +2125,6 @@ public class QcServiceImpl implements QcService { /** * @description: FQC记录查询 - * @author: fengyuan_yang - * @date: 2023/9/18 11:35 - * @param: [data] - * @return: com.xujie.sys.common.utils.PageUtils **/ @Override public PageUtils qcFQCInspectionSearch(QcFAIRecordData data) { @@ -2456,10 +2135,6 @@ public class QcServiceImpl implements QcService { /** * @description: FQC记录新增 - * @author: fengyuan_yang - * @date: 2023/9/18 11:35 - * @param: [data] - * @return: void **/ @Override @Transactional @@ -2775,10 +2450,6 @@ public class QcServiceImpl implements QcService { /** * @description: FQC明细记录查询 - * @author: fengyuan_yang - * @date: 2023/9/18 13:05 - * @param: [data] - * @return: java.util.List **/ @Override public List fqcDetailSearch(QcFAIRecordData data) { @@ -2788,10 +2459,6 @@ public class QcServiceImpl implements QcService { /** * @description: 删除FQC检验记录 - * @author: fengyuan_yang - * @date: 2023/9/18 13:08 - * @param: [data] - * @return: void **/ @Override @Transactional @@ -2822,10 +2489,6 @@ public class QcServiceImpl implements QcService { /** * @description: 保存FQC检验记录 - * @author: fengyuan_yang - * @date: 2023/9/18 13:13 - * @param: [data] - * @return: void **/ @Override @Transactional @@ -2880,10 +2543,6 @@ public class QcServiceImpl implements QcService { /** * @description: FQC审核 - * @author: fengyuan_yang - * @date: 2023/9/18 13:21 - * @param: [data] - * @return: void **/ @Override @Transactional @@ -2907,10 +2566,6 @@ public class QcServiceImpl implements QcService { /** * @description: 新增FQC子明细 - * @author: fengyuan_yang - * @date: 2023/9/18 13:26 - * @param: [data] - * @return: void **/ @Override @Transactional @@ -2969,10 +2624,6 @@ public class QcServiceImpl implements QcService { /** * @description: 查询FQC子明细 - * @author: fengyuan_yang - * @date: 2023/9/18 13:29 - * @param: [data] - * @return: java.util.List **/ @Override public List selectFQCSubDetailedRecord(SubDetailValues data) { @@ -2988,10 +2639,6 @@ public class QcServiceImpl implements QcService { /** * @description: 检查是否已提交 - * @author: fengyuan_yang - * @date: 2023/9/18 13:31 - * @param: [data] - * @return: java.lang.Integer **/ @Override public Integer checkFQCIsSubmit(SubDetailValues data) { @@ -3005,10 +2652,6 @@ public class QcServiceImpl implements QcService { /** * @description: 检查FQC子明细中的实测值是否在规定范围 - * @author: fengyuan_yang - * @date: 2023/9/18 13:36 - * @param: [data] - * @return: java.lang.Integer **/ @Override public Integer checkFQCSubDetailValue(CheckSubDetailValueVo data) { @@ -3024,13 +2667,8 @@ public class QcServiceImpl implements QcService { // ======================= IPQC检验维护 ======================= - /** * @description: IPQC检验记录查询 - * @author: fengyuan_yang - * @date: 2023/4/26 16:01 - * @param: [data] - * @return: com.xujie.sys.common.utils.PageUtils **/ @Override @Transactional @@ -3042,10 +2680,6 @@ public class QcServiceImpl implements QcService { /** * @description: 检查动控是否开启 - * @author: fengyuan_yang - * @date: 2023/10/18 13:23 - * @param: [data] - * @return: com.xujie.sys.modules.sys.entity.SysSceneDynamicControlModelEntity **/ @Override public List queryController(SysSceneDynamicControlModelEntity data) { @@ -3055,10 +2689,6 @@ public class QcServiceImpl implements QcService { /** * @description: 获取检验模板列表 - * @author: fengyuan_yang - * @date: 2023/10/18 13:51 - * @param: [data] - * @return: java.util.List **/ @Override public List queryTemplateList(QcTemplateData data) { @@ -3075,10 +2705,6 @@ public class QcServiceImpl implements QcService { /** * @description: 新增IPQC记录 - * @author: fengyuan_yang - * @date: 2023/4/28 8:56 - * @param: [data] - * @return: void **/ @Override @Transactional @@ -3408,10 +3034,6 @@ public class QcServiceImpl implements QcService { /** * @description: IPQC明细记录查询 - * @author: fengyuan_yang - * @date: 2023/4/26 17:03 - * @param: [data] - * @return: java.util.List **/ @Override public List ipqcDetailSearch(QcFAIRecordData data) { @@ -3421,10 +3043,6 @@ public class QcServiceImpl implements QcService { /** * @description: 删除IPQC检验记录 - * @author: fengyuan_yang - * @date: 2023/4/26 17:10 - * @param: [data] - * @return: void **/ @Override @Transactional @@ -3455,10 +3073,6 @@ public class QcServiceImpl implements QcService { /** * @description: 保存IPQC检验记录 - * @author: fengyuan_yang - * @date: 2023/4/26 17:28 - * @param: [data] - * @return: void **/ @Override @Transactional @@ -3513,10 +3127,6 @@ public class QcServiceImpl implements QcService { /** * @description: IPQC审核 - * @author: fengyuan_yang - * @date: 2023/4/26 17:37 - * @param: [data] - * @return: void **/ @Override @Transactional @@ -3540,10 +3150,6 @@ public class QcServiceImpl implements QcService { /** * @description: 新增IPQC子明细信息 - * @author: fengyuan_yang - * @date: 2023/4/26 17:47 - * @param: [data] - * @return: void **/ @Override @Transactional @@ -3603,10 +3209,6 @@ public class QcServiceImpl implements QcService { /** * @description: 查询IPQC子明细 - * @author: fengyuan_yang - * @date: 2023/4/26 17:58 - * @param: [data] - * @return: java.util.List **/ @Override public List selectIPQCSubDetailedRecord(SubDetailValues data) { @@ -3622,10 +3224,6 @@ public class QcServiceImpl implements QcService { /** * @description: 检查IPQC是否已提交 - * @author: fengyuan_yang - * @date: 2023/4/27 9:01 - * @param: [data] - * @return: java.lang.Integer **/ @Override public Integer checkIPQCIsSubmit(SubDetailValues data) { @@ -3639,10 +3237,6 @@ public class QcServiceImpl implements QcService { /** * @description: 检查IPQC子明细中的实测值是否在规定范围 - * @author: fengyuan_yang - * @date: 2023/4/27 9:08 - * @param: [data] - * @return: java.lang.Integer **/ @Override public Integer checkIPQCSubDetailValue(CheckSubDetailValueVo data) { @@ -3658,10 +3252,6 @@ public class QcServiceImpl implements QcService { /** * @description: 查询工序列表 - * @author: fengyuan_yang - * @date: 2023/4/27 15:31 - * @param: [data] - * @return: java.util.List **/ @Override public List getOperationList(QcFAIRecordData data) { @@ -3684,51 +3274,28 @@ public class QcServiceImpl implements QcService { /** * @description: 查询机台列表 - * @author: fengyuan_yang - * @date: 2023/4/27 17:02 - * @param: [data] - * @return: java.util.List **/ @Override public List getResourceList(QcFAIRecordData data) { // 根据工单号和工序号查出所有数据 List list = qcMapper.getResourceList(data); -// // 去重 -// List collect = list.stream().collect( -// Collectors.collectingAndThen( -// Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(QcFAIRecordData::getResourceId))), ArrayList::new -// )); return list; } /** * @description: 查询物料列表 - * @author: fengyuan_yang - * @date: 2023/4/27 17:36 - * @param: [data] - * @return: java.util.List **/ @Override public List getPartList(QcFAIRecordData data) { // 根据工单号查出所有数据 List list = qcMapper.getOperationList(data); -// // 去重 -// List collect = list.stream().collect( -// Collectors.collectingAndThen( -// Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(QcFAIRecordData::getPartNo))), ArrayList::new -// )); return list; } - // ======================= IQC检验维护 ======================= /** * @description: IQC检验记录查询 - * @author: fengyuan_yang - * @date: 2023/4/29 13:39 - * @param: [data] - * @return: com.xujie.sys.common.utils.PageUtils **/ @Override @Transactional @@ -3740,7 +3307,6 @@ public class QcServiceImpl implements QcService { /** * 任务重载 - * @param data */ @Override @Transactional @@ -3964,10 +3530,6 @@ public class QcServiceImpl implements QcService { /** * @description: iqc检验记录查询 - * @author: fengyuan_yang - * @date: 2023/5/4 11:47 - * @param: [data] - * @return: java.util.List **/ @Override public List iqcDetailSearch(QcFAIRecordData data) { @@ -3977,10 +3539,6 @@ public class QcServiceImpl implements QcService { /** * @description: 查询IQC子明细记录 - * @author: fengyuan_yang - * @date: 2023/5/4 13:11 - * @param: [data] - * @return: java.util.List **/ @Override public List selectIQCSubDetailedRecord(SubDetailValues data) { @@ -3996,10 +3554,6 @@ public class QcServiceImpl implements QcService { /** * @description: 检查子明细中的实测值是否在规定范围 - * @author: fengyuan_yang - * @date: 2023/5/4 13:18 - * @param: [data] - * @return: java.lang.Integer **/ @Override public Integer checkIQCSubDetailValue(CheckSubDetailValueVo data) { @@ -4015,10 +3569,6 @@ public class QcServiceImpl implements QcService { /** * @description: 新增明细信息 - * @author: fengyuan_yang - * @date: 2023/5/4 13:27 - * @param: [data] - * @return: void **/ @Override @Transactional @@ -4071,14 +3621,8 @@ public class QcServiceImpl implements QcService { // } } - - /** * @description: 检查是否已提交 - * @author: fengyuan_yang - * @date: 2023/5/4 14:00 - * @param: [data] - * @return: java.lang.Integer **/ @Override public Integer checkIQCIsSubmit(SubDetailValues data) { @@ -4092,10 +3636,6 @@ public class QcServiceImpl implements QcService { /** * @description: 新增子明细信息 - * @author: fengyuan_yang - * @date: 2023/5/4 15:55 - * @param: [data] - * @return: void **/ @Override @Transactional @@ -4155,10 +3695,6 @@ public class QcServiceImpl implements QcService { /** * @description: 审核 - * @author: fengyuan_yang - * @date: 2023/5/4 17:32 - * @param: [data] - * @return: void **/ @Override @Transactional @@ -4439,13 +3975,6 @@ public class QcServiceImpl implements QcService { } - /** - * @description: - * @author: fengyuan_yang - * @date: 2023/5/4 17:39 - * @param: [data] - * @return: void - **/ @Override @Transactional public void iqcRecordDelete(QcFAIRecordData data) { @@ -4475,10 +4004,6 @@ public class QcServiceImpl implements QcService { /** * @description: 查询文件ID - * @author: fengyuan_yang - * @date: 2023/7/5 9:20 - * @param: [data] - * @return: com.xujie.sys.modules.oss.entity.SysOssEntity **/ @Override public SysOssEntity queryFileId(SysOssEntity data) { @@ -4491,10 +4016,6 @@ public class QcServiceImpl implements QcService { /** * @description: 获取工序列表 - * @author: fengyuan_yang - * @date: 2023/7/7 15:40 - * @param: [data] - * @return: java.util.List **/ @Override public List getOperationDescList(QcPartAttributeData data) { @@ -4504,10 +4025,6 @@ public class QcServiceImpl implements QcService { /** * @description: 获取供应商列表 - * @author: fengyuan_yang - * @date: 2023/7/9 22:34 - * @param: [data] - * @return: java.util.List **/ @Override public List getManufacturerList(QcPartAttributeData data) { @@ -4517,10 +4034,6 @@ public class QcServiceImpl implements QcService { /** * @description: 获取所有机台 - * @author: fengyuan_yang - * @date: 2023/9/15 11:37 - * @param: [data] - * @return: java.util.List **/ @Override public List getAllResourceList(QcFAIRecordData data) { @@ -4530,29 +4043,15 @@ public class QcServiceImpl implements QcService { /** * @description: 获取工单列表 - * @author: fengyuan_yang - * @date: 2023/9/15 16:14 - * @param: [data] - * @return: java.util.List **/ @Override public List getOrderNoList(QcFAIRecordData data) { List resultList = this.qcMapper.getOrderNoList(data); -// // 去重 -// List collect = resultList.getRecords().stream().collect( -// Collectors.collectingAndThen( -// Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(QcFAIRecordData::getOrderNo))), ArrayList::new -// )); -// resultList.setRecords(collect); return resultList; } /** * @description: 获取物料其它信息 - * @author: fengyuan_yang - * @date: 2023/10/20 15:19 - * @param: [data] - * @return: java.util.List **/ @Override public List getPartInformation(QcFAIRecordData data) { @@ -4562,10 +4061,6 @@ public class QcServiceImpl implements QcService { /** * @description: 获取特殊工序列表 - * @author: fengyuan_yang - * @date: 2023/10/20 15:31 - * @param: [data] - * @return: java.util.List **/ @Override public List getSpecialOperationList(QcFAIRecordData data) { @@ -4582,10 +4077,6 @@ public class QcServiceImpl implements QcService { /** * @description: 获取处置措施列表 - * @author: fengyuan_yang - * @date: 2023/10/23 13:15 - * @param: [] - * @return: java.util.List **/ @Override public List disposalMeasuresSearch(QcFAIRecordData data) { @@ -4595,10 +4086,6 @@ public class QcServiceImpl implements QcService { /** * @description: 查询文件路径 - * @author: fengyuan_yang - * @date: 2023/11/1 16:50 - * @param: [data] - * @return: java.util.List **/ @Override public List searchItemFileUrl(QcFAIRecordData data) { @@ -4613,10 +4100,6 @@ public class QcServiceImpl implements QcService { /** * @description: 删除图片 - * @author: fengyuan_yang - * @date: 2023/11/1 16:53 - * @param: [data] - * @return: void **/ @Override public void imageDelete(SysOssEntity data) { @@ -4625,10 +4108,6 @@ public class QcServiceImpl implements QcService { /** * @description: 模糊查询标签号 - * @author: fengyuan_yang - * @date: 2023/11/3 16:50 - * @param: [data] - * @return: java.util.List **/ @Override public List getRollNo(QcFAIRecordData data) { @@ -4638,10 +4117,6 @@ public class QcServiceImpl implements QcService { /** * @description: 标签号回车事件 - * @author: fengyuan_yang - * @date: 2023/11/7 10:24 - * @param: [data] - * @return: java.util.List **/ @Override public List rollNoEnter(QcFAIRecordData data) { @@ -4661,10 +4136,6 @@ public class QcServiceImpl implements QcService { /** * @description: 查询物料集合 - * @author: fengyuan_yang - * @date: 2023/11/7 14:48 - * @param: [data] - * @return: java.util.List **/ @Override public List queryPartList(QcFAIRecordData data) { @@ -4681,10 +4152,6 @@ public class QcServiceImpl implements QcService { /** * @description: 查询单位列表 - * @author: fengyuan_yang - * @date: 2023/11/8 9:28 - * @param: [data] - * @return: java.util.List **/ @Override public List umSearch(QcFAIRecordData data) { diff --git a/src/main/resources/mapper/part/BomSearch3Mapper.xml b/src/main/resources/mapper/part/BomSearch3Mapper.xml index f3573eb8..d18439aa 100644 --- a/src/main/resources/mapper/part/BomSearch3Mapper.xml +++ b/src/main/resources/mapper/part/BomSearch3Mapper.xml @@ -363,7 +363,8 @@ prh.part_no, prh.routing_revision, prh.routing_type, - p.part_desc + p.part_desc, + prh.note_text from plm_routing_header prh left join part p on prh.part_no = p.part_no and prh.site = p.site where prh.site = #{site} and prh.bu_no = #{buNo} and prh.part_no = #{partNo} @@ -395,7 +396,8 @@ bom.part_no, bom.eng_chg_level, bom.bom_type, - p.part_desc + p.part_desc, + bom.note_text from plm_bom_header bom left join part p on bom.part_no = p.part_no and bom.site = p.site where bom.site = #{site} and bom.part_no = #{partNo} diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml index b145c0ea..b814c99f 100644 --- a/src/main/resources/mapper/pms/EamMapper.xml +++ b/src/main/resources/mapper/pms/EamMapper.xml @@ -1389,19 +1389,25 @@ update eam_workOrder - set Status = '已取消' + set Status = '已取消', + cancel_date = getDate(), + cancel_by = #{userId} where site = #{site} and orderNo = #{orderNo} and FunctionType = #{functionType} and bu_no = #{buNo} update eam_workOrder - set Status = '已取消' + set Status = '已取消', + cancel_date = getDate(), + cancel_by = #{userId} where site = #{site} and PlanID = #{planID} and FunctionType = #{functionType} and ObjectID = #{objectID} and Status = #{status} and bu_no = #{buNo} update eam_workPlan - set Status = '已取消' + set Status = '已取消', + cancel_date = getDate(), + cancel_by = #{userId} where site = #{site} and PlanID = #{planID} and FunctionType = #{functionType} and ObjectID = #{objectID} and bu_no = #{buNo} @@ -1421,24 +1427,29 @@ where site = #{site} and PlanID = #{planID} and deleteFlag = 'N' and bu_no = #{buNo} - update eam_workPlan_overview set status = '已取消', - next_work_date = null + next_work_date = null, + cancel_date = getDate(), + cancel_by = #{userId} where site = #{site} and plan_id = #{planID} and delete_flag = 'N' and bu_no = #{buNo} update eam_workPlan set Status = '已取消', - NextWorkDate = null + NextWorkDate = null, + cancel_date = getDate(), + cancel_by = #{userId} where Site = #{site} and PlanID = #{planID} and deleteFlag = 'N' and bu_no = #{buNo} update eam_workOrder - set Status = '已取消' + set Status = '已取消', + cancel_date = getDate(), + cancel_by = #{userId} where site = #{site} and PlanID = #{planID} and status = '未开工' and bu_no = #{buNo} @@ -1755,7 +1766,7 @@ delete from sys_oss where id = #{id} - SELECT id, url, @@ -1772,7 +1783,7 @@ - SELECT ea.AdminID, ea.AdminName, @@ -1800,7 +1811,7 @@ - SELECT a.user_id, a.username as adminID, @@ -1833,20 +1844,20 @@ - + UPDATE eam_workOrder SET Status = '已完工' WHERE Site = #{site} AND OrderNo = #{orderNo} and bu_no = #{buNo} - + UPDATE eam_workOrder SET Status = '待审核' WHERE Site = #{site} AND OrderNo = #{orderNo} and bu_no = #{buNo} - SELECT OrderNo FROM eam_workOrder @@ -1854,14 +1865,14 @@ - + UPDATE eam_workPlan_overview SET status = '已结束' WHERE site = #{site} AND plan_id = #{planID} and bu_no = #{buNo} - + INSERT INTO eam_workPlan_overview (site, plan_id, plan_desc, status, plan_start_date, plan_end_date, created_date, created_by, update_date, update_by, remark, delete_flag, operator, operator_name, checker, checker_name, function_type, properties_code, plan_period, @@ -1873,7 +1884,7 @@ - SELECT Right('0000000000'+ convert(VARCHAR(10), isnull(max(convert(INT,SUBSTRING(PlanID,3,10))),0)+1),8) FROM eam_workPlan @@ -1881,7 +1892,7 @@ - SELECT ewp.PlanID, ewp.PlanDesc, @@ -1908,7 +1919,7 @@ - + DELETE FROM eam_workPlan WHERE Site = #{site} AND PlanID = #{planID} @@ -1916,7 +1927,7 @@ - SELECT a.ObjectID, a.ObjectDesc, @@ -1932,7 +1943,7 @@ - SELECT a.ObjectID, b.ObjectDesc, @@ -1948,14 +1959,14 @@ - + INSERT INTO eam_workPlan (Site,PlanID,PlanDesc,ObjectID,FunctionType,PropertiesCode,Operator,OperatorName,checker,checkerName,PlanPeriod,Status,PlanStartDate,PlanEndDate,CreatedDate,CreatedBy,Version,Remark,DeleteFlag) values (#{site},#{planID},#{planDesc},#{objectID},#{functionType},#{propertiesCode},#{operator},#{operatorName},#{checker},#{checkerName},#{planPeriod},#{status},#{planStartDate},#{planEndDate},GetDate(),#{createdBy},0,#{remark},'N') - + UPDATE eam_workPlan_overview SET plan_desc = #{planDesc}, properties_code = #{propertiesCode}, @@ -1976,13 +1987,13 @@ - + DELETE FROM eam_workPlan WHERE Site = #{site} AND PlanID = #{planID} and bu_no = #{buNo} - + DELETE FROM eam_workPlan_item WHERE Site = #{site} AND PlanID = #{planID} and bu_no = #{buNo} @@ -1996,7 +2007,7 @@ - SELECT DISTINCT a.ObjectID, b.ObjectDesc @@ -2006,7 +2017,7 @@ - + UPDATE eam_workPlan_overview SET status = '进行中', next_work_date = plan_start_date @@ -2014,7 +2025,7 @@ - SELECT id, url, @@ -2034,7 +2045,7 @@ - + INSERT INTO eam_actual_operator (site, order_no, function_type, operator, bu_no) VALUES (#{site}, #{orderNo}, #{functionType}, #{operator}, #{buNo}) @@ -2043,7 +2054,7 @@ - SELECT ea.AdminID, ea.AdminName @@ -2054,7 +2065,7 @@ - SELECT ea.username as adminID, ea.user_display as AdminName @@ -2102,7 +2113,7 @@ - + INSERT INTO eam_workOrder (Site, bu_no, OrderNo, PlanID, PropertiesCode, ObjectID, Status, PlanDate, FunctionType, CreateDate, CreateBy, check_work_plan_id, check_item_no, document_source, repair_reporting_type, repair_type, PlanOperator) VALUES @@ -2110,7 +2121,7 @@ - select PlanOperator, PlanOperatorName, @@ -2120,14 +2131,14 @@ - + INSERT INTO eam_workOrder (Site, bu_no, OrderNo, PlanID, PlanDesc, PropertiesCode, ObjectID, Status, PlanOperator, PlanDate, FunctionType, CreateDate, CreateBy, checker, PlanOperatorName, checkerName) VALUES (#{site}, #{buNo}, #{orderNo}, #{planID}, #{planDesc}, #{propertiesCode}, #{objectID}, '未开工', #{planOperator}, Dateadd(dd, Datediff(dd,0,Getdate()), 0), #{functionType}, getDate(), #{createBy}, #{checker}, #{planOperatorName}, #{checkerName}) - SELECT AdminName FROM eam_admin WHERE site = #{site} diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml index 164d6bdc..03a03ba3 100644 --- a/src/main/resources/mapper/pms/QcMapper.xml +++ b/src/main/resources/mapper/pms/QcMapper.xml @@ -3041,7 +3041,7 @@ - SELECT type, base_data, @@ -3080,7 +3080,7 @@ - select part_no, part_desc, @@ -3093,7 +3093,7 @@ - select site, operation_no, @@ -3103,7 +3103,7 @@ - SELECT id, disposal_measures @@ -3116,7 +3116,7 @@ - SELECT id, url,