From 80e08eee10d55b0ab64702a70617ab45c37ab512 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Fri, 25 Apr 2025 17:34:52 +0800 Subject: [PATCH] =?UTF-8?q?2025-04-25=20=E5=B7=A5=E5=BA=8F=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=97=B6=EF=BC=8C=E4=BA=BA=E5=91=98=E7=AD=89=E7=BA=A7?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=B8=8E=E5=8A=A0=E5=B7=A5=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E4=B8=80=E8=87=B4=20=E9=AB=98=E4=BA=AE=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=8C=E8=BE=93=E5=85=A5=E7=BC=96=E7=A0=81=E8=83=BD=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=B8=A6=E5=87=BA=EF=BC=88Routing=20Tools=E7=9A=84?= =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E5=92=8C=E5=B7=A5=E5=85=B7=EF=BC=89=20Routin?= =?UTF-8?q?g=20Tools=E7=95=8C=E9=9D=A2=E5=A4=B1=E7=9C=9F=20=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E6=B5=81=E8=BD=AC=E4=BF=A1=E6=81=AF=E5=8A=A0=E5=85=A5?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E7=8A=B6=E6=80=81=E7=AD=9B=E9=80=89=EF=BC=8C?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=98=AF=E5=AE=A1=E6=89=B9=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/change/vo/ProcessFormVo.java | 2 + .../RoutingManagementController.java | 11 +++++ .../part/mapper/RoutingManagementMapper.java | 2 + .../service/RoutingManagementService.java | 3 ++ .../impl/RoutingManagementServiceImpl.java | 9 ++++ .../mapper/part/RoutingManagementMapper.xml | 10 +++++ .../mapper/request/RequestManageMapper.xml | 45 ++++++++++--------- 7 files changed, 61 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/spring/modules/change/vo/ProcessFormVo.java b/src/main/java/com/spring/modules/change/vo/ProcessFormVo.java index 809a311f..8bba2605 100644 --- a/src/main/java/com/spring/modules/change/vo/ProcessFormVo.java +++ b/src/main/java/com/spring/modules/change/vo/ProcessFormVo.java @@ -27,4 +27,6 @@ public class ProcessFormVo extends ProcessFormEntity { private String processFlag; private List informationList; + + private String documentStatus; } diff --git a/src/main/java/com/spring/modules/part/controller/RoutingManagementController.java b/src/main/java/com/spring/modules/part/controller/RoutingManagementController.java index 02db3175..7ac27cd5 100644 --- a/src/main/java/com/spring/modules/part/controller/RoutingManagementController.java +++ b/src/main/java/com/spring/modules/part/controller/RoutingManagementController.java @@ -2,6 +2,7 @@ package com.spring.modules.part.controller; import com.spring.common.utils.PageUtils; import com.spring.common.utils.R; +import com.spring.modules.base.entity.PersonnelLevel; import com.spring.modules.part.entity.*; import com.spring.modules.part.service.BomManagementService; import com.spring.modules.part.service.RoutingManagementService; @@ -408,4 +409,14 @@ public class RoutingManagementController { PageUtils page = routingManagementService.queryToolList(data); return R.ok().put("page", page); } + + /** + * 通过加工中心查人员等级 + */ + @PostMapping(value="/queryLaborClassByWorkCenterNo") + @ResponseBody + public R queryLaborClassByWorkCenterNo(@RequestBody PersonnelLevel data) { + List rows = routingManagementService.queryLaborClassByWorkCenterNo(data); + return R.ok().put("rows", rows); + } } diff --git a/src/main/java/com/spring/modules/part/mapper/RoutingManagementMapper.java b/src/main/java/com/spring/modules/part/mapper/RoutingManagementMapper.java index 62199786..429492ca 100644 --- a/src/main/java/com/spring/modules/part/mapper/RoutingManagementMapper.java +++ b/src/main/java/com/spring/modules/part/mapper/RoutingManagementMapper.java @@ -217,4 +217,6 @@ public interface RoutingManagementMapper extends BaseMapper void syncUpdateWorkCenterCost(List subList); void deleteWorkCenterCostAll(); + + List queryLaborClassByWorkCenterNo(PersonnelLevel data); } diff --git a/src/main/java/com/spring/modules/part/service/RoutingManagementService.java b/src/main/java/com/spring/modules/part/service/RoutingManagementService.java index c62d9f4f..32d74b34 100644 --- a/src/main/java/com/spring/modules/part/service/RoutingManagementService.java +++ b/src/main/java/com/spring/modules/part/service/RoutingManagementService.java @@ -1,6 +1,7 @@ package com.spring.modules.part.service; import com.spring.common.utils.PageUtils; +import com.spring.modules.base.entity.PersonnelLevel; import com.spring.modules.base.vo.PersonnelLevelVo; import com.spring.modules.base.vo.WorkCenterCostVo; import com.spring.modules.part.entity.*; @@ -80,4 +81,6 @@ public interface RoutingManagementService { PageUtils queryToolList(ToolHeader data); void syncWorkCenterCostToPLM(WorkCenterCostVo workCenterCostVo); + + List queryLaborClassByWorkCenterNo(PersonnelLevel data); } diff --git a/src/main/java/com/spring/modules/part/service/impl/RoutingManagementServiceImpl.java b/src/main/java/com/spring/modules/part/service/impl/RoutingManagementServiceImpl.java index 3595b3eb..67fe3612 100644 --- a/src/main/java/com/spring/modules/part/service/impl/RoutingManagementServiceImpl.java +++ b/src/main/java/com/spring/modules/part/service/impl/RoutingManagementServiceImpl.java @@ -1668,4 +1668,13 @@ public class RoutingManagementServiceImpl extends ServiceImpl queryLaborClassByWorkCenterNo(PersonnelLevel data) { + List list = routingManagementMapper.queryLaborClassByWorkCenterNo(data); + return list; + } + } diff --git a/src/main/resources/mapper/part/RoutingManagementMapper.xml b/src/main/resources/mapper/part/RoutingManagementMapper.xml index 2000fce0..e037424b 100644 --- a/src/main/resources/mapper/part/RoutingManagementMapper.xml +++ b/src/main/resources/mapper/part/RoutingManagementMapper.xml @@ -1822,4 +1822,14 @@ TRUNCATE TABLE work_center_cost + + + diff --git a/src/main/resources/mapper/request/RequestManageMapper.xml b/src/main/resources/mapper/request/RequestManageMapper.xml index 297f91fd..c89f448e 100644 --- a/src/main/resources/mapper/request/RequestManageMapper.xml +++ b/src/main/resources/mapper/request/RequestManageMapper.xml @@ -335,15 +335,27 @@ - + select + a.site, + a.workflow_id, + a.node_id, + a.role_id, + b.remark + from plm_process_controll_value a + left join plm_process_controll_base b on a.role_id = b.role_id and a.workflow_id = b.workflow_id + where b.remark is not null + and a.site = #{site} and a.workflow_id = #{workflowId} and a.node_id = #{nodeId} @@ -410,24 +422,12 @@ a.classification_no, a.step_id, a.menu_id, - a.reject_opinion + a.reject_opinion, + dbo.get_document_status(a.site, a.document_no, a.document_type) as documentStatus FROM plm_process_form as a LEFT JOIN [VIEW_Process_management_OA_PLM] as b ON a.workflow_id = b.workflowid AND a.node_id = b.nodeid LEFT JOIN sys_user as d ON a.domain_control_account = d.domain_control_account - - - - - - - - - - - - - a.site = #{query.site} and a.is_remark = 0 and isnull(a.process_intervention_flag, ' ') ]]> 'Y' AND a.document_no like #{query.documentNo} @@ -450,6 +450,9 @@ AND d.username like #{query.updateBy} + + and dbo.get_document_status(a.site, a.document_no, a.document_type) = #{query.documentStatus} +