From b085493d5728fc3c33ce445056cc1fcea0685826 Mon Sep 17 00:00:00 2001 From: pangyang <475446853@qq.com> Date: Tue, 31 Mar 2026 17:58:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E8=83=BD=E5=8A=9B=EF=BC=8C?= =?UTF-8?q?=E7=8F=AD=E7=BB=84=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/request/InspectionTaskSearch.java | 5 ++- .../controller/CraftAbilityController.java | 1 + .../basic/controller/TeamSetController.java | 6 ++- .../controller/InspectionTaskController.java | 36 +++++++++--------- .../quality/mapper/InspectionTaskMapper.xml | 26 +++++-------- .../impl/InspectionTaskServiceImpl.java | 38 ++++++++++++++++++- 6 files changed, 72 insertions(+), 40 deletions(-) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java index 948eaecb..4405725d 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java @@ -9,12 +9,13 @@ import org.springblade.desk.quality.pojo.entity.InspectionTask; import java.time.LocalDate; @Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) +//@EqualsAndHashCode(callSuper = true) +//@ToString(callSuper = true) public class InspectionTaskSearch extends InspectionTask { @Schema(description = "流程卡号") private String cardNo; + private String cardNoNew; @Schema(description = "加工单位-班组") private Long teamSetId; @Schema(description = "加工单位-供应商") diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java index b50c8a73..f5c4e9b9 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java @@ -143,6 +143,7 @@ public class CraftAbilityController extends BladeController { if(null != startTime && null != endTime){ qw.between("UPDATE_TIME", startTime,endTime); } + qw.orderByAsc("CA_CODE"); IPage pages = craftAbilityService.page(Condition.getPage(query), qw); IPage pagesVO = CraftAbilityWrapper.build().pageVO(pages); pagesVO.getRecords() diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java index b2b9345a..af588857 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java @@ -193,7 +193,7 @@ public class TeamSetController extends BladeController { List teamIds = teamSet.getUserIds(); String result = null; String team = null; - if(null != teamIds){ + if(null != teamIds && teamIds.size() > 0){ for(Long teamId:teamIds){ RelTeamSetUser relTeamSetUser = new RelTeamSetUser(); relTeamSetUser.setTeamSetId(detail.getId()); @@ -214,6 +214,10 @@ public class TeamSetController extends BladeController { // team= teams.stream() // .map(user -> String.valueOf(user.getRealName())) // .collect(Collectors.joining(",")); + }else{ + QueryWrapper qwuser = new QueryWrapper<>(); + qwuser.eq("TEAM_SET_ID", detail.getId()); + relTeamSetUserService.remove(qwuser); } detail.setTeamMemberId(result); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java index d875da1f..ef461631 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java @@ -206,15 +206,15 @@ public class InspectionTaskController extends BladeController { log.info("query = {}", query); log.info("getUserRole = {}", AuthUtil.getUserRole()); // 热表 烧结 检验员 数据区分。 - if (RoleUtil.hasRole(roleConfig.getRbCheckerAlias())) { - search.setFromType(InspectionTaskConst.FROM_TYPE_RB); - } - if (RoleUtil.hasRole(roleConfig.getSjCheckerAlias())) { - search.setFromType(InspectionTaskConst.FROM_TYPE_SJ); - } - if (RoleUtil.hasAllRole(roleConfig.getRbCheckerAlias(), roleConfig.getSjCheckerAlias())) { - search.setFromType(null); - } +// if (RoleUtil.hasRole(roleConfig.getRbCheckerAlias())) { +// search.setFromType(InspectionTaskConst.FROM_TYPE_RB); +// } +// if (RoleUtil.hasRole(roleConfig.getSjCheckerAlias())) { +// search.setFromType(InspectionTaskConst.FROM_TYPE_SJ); +// } +// if (RoleUtil.hasAllRole(roleConfig.getRbCheckerAlias(), roleConfig.getSjCheckerAlias())) { +// search.setFromType(null); +// } IPage pagesVO = service.listSearch(Condition.getPage(query), search); return R.data(pagesVO); } @@ -227,15 +227,15 @@ public class InspectionTaskController extends BladeController { log.info("query = {}", query); log.info("getUserRole = {}", AuthUtil.getUserRole()); // 热表 烧结 检验员 数据区分。 - if (RoleUtil.hasRole(roleConfig.getRbCheckerAlias())) { - search.setFromType(InspectionTaskConst.FROM_TYPE_RB); - } - if (RoleUtil.hasRole(roleConfig.getSjCheckerAlias())) { - search.setFromType(InspectionTaskConst.FROM_TYPE_SJ); - } - if (RoleUtil.hasAllRole(roleConfig.getRbCheckerAlias(), roleConfig.getSjCheckerAlias())) { - search.setFromType(null); - } +// if (RoleUtil.hasRole(roleConfig.getRbCheckerAlias())) { +// search.setFromType(InspectionTaskConst.FROM_TYPE_RB); +// } +// if (RoleUtil.hasRole(roleConfig.getSjCheckerAlias())) { +// search.setFromType(InspectionTaskConst.FROM_TYPE_SJ); +// } +// if (RoleUtil.hasAllRole(roleConfig.getRbCheckerAlias(), roleConfig.getSjCheckerAlias())) { +// search.setFromType(null); +// } IPage pagesVO = service.queryWorkOrder(Condition.getPage(query), search); return R.data(pagesVO); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml index 9d86d723..0274fd59 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml @@ -165,14 +165,15 @@ LEFT JOIN BS_TEAM_SET ts ON wp.MAKE_TEAM = ts.ID -- 部门 LEFT JOIN BLADE_DEPT bl_dept on t.CREATE_DEPT = bl_dept.ID - WHERE ( - t.IS_DELETED = 0 + WHERE + 1=1 + AND t.IS_DELETED = 0 -- AND wp.IS_DELETED = 0 -- AND wo.IS_DELETED = 0 -- AND ps.IS_DELETED = 0 -- AND oem.IS_DELETED = 0 -- AND bl_dept.IS_DELETED = 0 - ) + AND t.WP_ID = #{q.wpId} @@ -190,7 +191,9 @@ AND ts.ID = #{q.mainProcessingUnit} - + + AND wo.CARD_NO = #{q.cardNo} + AND rs.RECEIVE_DATE >= #{q.receiveDateStart} @@ -198,7 +201,6 @@ AND rs.RECEIVE_DATE <= #{q.receiveDateEnd} - -- wp AND wo.MAKE_TEAM = #{q.teamSetId} @@ -211,11 +213,6 @@ AND wp.NEXT_WP_ID = #{q.nextProcessId} - -- wo - - AND wo.CARD_NO = #{q.cardNo} - - AND wo.WO_ID = #{q.woCode} @@ -228,18 +225,13 @@ AND wo.MAKE_QTY = #{q.poQty} - -- yo AND yo.PRODUCT_IDENT = #{q.prodIdent} - - - -- ps AND ps.ID = #{q.currentProcessId} - -- oem - ORDER BY t.ID DESC + ORDER BY t.create_time DESC @@ -325,7 +317,7 @@ - AND wo.CARD_NO = #{cardNo} + AND wo.CARD_NO = #{q.cardNo} AND ps.ID = #{q.currentProcessId} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java index ed4003a9..b6da7c5c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java @@ -343,8 +343,30 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl 0){ QueryWrapper qw = new QueryWrapper<>(); qw.eq("WORK_PLAN_ITEM_ID", wpItemDB.getId()); @@ -1319,12 +1339,20 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl itemList = wpItemService.listByTaskId(id); StatusCountMap map = new StatusCountMap(); + int sumCheckQ = 0, sumTestQty = 0, sumLossQty = 0; for (WorkPlanItem item : itemList) { + sumCheckQ += item.getCheckQty(); + sumTestQty += item.getTestQty(); + sumLossQty += item.getLossQty(); map.add1(item.getCheckResult()); } int countToDo = map.get(InspectionTaskConst.CHECK_RESULT_TODO); @@ -1344,6 +1372,12 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl= 0 && countNO <= itemList.size()) { // 不合格