From 25e7440973b0061ba8a8018df776cf668876d633 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Tue, 16 Jul 2024 16:12:21 +0800
Subject: [PATCH] =?UTF-8?q?2024-07-16=20=E8=AE=BE=E5=A4=87-=E7=82=B9?=
=?UTF-8?q?=E6=A3=80=E3=80=81=E5=B7=A1=E6=A3=80=E3=80=81=E4=BF=9D=E5=85=BB?=
=?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=BB=84=E7=BA=BF=E5=B1=95=E7=A4=BAPC?=
=?UTF-8?q?=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/op/device/controller/EquOrderController.java | 4 ++--
.../main/java/com/op/device/mapper/EquOrderMapper.java | 3 +++
.../op/device/service/impl/DeviceTaskServiceImpl.java | 5 +++++
.../main/resources/mapper/device/EquOrderMapper.xml | 10 ++++++++--
4 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/EquOrderController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquOrderController.java
index cd3343bd..286ad35f 100644
--- a/op-modules/op-device/src/main/java/com/op/device/controller/EquOrderController.java
+++ b/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);
diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java
index f8c54e8f..096a8849 100644
--- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java
+++ b/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);
}
diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java
index 39d334e7..b64a4807 100644
--- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java
+++ b/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);
diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml
index 32caab51..d20a4aaf 100644
--- a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml
+++ b/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>