2024-09-19

RFQ 功能优化

src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java

@@ -1164,10 +1164,6 @@ public interface EamMapper {
 
     String getOrderNo(EamWorkOrderInData feedBackData);
 
-    void saveDefectRecordCount(EamDefectFeedBackData feedBackData);
-
-    void saveDefectRecordCount2(EamWorkOrderInData inData);
-
     List<EamObjectAdminData> queryDepartmentByObjectId(EamDefectFeedBackData inData);
 
     List<EamObjectAdminData> queryPhoneByDepartmentId(EamObjectAdminData data);
@@ -1238,4 +1234,6 @@ public interface EamMapper {
     List<EamDefectFeedBackInData> getFeedBackInfo(EamDefectFeedBackInData feedBackData);
 
     List<EamObjectData> getObjectInfo(@Param("site") String site, @Param("buNo") String buNo, @Param("objectID") String objectID);
+
+    String getResourceByObject(@Param("site") String site, @Param("objectID") String objectID);
 }

src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java

@@ -1943,8 +1943,19 @@ public class EamServiceImpl implements EamService {
                     feedBackData.setOrderNo(orderNo);
                     // 创建维修工单
                     eamMapper.saveWorkOrder(feedBackData);
-                    // 创建count表
-                    eamMapper.saveDefectRecordCount(feedBackData);
+                    // 根据设备查机台
+                    String resourceId = eamMapper.getResourceByObject(feedBackData.getSite(), feedBackData.getObjectID());
+                    // 将记录新增到 redis
+                    // 检查是否已创建 key
+                    String key = feedBackData.getSite() + "_" + resourceId;
+                    Integer val = (Integer) redisTemplate.opsForValue().get(key);
+                    if (val == null) {
+                        // 如果 key 不存在，则新建 key 并设置 value 为 1
+                        redisTemplate.opsForValue().set(key, 1);
+                    } else {
+                        // 如果 key 已经存在，则获取当前 value 并加 1
+                        redisTemplate.opsForValue().set(key, val + 1);
+                    }
                 }
                 // 根据设备查所属部门
                 List<EamObjectAdminData> deptData = eamMapper.queryDepartmentByObjectId(feedBackData);
@@ -2105,8 +2116,20 @@ public class EamServiceImpl implements EamService {
             inData.setDocumentSource("维修失败");
             // 创建工单
             eamMapper.saveDefectWorkOrder(inData);
-            // 创建count表
-            eamMapper.saveDefectRecordCount2(inData);
+            // 根据设备查机台
+            String resourceId = eamMapper.getResourceByObject(inData.getSite(), inData.getObjectID());
+            // 将记录新增到 redis
+            // 检查是否已创建 key
+            String key = inData.getSite() + "_" + resourceId;
+            Integer val = (Integer) redisTemplate.opsForValue().get(key);
+            if (val == null) {
+                // 如果 key 不存在，则新建 key 并设置 value 为 1
+                redisTemplate.opsForValue().set(key, 1);
+            } else {
+                // 如果 key 已经存在，则获取当前 value 并加 1
+                redisTemplate.opsForValue().set(key, val + 1);
+            }
+
             // 保存故障信息
             EamDefectFeedBackData feedBackData = new EamDefectFeedBackData();
             feedBackData.setSite(inData.getSite());
@@ -2921,8 +2944,19 @@ public class EamServiceImpl implements EamService {
             inData.setDocumentSource("设备维修");
             // 创建维修工单
             eamMapper.saveWorkOrder(inData);
-            // 创建count表
-            eamMapper.saveDefectRecordCount(inData);
+            // 根据设备查机台
+            String resourceId = eamMapper.getResourceByObject(inData.getSite(), inData.getObjectID());
+            // 将记录新增到 redis
+            // 检查是否已创建 key
+            String key = inData.getSite() + "_" + resourceId;
+            Integer val = (Integer) redisTemplate.opsForValue().get(key);
+            if (val == null) {
+                // 如果 key 不存在，则新建 key 并设置 value 为 1
+                redisTemplate.opsForValue().set(key, 1);
+            } else {
+                // 如果 key 已经存在，则获取当前 value 并加 1
+                redisTemplate.opsForValue().set(key, val + 1);
+            }
         }
         // 根据设备查所属部门
         List<EamObjectAdminData> deptData = eamMapper.queryDepartmentByObjectId(inData);

src/main/resources/mapper/part/PartInformationMapper.xml

@@ -161,11 +161,11 @@
     <!-- 获取属性可选值 -->
     <select id="getAvailableValueList" resultType="PlmPropertiesItemAvailableData">
         select
-            item_no,
-            value_no,
-            available_value
+            itemNo,
+            valueNo,
+            availableValue
         from plm_properties_item_available
-        where item_no = #{propertiesItemNo} and site = #{site} and item_type = #{recordType}
+        where itemNo = #{propertiesItemNo} and site = #{site} and itemType = #{recordType}
     </select>
 
     <!-- 编辑属性值 -->

src/main/resources/mapper/pms/EamMapper.xml

@@ -1861,13 +1861,6 @@
         VALUES (#{site}, #{buNo}, #{orderNo}, #{planID}, '', #{objectID}, '未开工', getDate(), 'C', getDate(), #{createBy}, #{checkWorkPlanId}, #{checkItemNo}, #{documentSource})
     </insert>
 
-    <!-- 创建count表 -->
-    <insert id="saveDefectRecordCount2" parameterType="EamWorkOrderInData">
-        INSERT INTO eam_workOrder_count
-        (Site, bu_no, OrderNo, PlanID, PropertiesCode, ObjectID, Status, PlanDate, FunctionType, CreateDate, CreateBy, check_work_plan_id, check_item_no)
-        VALUES (#{site}, #{buNo}, #{orderNo}, #{planID}, '', #{objectID}, '未开工', getDate(), 'C', getDate(), #{createBy}, #{checkWorkPlanId}, #{checkItemNo})
-    </insert>
-
     <!-- 获取旧工单的基础信息 -->
     <select id="queryOldWorkOrderMessage" resultType="EamWorkOrderInData" parameterType="EamWorkOrderInData">
         select
@@ -2256,13 +2249,6 @@
         VALUES (#{site}, #{buNo}, #{orderNo}, #{feedBackID}, '', #{objectID}, '未开工', getDate(), 'C', getDate(), #{createdBy}, #{feedBackDesc}, #{documentSource})
     </insert>
 
-    <!-- 创建维修count表数据 -->
-    <insert id="saveDefectRecordCount" parameterType="EamDefectFeedBackData">
-        INSERT INTO eam_workOrder_count
-        (Site, bu_no, OrderNo, PlanID, PropertiesCode, ObjectID, Status, PlanDate, FunctionType, CreateDate, CreateBy, PlanDesc)
-        VALUES (#{site}, #{buNo}, #{orderNo}, #{feedBackID}, '', #{objectID}, '未开工', getDate(), 'C', getDate(), #{createdBy}, #{feedBackDesc})
-    </insert>
-
     <!-- 修改工单 -->
     <update id="updateWorkOrder" parameterType="EamWorkOrderInData">
         update eam_workOrder
@@ -3092,4 +3078,11 @@
         from eam_object
         where Site = #{site} and bu_no = #{buNo} and ObjectID = #{objectID}
     </select>
+
+    <select id="getResourceByObject" resultType="string">
+        select
+            ObjectID
+        from eam_object
+        where Site = #{site} and ObjectID = #{objectID}
+    </select>
 </mapper>