From aa0ffeb5a4d297893b1ae060f10c33cae2303ed6 Mon Sep 17 00:00:00 2001 From: liweidong-hj Date: Tue, 24 Mar 2026 20:58:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/vo/DsMainSaltAddQuantityVO.java | 6 +++ .../dashboard/pojo/vo/DsSpecialProVO.java | 6 +++ .../desk/dashboard/pojo/vo/DsTaskBillVO.java | 8 ++++ .../springblade/system/feign/IUserClient.java | 10 +++++ .../controller/BsProcessSetController.java | 4 +- .../controller/DsTaskBillController.java | 16 +++---- .../desk/dashboard/mapper/PartMapper.xml | 2 +- .../dashboard/mapper/PartRelationMapper.xml | 1 - .../dashboard/mapper/SimilarPartsMapper.xml | 6 +-- .../desk/dashboard/mapper/TaskBillMapper.xml | 8 ++-- .../service/IBsProcessSetService.java | 14 ++++++ .../service/impl/BsProcessSetServiceImpl.java | 43 +++++++++++++++++++ .../DsMainSaltAddQuantityServiceImpl.java | 11 +++++ .../service/impl/DsPartServiceImpl.java | 4 +- .../impl/DsSimilarPartsServiceImpl.java | 21 +++++---- .../service/impl/DsSpecialProServiceImpl.java | 18 ++++++-- .../service/impl/DsTaskBillServiceImpl.java | 19 +++++++- .../service/impl/DsTaskingServiceImpl.java | 6 +-- .../springblade/system/feign/UserClient.java | 6 +++ .../system/service/IUserService.java | 8 ++++ .../system/service/impl/UserServiceImpl.java | 5 +++ 21 files changed, 186 insertions(+), 36 deletions(-) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsMainSaltAddQuantityVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsMainSaltAddQuantityVO.java index bb2f8375..79ff847a 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsMainSaltAddQuantityVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsMainSaltAddQuantityVO.java @@ -61,4 +61,10 @@ public class DsMainSaltAddQuantityVO extends DsMainSaltAddQuantityEntity { @Schema(description = "作业中心名称") private String wcName; + /** + * 作业槽名称 + */ + @Schema(description = "作业槽名称") + private String batchName; + } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsSpecialProVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsSpecialProVO.java index 5a0d5f3d..30f3b340 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsSpecialProVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsSpecialProVO.java @@ -49,4 +49,10 @@ public class DsSpecialProVO extends DsSpecialProEntity { @Schema(description = "文件路径") private String fileUrl; + /** + * 工艺员名称 + */ + @Schema(description = "工艺员名称") + private String proManName; + } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsTaskBillVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsTaskBillVO.java index 2f12ae39..3d9229b7 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsTaskBillVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsTaskBillVO.java @@ -25,6 +25,7 @@ */ package org.springblade.desk.dashboard.pojo.vo; +import io.swagger.v3.oas.annotations.media.Schema; import org.springblade.desk.dashboard.pojo.entity.DsTaskBillEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -42,4 +43,11 @@ public class DsTaskBillVO extends DsTaskBillEntity { @Serial private static final long serialVersionUID = 1L; + /** + * 工艺员名称 + */ + @Schema(description = "工艺员名称") + private String proManName; + + } diff --git a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/feign/IUserClient.java b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/feign/IUserClient.java index 0a86710e..6699ba41 100644 --- a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/feign/IUserClient.java +++ b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/feign/IUserClient.java @@ -57,6 +57,7 @@ public interface IUserClient { String USER_INFO_BY_TENANT_ID_PHONE_TYPE = API_PREFIX + "/info/info-by-tenant-id-phone-type"; String USER_BY_ID = API_PREFIX + "/user-by-id"; String USER_BY_CODE = API_PREFIX + "/user-by-code"; + String USER_BY_ACCOUNT_V2 = API_PREFIX + "/user-by-account-v2"; String USER_BY_ACCOUNT = API_PREFIX + "/user-by-account"; String USER_AUTH_INFO = API_PREFIX + "/user-auth-info"; String SAVE_USER = API_PREFIX + "/save-user"; @@ -198,4 +199,13 @@ public interface IUserClient { */ @GetMapping(USER_BY_CODE) R userInfoByCode(@RequestParam("code") String code); + + /** + * 获取用户信息 + * + * @param account 用户账号 + * @return + */ + @GetMapping(USER_BY_ACCOUNT_V2) + R userByAccountV2(@RequestParam("account") String account); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/BsProcessSetController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/BsProcessSetController.java index 52503fb5..937054d9 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/BsProcessSetController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/BsProcessSetController.java @@ -126,7 +126,7 @@ public class BsProcessSetController extends BladeController { @ApiOperationSupport(order = 4) @Operation(summary = "新增", description = "传入bsProcessSet") public R save(@Valid @RequestBody BsProcessSetEntity bsProcessSet) { - return R.status(bsProcessSetService.save(bsProcessSet)); + return R.status(bsProcessSetService.saveProcessSet(bsProcessSet)); } /** @@ -136,7 +136,7 @@ public class BsProcessSetController extends BladeController { @ApiOperationSupport(order = 5) @Operation(summary = "修改", description = "传入bsProcessSet") public R update(@Valid @RequestBody BsProcessSetEntity bsProcessSet) { - return R.status(bsProcessSetService.updateById(bsProcessSet)); + return R.status(bsProcessSetService.updateProcessSet(bsProcessSet)); } /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsTaskBillController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsTaskBillController.java index 6e7f70c0..bcfbeb8d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsTaskBillController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsTaskBillController.java @@ -88,18 +88,18 @@ public class DsTaskBillController extends BladeController { /** * 任务单表 分页 */ - @GetMapping("/list") - @ApiOperationSupport(order = 2) - @Operation(summary = "分页", description = "传入dsTaskBill") - public R> list(@Parameter(hidden = true) @RequestParam Map dsTaskBill, Query query) { - IPage pages = dsTaskBillService.page(Condition.getPage(query), Condition.getQueryWrapper(dsTaskBill, DsTaskBillEntity.class)); - return R.data(DsTaskBillWrapper.build().pageVO(pages)); - } +// @GetMapping("/list") +// @ApiOperationSupport(order = 2) +// @Operation(summary = "分页", description = "传入dsTaskBill") +// public R> list(@Parameter(hidden = true) @RequestParam Map dsTaskBill, Query query) { +// IPage pages = dsTaskBillService.page(Condition.getPage(query), Condition.getQueryWrapper(dsTaskBill, DsTaskBillEntity.class)); +// return R.data(DsTaskBillWrapper.build().pageVO(pages)); +// } /** * 任务单表 自定义分页 */ - @GetMapping("/page") + @GetMapping("/list") @ApiOperationSupport(order = 3) @Operation(summary = "分页", description = "传入dsTaskBill") public R> page(DsTaskBillVO dsTaskBill, Query query) { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartMapper.xml index 0a3644e6..19581e3d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartMapper.xml @@ -397,7 +397,7 @@ SELECT * FROM DS_PART - WHERE PART_CODE LIKE '%' || #{zPartCode} || '%' + WHERE PART_CODE = #{zPartCode} AND IS_DELETED = 0 AND STATUS = 1 ORDER BY PART_CODE diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartRelationMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartRelationMapper.xml index 15aed665..549f22a1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartRelationMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartRelationMapper.xml @@ -66,7 +66,6 @@ AND p.PART_CODE = #{bPartCode} - AND pv.PART_VERSION = #{bPartVersion} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/SimilarPartsMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/SimilarPartsMapper.xml index 7812fe8a..75600665 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/SimilarPartsMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/SimilarPartsMapper.xml @@ -23,10 +23,10 @@ @@ -37,7 +37,7 @@ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/TaskBillMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/TaskBillMapper.xml index 2ee3767f..999c5d75 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/TaskBillMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/TaskBillMapper.xml @@ -29,9 +29,7 @@ - + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IBsProcessSetService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IBsProcessSetService.java index 079c37ad..aac650ca 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IBsProcessSetService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IBsProcessSetService.java @@ -94,4 +94,18 @@ public interface IBsProcessSetService extends BaseService { * @return */ BsProcessSetEntity selectOldMesProcessSetByOldPpsId(Long oldPpsId); + + /** + * 新增工序设置 + * @param bsProcessSet + * @return + */ + boolean saveProcessSet(BsProcessSetEntity bsProcessSet); + + /** + * 修改工序设置 + * @param bsProcessSet + * @return + */ + boolean updateProcessSet(BsProcessSetEntity bsProcessSet); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/BsProcessSetServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/BsProcessSetServiceImpl.java index 1e503f50..a522a461 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/BsProcessSetServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/BsProcessSetServiceImpl.java @@ -26,6 +26,7 @@ package org.springblade.desk.dashboard.service.impl; +import org.bouncycastle.crypto.prng.ThreadedSeedGenerator; import org.springblade.core.log.exception.ServiceException; import org.springblade.desk.dashboard.pojo.entity.BsProcessSetEntity; import org.springblade.desk.dashboard.pojo.entity.BsProcessTeamEntity; @@ -177,4 +178,46 @@ public class BsProcessSetServiceImpl extends BaseServiceImpl selectDsMainSaltAddQuantityPage(IPage page, DsMainSaltAddQuantityVO dsMainSaltAddQuantity) { List dsMainSaltAddQuantityVOS = baseMapper.selectDsMainSaltAddQuantityPage(page, dsMainSaltAddQuantity); @@ -68,6 +73,12 @@ public class DsMainSaltAddQuantityServiceImpl extends BaseServiceImpl dsPartEntityList = dsPartMapper.selectDsPartVersionByIds(idList); for (DsPartVersionVO dsPartVersionVO : dsPartEntityList) { - dsPartVersionVO.setUpdateUserStr(userClient.userInfo(Func.toLong(dsPartVersionVO.getUpdateUser())).getData().getUser().getName()); + if(null != dsPartVersionVO.getUpdateUser()){ + dsPartVersionVO.setUpdateUserStr(userClient.userInfo(Func.toLong(dsPartVersionVO.getUpdateUser())).getData().getUser().getName()); + } } dsPartVO.setChildren(dsPartEntityList); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsSimilarPartsServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsSimilarPartsServiceImpl.java index 6f291840..8f8e86b9 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsSimilarPartsServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsSimilarPartsServiceImpl.java @@ -77,21 +77,24 @@ public class DsSimilarPartsServiceImpl extends BaseServiceImpl similarPartsList = new ArrayList<>(); for (DsSimilarPartsVO dsSimilarPartsVO : list) { - DsPartEntity partOne = partService.selectDsPartByPatCodeAndVersion(dsSimilarPartsVO.getPartOneCode(),null); - DsPartEntity partTwo = partService.selectDsPartByPatCodeAndVersion(dsSimilarPartsVO.getPartTwoCode(),null); - if(null != partOne && null != partTwo){ + if(null != dsSimilarPartsVO.getPartOneCode() && null != dsSimilarPartsVO.getPartTwoCode()){ DsSimilarPartsEntity dsSimilarPartsEntity = new DsSimilarPartsEntity(); - dsSimilarPartsEntity.setPartOne(partOne.getId()); - dsSimilarPartsEntity.setPartTwo(partTwo.getId()); + dsSimilarPartsEntity.setPartOneCode(dsSimilarPartsVO.getPartOneCode()); + dsSimilarPartsEntity.setPartTwoCode(dsSimilarPartsVO.getPartTwoCode()); + + //判断是否重复 + DsSimilarPartsEntity similarPartsEntity = baseMapper.selectByPartOneAndPartTwo(dsSimilarPartsEntity); + if(null != similarPartsEntity){ + continue; + } + similarPartsList.add(dsSimilarPartsEntity); - }else { - throw new ServiceException("请检查零件号: "+dsSimilarPartsVO.getPartOneCode()+" 或 "+dsSimilarPartsVO.getPartTwoCode()); } } - // 4. 批量保存 + + //批量保存 saveBatch(similarPartsList); return true; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsSpecialProServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsSpecialProServiceImpl.java index 29c7e58f..12902f86 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsSpecialProServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsSpecialProServiceImpl.java @@ -25,7 +25,7 @@ */ package org.springblade.desk.dashboard.service.impl; -import cn.hutool.core.stream.CollectorUtil; +import com.alibaba.nacos.api.utils.StringUtils; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.tool.utils.Func; import org.springblade.desk.dashboard.pojo.entity.BsWorkCenterEntity; @@ -43,7 +43,6 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseServiceImpl; import org.springframework.util.CollectionUtils; - import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -68,7 +67,18 @@ public class DsSpecialProServiceImpl extends BaseServiceImpl selectDsSpecialProPage(IPage page, DsSpecialProVO dsSpecialPro) { - return page.setRecords(baseMapper.selectDsSpecialProPage(page, dsSpecialPro)); + List dsSpecialProVOS = baseMapper.selectDsSpecialProPage(page, dsSpecialPro); + if(!CollectionUtils.isEmpty(dsSpecialProVOS)){ + for (DsSpecialProVO dsSpecialProVO : dsSpecialProVOS) { + if(dsSpecialProVO.getProMan() != null){ + User user = userClient.userInfo(Func.toLong(dsSpecialProVO.getProMan())).getData().getUser(); + if(null != user){ + dsSpecialProVO.setProManName(user.getName()); + } + } + } + } + return page.setRecords(dsSpecialProVOS); } @@ -98,7 +108,7 @@ public class DsSpecialProServiceImpl extends BaseServiceImpl selectDsTaskBillPage(IPage page, DsTaskBillVO dsTaskBill) { - return page.setRecords(baseMapper.selectDsTaskBillPage(page, dsTaskBill)); + List dsTaskBillVOS = baseMapper.selectDsTaskBillPage(page, dsTaskBill); + if(!CollectionUtils.isEmpty(dsTaskBillVOS)){ + for (DsTaskBillVO dsTaskBillVO : dsTaskBillVOS) { + if(null != dsTaskBillVO.getProMan()){ + User user = userClient.userInfo(Func.toLong(dsTaskBillVO.getProMan())).getData().getUser(); + if(null != user){ + dsTaskBillVO.setProManName(user.getName()); + } + } + } + } + return page.setRecords(dsTaskBillVOS); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java index 55417631..0b026af6 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java @@ -614,9 +614,9 @@ public class DsTaskingServiceImpl extends BaseServiceImpl userInfoByCode(String code) { return R.data(service.userInfoByCode(code)); } + + @Override + @GetMapping(USER_BY_ACCOUNT_V2) + public R userByAccountV2(String account) { + return R.data(service.userByAccountV2(account)); + } } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/IUserService.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/IUserService.java index 27af52b5..dfdc8ff2 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/IUserService.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/IUserService.java @@ -310,4 +310,12 @@ public interface IUserService extends BaseService { * @return */ UserInfo userInfoByCode(String code); + + /** + * 根据账号获取用户 + * + * @param tenantId + * @return + */ + User userByAccountV2(String tenantId); } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/UserServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/UserServiceImpl.java index e5f51964..095cd617 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/UserServiceImpl.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/UserServiceImpl.java @@ -614,4 +614,9 @@ public class UserServiceImpl extends BaseServiceImpl implement User user = baseMapper.selectOne(qw); return buildUserInfo(user); } + + @Override + public User userByAccountV2( String account) { + return baseMapper.selectOne(Wrappers.query().lambda().eq(User::getAccount, account).eq(User::getIsDeleted, BladeConstant.DB_NOT_DELETED)); + } }