2024-07-16 设备-点检、巡检、保养任务组线展示PC端

op-modules/op-device/src/main/java/com/op/device/controller/EquOrderController.java

@@ -39,7 +39,7 @@ public class EquOrderController extends BaseController {
      */
     @RequiresPermissions("device:deviceOrder:list")
     @GetMapping("/list")
-    @Log(title = "保养记录", businessType = BusinessType.QUERY)
+    @Log(title = "查询工单", businessType = BusinessType.QUERY)
     public TableDataInfo list(EquOrder equOrder) {
         startPage();
         List<EquOrder> list = equOrderService.selectEquOrderList(equOrder);
@@ -50,7 +50,7 @@ public class EquOrderController extends BaseController {
      * 导出计划工单列表
      */
     @RequiresPermissions("device:deviceOrder:export")
-    @Log(title = "点检记录", businessType = BusinessType.EXPORT)
+    @Log(title = "计划工单", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, EquOrder equOrder) {
         List<EquOrder> list = equOrderService.selectEquOrderList(equOrder);

op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java

@@ -187,4 +187,7 @@ public interface EquOrderMapper {
      * @param equ
      */
     void updateEquipmentStatus(Equipment equ);
+
+    //获取组线信息
+    String getGroupLine(String auxiliaryEquipmentCode);
 }

op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java

@@ -339,6 +339,11 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
         if ("1".equals(plan.getUpkeep())) {//1委外工单
             order.setOutsourceCode("BW" + orderCode);
         }
+
+        //查询组线
+        String lineName = equOrderMapper.getGroupLine(plan.getEquipmentCode());
+        order.setPlanProdLine(lineName);
+
         /**equ_order**/
         sce = equOrderMapper.insertEquOrder(order);
         System.out.println(plan.getPlanCode() + "========equ_order:" + sce);

op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml

@@ -47,7 +47,6 @@
         <result property="itemType" column="item_type"/>
         <result property="itemTypeName" column="item_type_name"/>
         <result property="itemTools" column="item_tools"/>
-
         <result property="outsourceCode" column="outsource_code"/>
         <result property="equipmentName" column="equipment_name"/>
     </resultMap>
@@ -110,7 +109,7 @@
             <if test="planType != null  and planType != ''">and eo.plan_type = #{planType}</if>
             <if test="orderCode != null  and orderCode != ''">and eo.order_code like concat('%', #{orderCode}, '%')</if>
             <if test="planWorkshop != null  and planWorkshop != ''">and eo.plan_workshop = #{planWorkshop}</if>
-            <if test="planProdLine != null  and planProdLine != ''">and eo.plan_prod_line = #{planProdLine}</if>
+            <if test="planProdLine != null  and planProdLine != ''">and eo.plan_prod_line like concat('%', #{planProdLine}, '%')</if>
             <if test="planLoop != null  and planLoop != ''">and eo.plan_loop = #{planLoop}</if>
             <if test="planLoopType != null  and planLoopType != ''">and eo.plan_loop_type = #{planLoopType}</if>
             <if test="equipmentCode != null  and equipmentCode != ''">and eo.equipment_code like concat('%',#{equipmentCode}, '%')</if>
@@ -517,5 +516,12 @@
 		and del_flag = '0'
 	</update>
 
+    <!--  获取组线信息 -->
+    <select id="getGroupLine" parameterType="java.lang.String" resultType="java.lang.String">
+		select equipment_name
+		from equ_bind_auxiliary_equipment
+		where auxiliary_equipment_code  = #{auxiliaryEquipmentCode}
+	    and del_flag = '0'
+	</select>
 
 </mapper>