diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/CycleTestTaskGenOneTimeProcessor.java b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/CycleTestTaskGenOneTimeProcessor.java deleted file mode 100644 index c243dd3c..00000000 --- a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/CycleTestTaskGenOneTimeProcessor.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.springblade.job.processor.quality; - -import jakarta.annotation.Resource; -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import org.springblade.desk.quality.feign.ICycleTestTaskClient; -import org.springframework.stereotype.Component; -import tech.powerjob.worker.core.processor.ProcessResult; -import tech.powerjob.worker.core.processor.TaskContext; -import tech.powerjob.worker.core.processor.sdk.BasicProcessor; - -@Component -@Data -@Slf4j -public class CycleTestTaskGenOneTimeProcessor implements BasicProcessor { - - @Resource - private ICycleTestTaskClient client; - - @Override - public ProcessResult process(TaskContext context) throws Exception { - client.generateOneTime(); - return new ProcessResult(true); - } -} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingVO.java index e7cb10ea..ab4cfbd6 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingVO.java @@ -3,6 +3,7 @@ */ package org.springblade.desk.basic.pojo.vo; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.desk.basic.pojo.entity.Plating; @@ -21,4 +22,14 @@ public class PlatingVO extends Plating { @Serial private static final long serialVersionUID = 1L; + /** + * [镀种分类]Name + */ + @Schema(description = "[镀种分类]Name") + private Long bcName; + /** + * [镀种小类]Name + */ + @Schema(description = "[镀种小类]Name") + private Long subClassName; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/feign/ICycleTestTaskClient.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/feign/ICycleTestTaskClient.java index b5bd2480..9e76d31b 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/feign/ICycleTestTaskClient.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/feign/ICycleTestTaskClient.java @@ -13,8 +13,6 @@ public interface ICycleTestTaskClient { String GENERATE_AUTO = API_PREFIX + "/generate-auto"; - String GENERATE_ONE_TIME = API_PREFIX + "/generate-one-time"; - String CHECK_REMIND = API_PREFIX + "/check-redmind"; String CHECK_OUT = API_PREFIX + "/check-out"; @@ -22,9 +20,6 @@ public interface ICycleTestTaskClient { @GetMapping(GENERATE_AUTO) void generateAuto(); - @GetMapping(GENERATE_ONE_TIME) - void generateOneTime(); - @GetMapping(CHECK_REMIND) void checkRemind(); diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/feign/ILquidTankTaskClient.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/feign/ILquidTankTaskClient.java index a27fb4a3..6528587e 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/feign/ILquidTankTaskClient.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/feign/ILquidTankTaskClient.java @@ -13,13 +13,18 @@ public interface ILquidTankTaskClient { String API_PREFIX = "/feign/client/qa/lquid-tank-task"; - String GENERATE = API_PREFIX + "/generate"; + String GENERATE_AUTO = API_PREFIX + "/generate-auto"; - String TIMEOUT = API_PREFIX + "/timeout"; + String CHECK_REMIND = API_PREFIX + "/check-redmind"; - @GetMapping(GENERATE) - public List generate(); + String CHECK_OUT = API_PREFIX + "/check-out"; - @GetMapping(TIMEOUT) - public List timeout(); + @GetMapping(GENERATE_AUTO) + void generateAuto(); + + @GetMapping(CHECK_REMIND) + void checkRemind(); + + @GetMapping(CHECK_OUT) + void checkOut(); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BasicClazzController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BasicClazzController.java index d13d0e08..4cbfed1f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BasicClazzController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BasicClazzController.java @@ -18,6 +18,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; +import org.springblade.common.constant.CommonConstant; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.mp.support.Condition; @@ -116,6 +117,7 @@ public class BasicClazzController extends BladeController { public R> listForSelectPlatingAssort() { LambdaQueryWrapper qw = Wrappers.lambdaQuery(); qw.eq(BasicClazz::getBizType, BasicClazzConst.TYPE_PLATING_ASSORT); + qw.eq(BasicClazz::getIsDeleted, CommonConstant.DELETE_FALSE); List list = service.list(qw); List listVO = BasicClazzWrapper.build().listVO(list); return R.data(listVO); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingController.java index a2a39609..690d7e2c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingController.java @@ -35,7 +35,6 @@ import org.springblade.desk.basic.pojo.vo.PlatingVO; import org.springblade.desk.basic.service.IPlatingService; import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.basic.wrapper.PlatingWrapper; -import org.springblade.desk.quality.pojo.entity.ReviewDuty; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -46,7 +45,7 @@ import java.util.stream.Collectors; /** * [镀种] 控制器 - * + * mes v1: bs_plating * @author Tom Shuo * @since 2026-01-05 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProdMarkController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProdMarkController.java index 8b5289ab..e2af9250 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProdMarkController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProdMarkController.java @@ -41,6 +41,7 @@ import java.util.stream.Collectors; /** * [生产标识] 控制器 + * mes v1: * * @author Tom Shuo * @since 2025-12-22 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/RelTeamSetUserController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/RelTeamSetUserController.java index 1fdbf61a..e89a38ca 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/RelTeamSetUserController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/RelTeamSetUserController.java @@ -41,6 +41,7 @@ import java.util.stream.Collectors; /** * [班组用户关联] 控制器 + * mes v1: 二期新加 * * @author Tom Shuo * @since 2026-01-13 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java index ecf254cb..9a3c8cd0 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java @@ -40,6 +40,7 @@ import java.util.Map; /** * [班组] 控制器 * mes v1: bs_team_set + * * @author Tom Shuo * @since 2025-12-16 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java index c8a1030a..353a8187 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java @@ -40,6 +40,7 @@ import java.util.Map; /** * [作业中心] 控制器 * mes v1: bs_work_center + * * @author Tom Shuo * @since 2025-12-16 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java index c8a0ccd5..e093a085 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java @@ -40,6 +40,7 @@ import java.util.Map; /** * [作业槽] 控制器 * mes v1: + * * @author Tom Shuo * @since 2025-12-16 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/feign/CycleTestTaskClient.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/feign/CycleTestTaskClient.java index 564e8a19..11fe29e5 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/feign/CycleTestTaskClient.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/feign/CycleTestTaskClient.java @@ -17,11 +17,6 @@ public class CycleTestTaskClient implements ICycleTestTaskClient { service.generateAuto(); } - @Override - public void generateOneTime() { - service.generateOneTime(); - } - @Override public void checkRemind() { service.checkRemind(); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/feign/LiquidTankTaskClient.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/feign/LiquidTankTaskClient.java index 57eddfeb..f19869af 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/feign/LiquidTankTaskClient.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/feign/LiquidTankTaskClient.java @@ -3,6 +3,9 @@ package org.springblade.desk.quality.feign; import io.swagger.v3.oas.annotations.Hidden; import jakarta.annotation.Resource; import org.springblade.desk.quality.pojo.entity.LiquidTankTask; +import org.springblade.desk.quality.service.ILiquidTankService; +import org.springblade.desk.quality.service.ILiquidTankTaskService; +import org.springblade.desk.quality.service.LiquidTankService2; import org.springblade.desk.quality.service.LiquidTankTaskService222; import org.springframework.web.bind.annotation.RestController; @@ -13,16 +16,21 @@ import java.util.List; public class LiquidTankTaskClient implements ILquidTankTaskClient { @Resource - private LiquidTankTaskService222 service; + private ILiquidTankTaskService service; @Override - public List generate() { - return null;// todo: + public void generateAuto() { + service.generateAuto(); } @Override - public List timeout() { - return service.timeout(); + public void checkRemind() { + service.checkRemind(); + } + + @Override + public void checkOut() { + service.checkOut(); } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestTaskService2.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestTaskService2.java index ddc4e774..a75eb66b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestTaskService2.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestTaskService2.java @@ -278,10 +278,6 @@ public class CycleTestTaskService2 { return true; } - public void generateOneTime() { - List ctList = cycleTestService.list(); - } - /** * 手动生成 * diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankTaskService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankTaskService.java index c5b58bd4..04f1b783 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankTaskService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankTaskService.java @@ -66,4 +66,10 @@ public interface ILiquidTankTaskService extends BaseService { R finishFail(Long id, String finishReason); void setVOValue(LiquidTankTaskVO vo); + + void generateAuto(); + + void checkRemind(); + + void checkOut(); } 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 f5c313ec..2aa3425b 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 @@ -293,17 +293,18 @@ public class LiquidTankTaskServiceImpl extends BaseServiceImpl generateAuto() { + public void generateAuto() { log.info("========generate========start"); - // 如果是节假日,则跳过生成。 + // 如果是节假日,则跳过生成。 todo: if (false) { log.info("节假日,则跳过生成。"); - return null; + return; } // 查询所有启用的槽液。 List tankList = liquidTankService.list( @@ -327,7 +328,16 @@ public class LiquidTankTaskServiceImpl extends BaseServiceImpl