From 746711883176b299da0363bf7ea2297dca67e455 Mon Sep 17 00:00:00 2001 From: pangyang <475446853@qq.com> Date: Tue, 24 Mar 2026 17:20:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A7=BD=E6=B6=B2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/basic/pojo/entity/MaterialQuota.java | 6 +++++ .../LiquidTankTaskCopyController.java | 23 +++++++++++++----- .../controller/LiquidTankWaveController.java | 20 ++++++++++++--- .../controller/RemindMsgController.java | 6 ++--- .../service/impl/LiquidTankServiceImpl.java | 1 + .../desk/quality/util/FullMergeExcelUtil.java | 10 ++++++-- .../main/resources/Excel/QA/工艺能力.xls | Bin 7168 -> 7168 bytes 7 files changed, 51 insertions(+), 15 deletions(-) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java index 64fe8041..70196c1a 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java @@ -99,6 +99,12 @@ public class MaterialQuota extends BaseEntity { */ @Schema(description = "大批量定额") private BigDecimal bigBatQuota; + + /** + * 局部镀定额 + */ + @Schema(description = "局部镀定额") + private BigDecimal localBatQuota; /** * 排序 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java index 876cc697..f782ff28 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java @@ -170,6 +170,14 @@ public class LiquidTankTaskCopyController extends BladeController { log.warn("key = {}, value = {}, type = {}", key, value, value.getClass()); } ); + + + Date crStart = RequestUtil.buildDateBeginOfDay(map, BaseRequest.CREATE_TIME_START); + Date crEnd = RequestUtil.buildDateEndOfDay(map, BaseRequest.CREATE_TIME_END); + map.put(BaseRequest.CREATE_TIME_START, null); + map.put(BaseRequest.CREATE_TIME_END, null); + + QueryWrapper qw = Condition.getQueryWrapper(map, LiquidTankTask.class); // 正常结束的，异常结束的 qw.in(BaseCol.STATUS, asList(LiquidTankTaskConst.S_FINISH_FAILED, LiquidTankTaskConst.S_FINISH_OK)); @@ -180,9 +188,9 @@ public class LiquidTankTaskCopyController extends BladeController { // 待测成分/分析项目 qw.like(map.containsKey(LiquidTankTaskCopy.COL_TEST_ELEMENT), LiquidTankTaskCopy.COL_TEST_ELEMENT, Func.toStr(map.get("testElement"))); // 范围日期 - if (map.containsKey(BaseRequest.CREATE_TIME_START) && map.containsKey(BaseRequest.CREATE_TIME_END)) { - Date crStart = RequestUtil.buildDateBeginOfDay(map, BaseRequest.CREATE_TIME_START); - Date crEnd = RequestUtil.buildDateEndOfDay(map, BaseRequest.CREATE_TIME_END); + if (null != crStart && null != crEnd) { +// Date crStart = RequestUtil.buildDateBeginOfDay(map, BaseRequest.CREATE_TIME_START); +// Date crEnd = RequestUtil.buildDateEndOfDay(map, BaseRequest.CREATE_TIME_END); qw.between(BaseCol.CREATE_TIME, crStart, crEnd); } // ID 升序 @@ -247,15 +255,18 @@ public class LiquidTankTaskCopyController extends BladeController { ids.add(2029744474384678914L); ids.add(2029740705257250817L); + Date crStart = RequestUtil.buildDateBeginOfDay(map, BaseRequest.CREATE_TIME_START); + Date crEnd = RequestUtil.buildDateEndOfDay(map, BaseRequest.CREATE_TIME_END); + QueryWrapper qw = Condition.getQueryWrapper(map, LiquidTankTaskCopy.class); // 正常结束的，异常结束的 // qw.in(BaseCol.STATUS, asList(LiquidTankTaskConst.S_FINISH_FAILED, LiquidTankTaskConst.S_FINISH_OK)); // [作业中心]id qw.eq(map.containsKey(LiquidTankTaskCopy.COL_WORK_CENTER_ID), LiquidTankTaskCopy.COL_WORK_CENTER_ID, Func.toLong(map.get("workCenterId"))); // 范围日期 - if (map.containsKey(BaseRequest.CREATE_TIME_START) && map.containsKey(BaseRequest.CREATE_TIME_END)) { - Date crStart = RequestUtil.buildDateBeginOfDay(map, BaseRequest.CREATE_TIME_START); - Date crEnd = RequestUtil.buildDateEndOfDay(map, BaseRequest.CREATE_TIME_END); + if (null != crStart && null != crEnd) { +// Date crStart = RequestUtil.buildDateBeginOfDay(map, BaseRequest.CREATE_TIME_START); +// Date crEnd = RequestUtil.buildDateEndOfDay(map, BaseRequest.CREATE_TIME_END); qw.between(BaseCol.CREATE_TIME, crStart, crEnd); } // qw.in("ID",ids); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankWaveController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankWaveController.java index 4c5320cf..281fca01 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankWaveController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankWaveController.java @@ -254,15 +254,27 @@ public class LiquidTankWaveController extends BladeController { @Operation(summary = "list分页", description = "传入LiquidTankWave Obj") public R> list(@Parameter(hidden = true) @RequestParam Map liquidTankWave, Query query) { - QueryWrapper qw = Condition.getQueryWrapper(liquidTankWave, LiquidTankWave.class); + + Date crStart = RequestUtil.buildDateBeginOfDay(liquidTankWave, BaseRequest.CREATE_TIME_START); + Date crEnd = RequestUtil.buildDateEndOfDay(liquidTankWave, BaseRequest.CREATE_TIME_END); + liquidTankWave.put(BaseRequest.CREATE_TIME_START, null); + liquidTankWave.put(BaseRequest.CREATE_TIME_END, null); + QueryWrapper qw = Condition.getQueryWrapper(liquidTankWave, LiquidTankWave.class); qw.eq(liquidTankWave.containsKey("name"), LiquidTankReport.COL_NAME, liquidTankWave.get("name")); - if (liquidTankWave.containsKey(BaseRequest.CREATE_TIME_START) && liquidTankWave.containsKey(BaseRequest.CREATE_TIME_END)) { - Date crStart = RequestUtil.buildDateBeginOfDay(liquidTankWave, BaseRequest.CREATE_TIME_START); - Date crEnd = RequestUtil.buildDateEndOfDay(liquidTankWave, BaseRequest.CREATE_TIME_END); + if (null != crStart && null != crEnd) { +// Date crStart = RequestUtil.buildDateBeginOfDay(liquidTankWave, BaseRequest.CREATE_TIME_START); +// Date crEnd = RequestUtil.buildDateEndOfDay(liquidTankWave, BaseRequest.CREATE_TIME_END); qw.between(BaseCol.CREATE_TIME, crStart, crEnd); } IPage pages = service.page(Condition.getPage(query), qw); IPage pagesVO = LiquidTankWaveWrapper.build().pageVO(pages); + List listVO = pagesVO.getRecords(); + for(LiquidTankWaveVO vo : listVO){ + R user = userClient.userInfoById(vo.getUpdateUser()); + if(null != user && null != user.getData()){ + vo.setUpdateUserRealName(user.getData().getRealName()); + } + } return R.data(pagesVO); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RemindMsgController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RemindMsgController.java index 16055606..d93e46d0 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RemindMsgController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RemindMsgController.java @@ -96,9 +96,9 @@ public class RemindMsgController extends BladeController { partName = map.get("partName").toString(); } QueryWrapper qw = Condition.getQueryWrapper(map, RemindMsg.class); - if(!partName.isEmpty()){ - qw.like(RemindMsg.PART_NAME, partName); - } +// if(!partName.isEmpty()){ +// qw.like(RemindMsg.PART_NAME, partName); +// } // qw.like(map.containsKey("partName"), RemindMsg.PART_NAME, map.get("partName")); IPage pages = service.page(Condition.getPage(query), qw); IPage pagesVO = RemindMsgWrapper.build().pageVO(pages); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankServiceImpl.java index 6ae6132d..02f8eb97 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankServiceImpl.java @@ -292,6 +292,7 @@ public class LiquidTankServiceImpl extends BaseServiceImplD-xBm@WnI563n-x_evJhHP$Lg( delta 44 ycmZp$Xt3Cj!@@RU<@_t=OE(v>IPtPDGBEs~>?fkM`IewJD{EOUNJ2~e8Vdk!QV<3J