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 cd3343bd4..286ad35f3 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 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 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 f8c54e8ff..096a88494 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 39d334e7d..b64a48077 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 32caab51c..d20a4aaf3 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 @@ - @@ -110,7 +109,7 @@ and eo.plan_type = #{planType} and eo.order_code like concat('%', #{orderCode}, '%') and eo.plan_workshop = #{planWorkshop} - and eo.plan_prod_line = #{planProdLine} + and eo.plan_prod_line like concat('%', #{planProdLine}, '%') and eo.plan_loop = #{planLoop} and eo.plan_loop_type = #{planLoopType} and eo.equipment_code like concat('%',#{equipmentCode}, '%') @@ -517,5 +516,12 @@ and del_flag = '0' + +