bug

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

@@ -3,6 +3,8 @@
  */
 package org.springblade.desk.quality.pojo.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -410,11 +412,13 @@ public class LiquidTankTask extends BaseEntity {
      * 实测温度
      */
     @Schema(description = "实测温度")
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     private Double temperatureActual;
     /**
      * 实测PH值
      */
     @Schema(description = "实测PH值")
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     private Double phActual;
     /**
      * 复测电导率测量值
@@ -425,11 +429,13 @@ public class LiquidTankTask extends BaseEntity {
      * 首次电导率测量值
      */
     @Schema(description = "首次电导率测量值")
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     private Double conductivityFirstTestValue;
     /**
      * 首次测量值
      */
     @Schema(description = "首次测量值")
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     private Double firstTestValue;
     /**
      * 复检测量值
@@ -440,6 +446,7 @@ public class LiquidTankTask extends BaseEntity {
      * 首次化验时间
      */
     @Schema(description = "首次化验时间")
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     private LocalDateTime firstTestDate;
     /**
      * 复检化验时间
@@ -475,11 +482,13 @@ public class LiquidTankTask extends BaseEntity {
      * 实际加药量
      */
     @Schema(description = "实际加药量")
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     private Double actualAddValue;
     /**
      * 加药后理论值
      */
     @Schema(description = "加药后理论值")
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     private Double afterAddTheoryValue;
     /**
      * 结束原因

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java

@@ -146,9 +146,9 @@ public class CraftAbilityController extends BladeController {
 		qw.last("ORDER BY UPDATE_TIME DESC ");
 		IPage<CraftAbilityEntity> pages = craftAbilityService.page(Condition.getPage(query), qw);
 		IPage<CraftAbilityVO> pagesVO = CraftAbilityWrapper.build().pageVO(pages);
-		pagesVO.getRecords()
+		//pagesVO.getRecords()
-				.stream()
+		//		.stream()
-				.collect(Collectors.toList());
+		//		.collect(Collectors.toList());
 		return R.data(pagesVO);
 
 //		IPage<CraftAbilityEntity> pages = craftAbilityService.page(Condition.getPage(query), Condition.getQueryWrapper(craftAbility, CraftAbilityEntity.class));

blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemProcessMapper.xml

@@ -55,6 +55,14 @@
         <if test="query.manual != null and query.manual != ''">
             AND mop.MANUAL = #{query.manual}
         </if>
+        <if test="query.paName != null and query.paName != ''">
+            AND bps.NAME LIKE CONCAT('%', CONCAT(#{query.paName}, '%'))
+        </if>
+
+        <if test="query.statementCategory != null and query.statementCategory != ''">
+            AND mosc.STATEMENT_CATEGORY LIKE CONCAT('%', CONCAT(#{query.statementCategory}, '%'))
+        </if>
+
         ORDER BY bps.CODE ASC
     </select>
 

blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemStatementServiceImpl.java

@@ -616,6 +616,9 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
                         entity.setUnitPrice(null);
                         entity.setQuotation("");
                         entity.setUpdateTime(new Date());
+
+                        entity.setSettleTime(new Date());
+
                         return entity;
                     })
                     .collect(Collectors.toList());
@@ -635,6 +638,7 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
                             .set(OemStatementEntity::getRosStatus, entity.getRosStatus())
                             .set(OemStatementEntity::getMemo, entity.getMemo())
                             .set(OemStatementEntity::getUpdateTime, entity.getUpdateTime())
+                            .set(OemStatementEntity::getSettleTime, entity.getSettleTime())
                             .eq(OemStatementEntity::getId, entity.getId());
 
                     baseMapper.update(null, wrapper);

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

@@ -282,7 +282,7 @@ public class LiquidTankController extends BladeController {
     @Operation(summary = "下载Excel模板", description = "")
     public ResponseEntity<org.springframework.core.io.Resource> downloadExcelTemplate() {
         return ExcelExtUtil.downloadXlsTemplate(
-                "Excel/QA/槽液信息.xls",
+                "Excel/QA/槽液信息模板.xls",
                 "导入模版-槽液信息.xls");
     }
 

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

@@ -31,7 +31,6 @@ public class LiquidTankExcel implements Serializable {
 
 	@Serial
 	private static final long serialVersionUID = 1L;
-
 	/**
 	 * 任务前缀
 	 */
@@ -48,9 +47,6 @@ public class LiquidTankExcel implements Serializable {
 	/**
 	 * 槽液编码/槽号
 	 */
-	@ColumnWidth(20)
-	@ExcelProperty("槽液编码/槽号")
-	private String code;
 
 	/**
 	 * [作业槽]id
@@ -128,42 +124,20 @@ public class LiquidTankExcel implements Serializable {
 	@ColumnWidth(20)
 	@ExcelProperty("添加值单位")
 	private String addUnit;
-	/**
-	 * 添加值[计量单位]id
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("添加值[计量单位]id")
-	private BigDecimal addUnitId;
 
 	/**
 	 * 加药量[计算公式]id
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("加药量计算公式")
-//	private BigDecimal addDrugFormulaId;
 	private String addDrugFormulaName;
 	/**
 	 * 添加后理论值[计算公式]id
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("添加后理论值计算公式")
-//	private BigDecimal afterTheoryFormulaId;
 	private String afterTheoryFormulaName;
 
-	/**
-	 * 温度范围类型:[1]:无;[2]:室内温度;[3]:环境温度;[4]:温度范围;
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("温度范围类型:[1]:无;[2]:室内温度;[3]:环境温度;[4]:温度范围;")
-	private Long temperatureType;
-
-	/**
-	 * PH范围类型:[1]:无;[2]:PH值范围;
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("PH范围类型:[1]:无;[2]:PH值范围;")
-	private Long phType;
-
 
 
 	/**
@@ -172,12 +146,7 @@ public class LiquidTankExcel implements Serializable {
 	@ColumnWidth(20)
 	@ExcelProperty("药品名称")
 	private String drugName;
-	/**
+
-	 * 药品[物料]id
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("药品[物料]id")
-	private BigDecimal drugMaterialId;
 	/**
 	 * 药品[物料]编码
 	 */
@@ -232,6 +201,62 @@ public class LiquidTankExcel implements Serializable {
 	private LocalDate validDate;
 
 
+	/**
+	 * 生成周期类型:生成周期类型:[1]:每周;[2]:每月;[3]:每年;[4]:自定义CRON
+	 */
+	@ColumnWidth(20)
+//	@ExcelProperty("生成周期类型:生成周期类型:[1]:每周;[2]:每月;[3]:每年;[4]:自定义CRON")
+	@ExcelProperty("生成周期类型:[1]:每周;[2]:每月;[3]:每年;")
+	private Integer jobType;
+//	private String jobTypeName;
+	/**
+	 * 定时WEEK值
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("每周")
+	private String jobTypeWeekValue;
+	/**
+	 * 定时MONTH值
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("每月")
+	private String jobTypeMonthValue;
+	/**
+	 * 定时YEAR值
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("每年")
+	private String jobTypeYearValue;
+
+	@ColumnWidth(20)
+	@ExcelProperty("槽液编码/槽号")
+	private String code;
+	/**
+	 * 添加值[计量单位]id
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("添加值[计量单位]id")
+	private BigDecimal addUnitId;
+	/**
+	 * 温度范围类型:[1]:无;[2]:室内温度;[3]:环境温度;[4]:温度范围;
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("温度范围类型:[1]:无;[2]:室内温度;[3]:环境温度;[4]:温度范围;")
+	private Long temperatureType;
+
+	/**
+	 * PH范围类型:[1]:无;[2]:PH值范围;
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("PH范围类型:[1]:无;[2]:PH值范围;")
+	private Long phType;
+	/**
+	 * 药品[物料]id
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("药品[物料]id")
+	private BigDecimal drugMaterialId;
+
 	/**
 	 * 工艺含量
 	 */
@@ -339,32 +364,6 @@ public class LiquidTankExcel implements Serializable {
 	@ExcelProperty("环境温度")
 	private BigDecimal temperatureEnv;
 
-	/**
-	 * 生成周期类型:生成周期类型:[1]:每周;[2]:每月;[3]:每年;[4]:自定义CRON
-	 */
-	@ColumnWidth(20)
-//	@ExcelProperty("生成周期类型:生成周期类型:[1]:每周;[2]:每月;[3]:每年;[4]:自定义CRON")
-	@ExcelProperty("生成周期类型:[1]:每周;[2]:每月;[3]:每年;")
-	private Integer jobType;
-//	private String jobTypeName;
-	/**
-	 * 定时WEEK值
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("每周")
-	private String jobTypeWeekValue;
-	/**
-	 * 定时MONTH值
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("每月")
-	private String jobTypeMonthValue;
-	/**
-	 * 定时YEAR值
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("每年")
-	private String jobTypeYearValue;
 	/**
 	 * 生成任务 json config
 	 */