From c5d29fa1d99f03363f72dc30aded58bbb87f2623 Mon Sep 17 00:00:00 2001 From: pangyang <475446853@qq.com> Date: Wed, 25 Mar 2026 21:35:52 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=AE=9A=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/desk/basic/pojo/entity/MaterialQuota.java | 7 +++++++ .../desk/quality/controller/LiquidTankController.java | 1 + 2 files changed, 8 insertions(+) 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 70196c1a..d123914a 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 @@ -4,6 +4,8 @@ package org.springblade.desk.basic.pojo.entity; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -83,26 +85,31 @@ public class MaterialQuota extends BaseEntity { * 镀层厚度 */ @Schema(description = "镀层厚度") + @JsonSerialize(nullsUsing = NullSerializer.class) private BigDecimal thickness; /** * 定额 */ @Schema(description = "定额") + @JsonSerialize(nullsUsing = NullSerializer.class) private BigDecimal quota; /** * 小批量定额 */ @Schema(description = "小批量定额") + @JsonSerialize(nullsUsing = NullSerializer.class) private BigDecimal smallBatQuota; /** * 大批量定额 */ @Schema(description = "大批量定额") + @JsonSerialize(nullsUsing = NullSerializer.class) private BigDecimal bigBatQuota; /** * 局部镀定额 */ + @JsonSerialize(nullsUsing = NullSerializer.class) @Schema(description = "局部镀定额") private BigDecimal localBatQuota; /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankController.java index 529b3059..c1d96438 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankController.java @@ -113,6 +113,7 @@ public class LiquidTankController extends BladeController { public R> list(@Parameter(hidden = true) @RequestParam Map liquidTank, Query query) { QueryWrapper qw = Condition.getQueryWrapper(liquidTank, LiquidTank.class); + qw.orderByDesc("CREATE_TIME"); IPage pages = service.page(Condition.getPage(query), qw); IPage pagesVO = LiquidTankWrapper.build().pageVO(pages); From 36e0ffe3d3c171c9337331efe9e49638c4fc7d78 Mon Sep 17 00:00:00 2001 From: pangyang <475446853@qq.com> Date: Wed, 25 Mar 2026 21:40:35 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=A7=BD=E6=B6=B2=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/quality/service/impl/LiquidTankTaskServiceImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankTaskServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankTaskServiceImpl.java index 050d5796..59d1767b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankTaskServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankTaskServiceImpl.java @@ -42,6 +42,7 @@ import org.springblade.desk.basic.util.IdUtil; import org.springblade.desk.quality.util.JobExtUtil; import org.springblade.system.feign.IDictClient; import org.springblade.system.feign.IUserClient; +import org.springblade.system.pojo.entity.User; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -467,6 +468,10 @@ public class LiquidTankTaskServiceImpl extends BaseServiceImpl user = userClient.userInfoById(task.getTestUserId()); + if(null == user || null == user.getData() || user.getData().getId() == null){ + toAccept = false; + } // 状态 if (toAccept) { task.setStatus(LiquidTankTaskConst.S_PENDING_ACCEPT); From ac9ea6d446df36650465c2cf3714446082e4d2e4 Mon Sep 17 00:00:00 2001 From: liweidong-hj Date: Thu, 26 Mar 2026 09:54:08 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DsPartServiceImpl.java | 4 +- .../service/impl/DsTaskingServiceImpl.java | 51 +++++++++---------- 2 files changed, 26 insertions(+), 29 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java index 53be765a..f06ea0a9 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java @@ -367,7 +367,9 @@ public class DsPartServiceImpl extends BaseServiceImpl processMoldToolEntityList = processMoldToolService.selectOldMesByPid(oldMesProcessId); - processMoldToolEntityList.forEach(item -> { + processMoldToolEntityList.forEach(item -> { item.setId(null); item.setProcessId(dsProcessEntity.getId()); }); - if(CollectionUtils.isEmpty(processMoldToolEntityList)){ - log.info("零件 {} 没有工装数据", newPart.getPartCode()); - return true; - } - boolean processMoldToolSaveBatch = processMoldToolService.saveBatch(processMoldToolEntityList); - if(!processMoldToolSaveBatch){ - log.error("工装同步失败，oldMesProcessId:{}", oldMesProcessId); - // 继续处理下一个工艺，不中断 - continue; + if(!CollectionUtils.isEmpty(processMoldToolEntityList)){ + boolean processMoldToolSaveBatch = processMoldToolService.saveBatch(processMoldToolEntityList); + if(!processMoldToolSaveBatch){ + log.error("工装同步失败，oldMesProcessId:{}", oldMesProcessId); + // 继续处理下一个工艺，不中断 + continue; + } } + } } From d366c3fbbf2eb33514b0e3f3b22cc54557bd4ea8 Mon Sep 17 00:00:00 2001 From: pangyang <475446853@qq.com> Date: Thu, 26 Mar 2026 11:02:37 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=A4=84=E7=BD=AE=E5=8D=95=E6=8E=A8erp?= =?UTF-8?q?=E6=9A=82=E6=97=B6=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ReviewSheetServiceImpl.java | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java index 7dc15914..3a34f519 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java @@ -426,28 +426,28 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl entity = new HttpEntity<>(obj, headers); - ResponseEntity responseEntity; - JSONObject responseBody; - try { -// responseEntity = httpClientTemplate.postForEntity("http://192.168.119.68:10113" + +// JSONObject obj = new JSONObject(); +// obj.put("qmsRepairApplyDTO", dto); +// obj.put("qmsRepairPartList", vods); +// obj.put("qmsRepairMalfList", vofs); +// HttpEntity entity = new HttpEntity<>(obj, headers); +// ResponseEntity responseEntity; +// JSONObject responseBody; +// try { +//// responseEntity = httpClientTemplate.postForEntity("http://192.168.119.68:10113" + +//// "/api/mms/qms/qmsrepairapply/qmsRepairApplyRest/saveQmsRepairApply/v1", entity, JSONObject.class); +// +// responseEntity = httpClientTemplate.postForEntity(newErpUrl + // "/api/mms/qms/qmsrepairapply/qmsRepairApplyRest/saveQmsRepairApply/v1", entity, JSONObject.class); - - responseEntity = httpClientTemplate.postForEntity(newErpUrl + - "/api/mms/qms/qmsrepairapply/qmsRepairApplyRest/saveQmsRepairApply/v1", entity, JSONObject.class); - JSONObject result = responseEntity.getBody(); - - responseBody = result.getJSONObject("responseBody"); - if (responseBody == null) { - throw new BusinessException("审理单,接口返回值null"); - } - } catch (Exception e) { - throw new RuntimeException("审理单,接口返回值null"); - } +// JSONObject result = responseEntity.getBody(); +// +// responseBody = result.getJSONObject("responseBody"); +// if (responseBody == null) { +// throw new BusinessException("审理单,接口返回值null"); +// } +// } catch (Exception e) { +// throw new RuntimeException("审理单,接口返回值null"); +// } } return R.success("成功"); } From 052207ed7e98111ce0fae23ae17bc151a5342e3e Mon Sep 17 00:00:00 2001 From: pangyang <475446853@qq.com> Date: Thu, 26 Mar 2026 11:19:50 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=A7=BD=E6=B6=B2=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/quality/service/impl/LiquidTankServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 02f8eb97..99b68505 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 @@ -118,7 +118,7 @@ public class LiquidTankServiceImpl extends BaseServiceImpl=1 && Integer.parseInt(month)<=12) { + if (Integer.parseInt(month)>=1 && Integer.parseInt(month)<=31) { } else { return R.fail("周期为月的每月数据格式不正确"); } @@ -135,7 +135,7 @@ public class LiquidTankServiceImpl extends BaseServiceImpl dates = Arrays.asList(date.split("/")); + List< String> dates = Arrays.asList(date.split("-")); String month = dates.get(0); String day = dates.get(1);