同步任务部分。

blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/CycleTestTaskTimeoutProcessor.java

@@ -0,0 +1,19 @@
+package org.springblade.job.processor.quality;
+
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+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 CycleTestTaskTimeoutProcessor implements BasicProcessor {
+
+    @Override
+    public ProcessResult process(TaskContext context) throws Exception {
+        return null;
+    }
+}

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestGenMapper.xml

@@ -11,7 +11,7 @@
         <result column="SUPPLIER_ID" property="supplierId"/>
         <result column="CYCLE_TEST_ITEM_ID" property="cycleTestItemId"/>
         <result column="TEST_ID" property="testId"/>
-        <result column="PROCESS_ENGINEER_USER_ID" property="processEngineerUserId"/>
+        <result column="PROCESS_USER_ID" property="processUserId"/>
         <result column="TEST_USER_ID" property="testUserId"/>
         <result column="PLATE" property="plate"/>
         <result column="CRON_GEN_TASK" property="cronGenTask"/>

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/package-info.java

@@ -45,7 +45,7 @@
  *
  * WORKSTATION
  *
- *
+ * TEMPERATURE
  *
  */
 package org.springblade.desk.quality;

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTest.java

@@ -163,7 +163,7 @@ public class CycleTest extends BaseEntity {
 	 * 工艺员[用户]id
 	 */
 	@Schema(description = "工艺员[用户]id")
-	private Long processEngineerUserId;
+	private Long processUserId;
 	/**
 	 * 试验技术员[用户]id
 	 */

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestTask.java

@@ -57,7 +57,7 @@ public class CycleTestTask extends BaseEntity {
 	/**
 	 * 工艺员[用户]id
 	 */
-    public static final String COL_PROCESS_ENGINEER_USER_ID = "PROCESS_ENGINEER_USER_ID";
+    public static final String COL_PROCESS_USER_ID = "PROCESS_USER_ID";
 	/**
 	 * 试验技术员[用户]id
 	 */
@@ -146,7 +146,7 @@ public class CycleTestTask extends BaseEntity {
 	 * 工艺员[用户]id
 	 */
 	@Schema(description = "工艺员[用户]id")
-	private Long processEngineerUserId;
+	private Long processUserId;
 	/**
 	 * 试验技术员[用户]id
 	 */

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/package-info.java

@@ -35,5 +35,8 @@
  *
  * SPECIAL
  * SHIFT
+ *
+ *
+ * PRIORITY
  */
 package org.springblade.desk.quality.pojo.entity;

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskFillData.java

@@ -9,6 +9,4 @@ public class CycleTestTaskFillData {
      * [周期试验任务]id
      */
     Long id;
-
-
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskIssue.java

@@ -8,7 +8,7 @@ public class CycleTestTaskIssue {
     /**
      * [周期试验任务]id
      */
-    Long id;
+    String ids;
     /**
      * 检测员[用户]id
      */

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskIssueBat.java

@@ -0,0 +1,16 @@
+package org.springblade.desk.quality.pojo.request;
+
+import lombok.Data;
+
+@Data
+public class CycleTestTaskIssueBat {
+
+    /**
+     * [周期试验任务]id
+     */
+    Long id;
+    /**
+     * 检测员[用户]id
+     */
+    Long testUserId;
+}

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestUpdateUserBat.java

@@ -0,0 +1,11 @@
+package org.springblade.desk.quality.pojo.request;
+
+public class CycleTestUpdateUserBat {
+
+    /**
+     *
+     */
+    String ids;
+
+
+}

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java

@@ -9,5 +9,4 @@ import org.springblade.desk.quality.pojo.entity.InspectionTask;
 public class InspectionTaskSearch extends InspectionTask {
 
 
-
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskClose.java

@@ -3,7 +3,7 @@ package org.springblade.desk.quality.pojo.request;
 import lombok.Data;
 
 @Data
-public class LiquidTankTaskFinish {
+public class LiquidTankTaskClose {
 
     /**
      * [槽液检测任务]id

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskCloseBat.java

@@ -0,0 +1,16 @@
+package org.springblade.desk.quality.pojo.request;
+
+import lombok.Data;
+
+@Data
+public class LiquidTankTaskCloseBat {
+
+    /**
+     * [槽液检测任务]ids
+     */
+    String ids;
+    /**
+     * 结束原因
+     */
+    String finishReason;
+}

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskException.java

@@ -0,0 +1,9 @@
+package org.springblade.desk.quality.pojo.request;
+
+public class LiquidTankTaskException {
+
+    /**
+     * [槽液检测任务]id
+     */
+    Long id;
+}

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskFillDataBat.java

@@ -0,0 +1,20 @@
+package org.springblade.desk.quality.pojo.request;
+
+import lombok.Data;
+
+@Data
+public class LiquidTankTaskFillDataBat {
+
+    /**
+     * [槽液检测任务]ids
+     */
+    String ids;
+    /**
+     * 测量值
+     */
+    Long testValue;
+    /**
+     * 1:首测 2:复测
+     */
+    Integer fillDataType;
+}

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskIssueBat.java

@@ -0,0 +1,16 @@
+package org.springblade.desk.quality.pojo.request;
+
+import lombok.Data;
+
+@Data
+public class LiquidTankTaskIssueBat {
+
+    /**
+     * [槽液检测任务]id
+     */
+    String ids;
+    /**
+     * 检测员[用户]id
+     */
+    Long testUserId;
+}

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankUpdateBat.java

@@ -0,0 +1,13 @@
+package org.springblade.desk.quality.pojo.request;
+
+import lombok.Data;
+
+@Data
+public class LiquidTankUpdateBat {
+
+    String ids;
+
+    Long processUserId;
+
+    Long teamId;
+}

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestService.java

@@ -0,0 +1,21 @@
+package org.springblade.desk.quality.service;
+
+import jakarta.annotation.Resource;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.tool.api.R;
+import org.springblade.desk.quality.mapper.gen.CycleTestGenMapper;
+import org.springframework.stereotype.Service;
+
+@Service
+@Data
+@Slf4j
+public class CycleTestService {
+
+    @Resource
+    private CycleTestGenMapper genMapper;
+
+    public R updateUserBat() {
+        return null;
+    }
+}

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/InspectionTaskService.java

@@ -34,7 +34,7 @@ public class InspectionTaskService {
     private InspectionResultGenMapper resultGenMapper;
 
     /**
-     * 超时提醒。
+     * 超期提醒。
      *
      * @param id
      * @return

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankReportService.java

@@ -0,0 +1,14 @@
+package org.springblade.desk.quality.service;
+
+/**
+ * 槽液报告
+ */
+public class LiquidTankReportService {
+
+    /**
+     * 生成报告
+     */
+    public void generateReport() {
+
+    }
+}

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankService.java

@@ -10,6 +10,7 @@ import org.springblade.desk.quality.constant.QAModuleConst;
 import org.springblade.desk.quality.mapper.gen.LiquidTankGenMapper;
 import org.springblade.desk.quality.pojo.entity.LiquidTank;
 import org.springblade.desk.quality.pojo.request.LiquidTankSubmit;
+import org.springblade.desk.quality.pojo.request.LiquidTankUpdateBat;
 import org.springblade.desk.quality.service.gen.ILiquidTankGenService;
 import org.springblade.desk.quality.util.PowerJobUtil;
 import org.springframework.stereotype.Service;
@@ -81,6 +82,16 @@ public class LiquidTankService {
         return R.status(genService.updateById(lt));
     }
 
+    /**
+     * 批量设置
+     *
+     * @param lt
+     * @return
+     */
+    public R updateBat(LiquidTankUpdateBat lt) {
+        return null;
+    }
+
     public R delete() {
         return null;
     }
@@ -124,4 +135,6 @@ public class LiquidTankService {
     private void handleJob(LiquidTankSubmit lt) {
 
     }
+
+
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskService.java

@@ -340,19 +340,33 @@ public class LiquidTankTaskService {
     }
 
     /**
-     * [槽液检测任务] 结束
+     * [槽液检测任务] 关闭
      * @param req
      * @return
      */
-    public R<LiquidTankTask> finishForce(LiquidTankTaskFinish req) {
+    public R<LiquidTankTask> close(LiquidTankTaskClose req) {
         LiquidTankTask task = genMapper.selectById(req.getId());
         R<LiquidTankTask> r = new R<>();
         r.setData(task);
         r.setSuccess(true);
-        r.setMsg("结束槽液任务成功");
+        r.setMsg("关闭槽液任务成功");
         return r;
     }
 
+    /**
+     * [槽液检测任务] 关闭
+     * @param req
+     * @return
+     */
+    public R<LiquidTankTask> closeBat(LiquidTankTaskCloseBat req) {
+        LiquidTankTask task = null;
+        R<LiquidTankTask> r = new R<>();
+        r.setData(task);
+        r.setSuccess(true);
+        r.setMsg("关闭槽液任务成功");
+        return null;
+    }
+
     /**
      * 计算加药量
      * 根据历史填报 or 药品规格自动修正加药量