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/dashboard/service/impl/DsPartServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java index 6b327c8c..6120c5d8 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 @@ -394,7 +394,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; + } } + } } 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); 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); 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); 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("成功"); }