From 5fc3bc4c54b4a19b1a9f8d588a54f48e0bdd32dd Mon Sep 17 00:00:00 2001 From: liweidong-hj Date: Fri, 5 Jun 2026 18:43:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=A3=85=E5=B7=A5=E8=89=BA=E7=BC=96?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dashboard/constant/TaskingConstant.java | 6 ++ .../dashboard/pojo/entity/DsCraftEntity.java | 6 ++ .../pojo/entity/DsCraftTurnRecordEntity.java | 96 +++++++++++++++++++ .../pojo/entity/DsTaskingEntity.java | 6 ++ .../controller/DsCraftController.java | 2 +- .../mapper/CraftTurnRecordMapper.xml | 11 +++ .../mapper/DsCraftTurnRecordMapper.java | 48 ++++++++++ .../dashboard/service/IDsCraftService.java | 5 +- .../service/IDsCraftTurnRecordService.java | 47 +++++++++ .../service/impl/DsCraftServiceImpl.java | 6 +- .../impl/DsCraftTurnRecordServiceImpl.java | 53 ++++++++++ .../service/impl/DsPartServiceImpl.java | 30 ++++++ .../desk/order/feign/OrderClient.java | 6 +- 13 files changed, 316 insertions(+), 6 deletions(-) create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsCraftTurnRecordEntity.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/CraftTurnRecordMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsCraftTurnRecordMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsCraftTurnRecordService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsCraftTurnRecordServiceImpl.java diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/constant/TaskingConstant.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/constant/TaskingConstant.java index 42002659e..956630cb7 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/constant/TaskingConstant.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/constant/TaskingConstant.java @@ -127,4 +127,10 @@ public interface TaskingConstant { */ String RB_CREAT = "rb_craft"; String SJ_CREAT = "sj_craft"; + + /** + * 是否为工装编制工艺 + */ + Integer NO_CRAFT_TURN_RECORD = 0; + Integer CRAFT_TURN_RECORD = 1; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsCraftEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsCraftEntity.java index b15e86a2d..e6c2d23cd 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsCraftEntity.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsCraftEntity.java @@ -113,5 +113,11 @@ public class DsCraftEntity extends BaseEntity { @Schema(description = "零件号") private String partCode; + /** + * 是否工装编制 + */ + @Schema(description = "是否工装编制") + private Integer isCraftTurnRecord; + } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsCraftTurnRecordEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsCraftTurnRecordEntity.java new file mode 100644 index 000000000..dd85de749 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsCraftTurnRecordEntity.java @@ -0,0 +1,96 @@ +package org.springblade.desk.dashboard.pojo.entity; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; +import java.io.Serial; +import java.util.Date; + +@Data +@TableName("DS_CRAFT_TURN_RECORD") +@Schema(description = "内部协作工艺内容提前转出") +@EqualsAndHashCode(callSuper = true) +public class DsCraftTurnRecordEntity extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 计划序号 + */ + @Schema(description = "计划序号") + private String toolid; + + /** + * 零件号 + */ + @Schema(description = "零件号") + private String code; + + /** + * 零件名称 + */ + @Schema(description = "零件名称") + private String name; + + /** + * 材料号 + */ + @Schema(description = "材料号") + private String goodsCode; + + /** + * 镀种 + */ + @Schema(description = "镀种") + private String platingKinds; + + /** + * 工艺内容 + */ + @Schema(description = "工艺内容") + private String memo; + + /** + * 面积 + */ + @Schema(description = "面积") + private Integer areaQuantity; + + /** + * 路线卡号 + */ + @Schema(description = "路线卡号") + private String partsCode; + + /** + * ds_process主键 + */ + @Schema(description = "ds_process主键") + private Long pid; + + /** + * 工序名称 + */ + @Schema(description = "工序名称") + private String seqccName; + + /** + * 创建时间 + */ + @Schema(description = "创建时间") + private Date createDate; + + /** + * 工艺变更操作类型，1增加，2修改，3删除 + */ + @Schema(description = "工艺变更操作类型，1增加，2修改，3删除") + private Integer operType; + + /** + * 工艺编制状态:1未编制2已编制 + */ + @Schema(description = "工艺编制状态:1未编制2已编制") + private Integer status; +} \ No newline at end of file diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsTaskingEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsTaskingEntity.java index ca1206068..35bbeae2b 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsTaskingEntity.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsTaskingEntity.java @@ -197,5 +197,11 @@ public class DsTaskingEntity extends BaseEntity { @Schema(description = "审理意见") private String dispose; + /** + * 流程卡号 + */ + @Schema(description = "流程卡号") + private String cardNo; + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsCraftController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsCraftController.java index 9f677aec9..009167c31 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsCraftController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsCraftController.java @@ -170,7 +170,7 @@ public class DsCraftController extends BladeController { @Operation(summary = "逻辑删除", description = "传入ids") public R craftBatchRemoval(@Parameter(description = "主键", required = true) @RequestParam String id) { - return R.status(dsCraftService.craftBatchRemoval(id)); + return R.status(dsCraftService.craftBatchRemoval(id,true)); } /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/CraftTurnRecordMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/CraftTurnRecordMapper.xml new file mode 100644 index 000000000..6f66619cd --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/CraftTurnRecordMapper.xml @@ -0,0 +1,11 @@ + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsCraftTurnRecordMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsCraftTurnRecordMapper.java new file mode 100644 index 000000000..334382f95 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsCraftTurnRecordMapper.java @@ -0,0 +1,48 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.dashboard.mapper; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.dashboard.excel.BsCraftAbilityExcel; +import org.springblade.desk.dashboard.pojo.entity.BsCraftAbilityEntity; +import org.springblade.desk.dashboard.pojo.entity.DsCraftTurnRecordEntity; +import org.springblade.desk.dashboard.pojo.vo.BsCraftAbilityVO; + +import java.util.List; + +/** + * 工艺能力表 Mapper 接口 + * + * @author BladeX + * @since 2025-11-12 + */ +public interface DsCraftTurnRecordMapper extends BaseMapper { + + List selectByCardNo(@Param("cardNo") String cardNo); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsCraftService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsCraftService.java index 335f3a0e2..fe417ffa2 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsCraftService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsCraftService.java @@ -173,10 +173,11 @@ public interface IDsCraftService extends BaseService { /** * 一键删除 - * @param id + * @param id 工艺ID + * @param isDelCraft 是否删除工艺 * @return */ - boolean craftBatchRemoval(String id); + boolean craftBatchRemoval(String id,boolean isDelCraft); /** * 根据零件号、零件版本查询 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsCraftTurnRecordService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsCraftTurnRecordService.java new file mode 100644 index 000000000..7634a4d92 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsCraftTurnRecordService.java @@ -0,0 +1,47 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.dashboard.service; + +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.dashboard.pojo.entity.DsCraftTurnRecordEntity; + +import java.util.List; + +/** + * 工艺能力表 服务类 + * + * @author BladeX + * @since 2025-11-12 + */ +public interface IDsCraftTurnRecordService extends BaseService { + + /** + * 根据流程卡号查询 + * @param cardNo + * @return + */ + List selectByCardNo(String cardNo); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsCraftServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsCraftServiceImpl.java index fcef17b8f..91c0a231c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsCraftServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsCraftServiceImpl.java @@ -265,7 +265,7 @@ public class DsCraftServiceImpl extends BaseServiceImpl + * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.dashboard.service.impl; + +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.dashboard.mapper.DsCraftTurnRecordMapper; +import org.springblade.desk.dashboard.pojo.entity.DsCraftTurnRecordEntity; +import org.springblade.desk.dashboard.service.IDsCraftTurnRecordService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 工艺能力表 服务实现类 + * + * @author BladeX + * @since 2025-11-12 + */ +@Service +public class DsCraftTurnRecordServiceImpl extends BaseServiceImpl implements IDsCraftTurnRecordService { + + @Autowired + DsCraftTurnRecordMapper craftTurnRecordMapper; + + @Override + public List selectByCardNo(String cardNo) { + return craftTurnRecordMapper.selectByCardNo(cardNo); + } +} 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 b6d023248..3da8f4ae7 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 @@ -128,6 +128,9 @@ public class DsPartServiceImpl extends BaseServiceImpl selectDsPartPage(IPage page, DsPartVO dsPart) { @@ -764,6 +767,19 @@ public class DsPartServiceImpl extends BaseServiceImpl craftTurnRecordList = craftTurnRecordService.selectByCardNo(cardNo); + if(!CollectionUtils.isEmpty(craftTurnRecordList)){ + //标记工艺为工装编制工艺 + List craftList = craftService.listByPartId(partEntity.getId()); + for (DsCraftEntity craft : craftList) { + craft.setIsCraftTurnRecord(1); + } + craftService.updateBatchById(craftList); + + newTask.setCardNo(cardNo); + } + boolean taskingSave = taskingService.save(newTask); if (!taskingSave) { log.error("创建维护任务失败，零件编码：{}", partEntity.getPartCode()); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/feign/OrderClient.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/feign/OrderClient.java index 1719770aa..43d6af477 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/feign/OrderClient.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/feign/OrderClient.java @@ -77,7 +77,11 @@ public class OrderClient implements IOrderClient { @Override public void dataVerify() { - List list = orderService.list(Wrappers.lambdaQuery().in(YieldOrder::getValidationResult,16001,16003)); + List list = orderService.list(Wrappers.lambdaQuery() + .in(YieldOrder::getValidationResult, 16001, 16003) + .orderByAsc(YieldOrder::getPartCode) + .orderByAsc(YieldOrder::getCardNo) + ); if(CollectionUtils.isNotEmpty(list)){ List idList = list.stream().map(BaseEntity::getId).collect(Collectors.toList()); log.info("定时任务合规性校验：{}",idList);