v3项目-提交

app-admin/src/main/java/com/ruoyi/web/v2/v1/entity/JsDeviceMaintenance.java

@@ -1,10 +1,9 @@
 package com.ruoyi.web.v2.v1.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
 import java.io.Serializable;
+
+import com.ruoyi.common.core.domain.AbstractEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -24,12 +23,12 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 @TableName("js_device_maintenance")
 @ApiModel(value="JsDeviceMaintenance对象", description="v2.0设备维护登记")
-public class JsDeviceMaintenance implements Serializable {
+public class JsDeviceMaintenance extends AbstractEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+//    @TableId(value = "id", type = IdType.AUTO)
+//    private Integer id;
 
     @ApiModelProperty(value = "维护时间")
     private String maintenanceTime;
@@ -52,4 +51,14 @@ public class JsDeviceMaintenance implements Serializable {
     @ApiModelProperty(value = "维修人员")
     private String maintenanceUser;
 
+    @ApiModelProperty(value = "规格型号")
+    private String specificationNoGroup;
+
+    @ApiModelProperty(value = "故障描述")
+    private String faultDetail;
+
+    @ApiModelProperty(value = "维修结果")
+    private String repairDetail;
+
+
 }

app-admin/src/main/java/com/ruoyi/web/v2/v1/entity/JsDrugCheck.java

@@ -61,4 +61,10 @@ public class JsDrugCheck implements Serializable {
     @ApiModelProperty(value = "批次序列号集")
     private String seriesNoGroup;
 
+    @ApiModelProperty(value = "溯源单号")
+    private String traceRecordNo;
+
+    @ApiModelProperty(value = "检测人员（签字）")
+    private String examinerConfirm;
+
 }

app-admin/src/main/java/com/ruoyi/web/v2/v1/entity/JsOutStock.java

@@ -52,5 +52,8 @@ public class JsOutStock implements Serializable {
     @ApiModelProperty(value = "领用人")
     private String saveUser;
 
+    @ApiModelProperty(value = "库管")
+    private String keeper;
+
 
 }

app-admin/src/main/java/com/ruoyi/web/v2/v1/entity/JsProduceCheck.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+
+import com.ruoyi.common.core.domain.AbstractEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -23,12 +25,12 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 @TableName("js_produce_check")
 @ApiModel(value="JsProduceCheck对象", description="v2.0生产检验检疫登记")
-public class JsProduceCheck implements Serializable {
+public class JsProduceCheck extends AbstractEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+//    @TableId(value = "id", type = IdType.AUTO)
+//    private Integer id;
 
     @ApiModelProperty(value = "检验日期")
     private String checkTime;
@@ -73,5 +75,8 @@ public class JsProduceCheck implements Serializable {
 
     private String unit;
 
+    @ApiModelProperty(value = "水分检测值")
+    private String detectionValue;
+
 
 }

app-admin/src/main/java/com/ruoyi/web/v2/v1/entity/JsSample.java

@@ -1,19 +1,21 @@
 package com.ruoyi.web.v2.v1.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.deser.std.NumberDeserializers;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.ruoyi.common.core.domain.AbstractEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -28,12 +30,12 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 @TableName("js_sample")
 @ApiModel(value="JsSample对象", description="v2.0样品留存登记")
-public class JsSample implements Serializable {
+public class JsSample extends AbstractEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+//    @TableId(value = "id", type = IdType.AUTO)
+//    private Integer id;
 
     @ApiModelProperty(value = "留存日期")
     private String keepTime;
@@ -67,5 +69,20 @@ public class JsSample implements Serializable {
     @ApiModelProperty(value = "批次序列号集")
     private String seriesNoGroup;
 
+    @ApiModelProperty(value = "检测项目")
+    private String examineItem;
+
+    @ApiModelProperty(value = "水分值")
+    private String moisture;
+
+    @ApiModelProperty(value = "清除时间")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime clearDate;
+
+    @ApiModelProperty(value = "清除人")
+    private String clearPerson;
 
 }

sql/v3_biz_20250814.sql

@@ -434,8 +434,50 @@ CREATE TABLE `hb_equip_maintenance_monthly` (
 
 -- 修改已有表结构
 ALTER TABLE harmless_treatment ADD COLUMN examiner_name VARCHAR ( 30 ) COMMENT '无害化处理人员签字',
-ADD COLUMN veterinary_name VARCHAR ( 30 ) COMMENT '兽医卫生检验人员签字',
-ADD COLUMN supervisor_confirm VARCHAR ( 30 ) COMMENT '农业农村部门监管人员签字',
-ADD COLUMN cargo_owner_confirm VARCHAR ( 30 ) COMMENT '货主签字',
-ADD COLUMN clerk_name VARCHAR ( 30 ) COMMENT '填表人',
-ADD COLUMN director_confirm VARCHAR ( 30 ) COMMENT '屠宰企业负责人签字';
+    ADD COLUMN veterinary_name VARCHAR ( 30 ) COMMENT '兽医卫生检验人员签字',
+    ADD COLUMN supervisor_confirm VARCHAR ( 30 ) COMMENT '农业农村部门监管人员签字',
+    ADD COLUMN cargo_owner_confirm VARCHAR ( 30 ) COMMENT '货主签字',
+    ADD COLUMN clerk_name VARCHAR ( 30 ) COMMENT '填表人',
+    ADD COLUMN director_confirm VARCHAR ( 30 ) COMMENT '屠宰企业负责人签字';
+-- 溯源单号，检测人员
+ALTER TABLE js_drug_check  ADD COLUMN trace_record_no VARCHAR(30) COMMENT '溯源单编号',
+    ADD COLUMN examiner_confirm VARCHAR(30) NOT NULL DEFAULT '' COMMENT '检测人员';
+-- 水份检测值
+ALTER TABLE js_produce_check MODIFY COLUMN id BIGINT AUTO_INCREMENT  ;
+ALTER TABLE js_produce_check  ADD COLUMN `detection_value` VARCHAR(30) COMMENT '水份检测值',
+    ADD COLUMN `is_deleted` TINYINT(1) DEFAULT 0 COMMENT '是否删除标志，0否1是',
+    ADD COLUMN `create_by` VARCHAR(255) DEFAULT NULL COMMENT '创建者',
+    ADD COLUMN `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    ADD COLUMN `update_by` VARCHAR(255) DEFAULT NULL COMMENT '更新者',
+    ADD COLUMN `update_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间';
+
+-- 新增库管字段
+ALTER TABLE `js_out_stock` ADD COLUMN `keeper` VARCHAR(30) DEFAULT NULL COMMENT '库管',
+    ADD COLUMN `is_deleted` TINYINT(1) DEFAULT 0 COMMENT '是否删除标志，0否1是',
+    ADD COLUMN `create_by` VARCHAR(255) DEFAULT NULL COMMENT '创建者',
+    ADD COLUMN `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    ADD COLUMN `update_by` VARCHAR(255) DEFAULT NULL COMMENT '更新者',
+    ADD COLUMN `update_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间';
+
+-- 留样登记新增多个字段
+ALTER TABLE `js_sample` MODIFY COLUMN id BIGINT AUTO_INCREMENT  ;
+ALTER TABLE `js_sample`  ADD COLUMN `examine_item` VARCHAR(30) COMMENT '检测项目',
+    ADD COLUMN `moisture` VARCHAR(30) DEFAULT NULL COMMENT '水分值',
+    ADD COLUMN `clear_date` DATETIME DEFAULT NULL COMMENT '清除时间',
+    ADD COLUMN `clear_person` VARCHAR(30) DEFAULT NULL COMMENT '清除人',
+    ADD COLUMN `is_deleted` TINYINT(1) DEFAULT 0 COMMENT '是否删除标志，0否1是',
+    ADD COLUMN `create_by` VARCHAR(255) DEFAULT NULL COMMENT '创建者',
+    ADD COLUMN `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    ADD COLUMN `update_by` VARCHAR(255) DEFAULT NULL COMMENT '更新者',
+    ADD COLUMN `update_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间';
+
+-- 设备维护保养
+ALTER TABLE `js_device_maintenance` MODIFY COLUMN id BIGINT AUTO_INCREMENT  ;
+ALTER TABLE `js_device_maintenance`  ADD COLUMN `specification_no_group` VARCHAR(90) COMMENT '规格型号',
+    ADD COLUMN `fault_detail` VARCHAR(255) DEFAULT NULL COMMENT '故障描述',
+    ADD COLUMN `repair_detail` VARCHAR(255) DEFAULT NULL COMMENT '维修结果',
+    ADD COLUMN `is_deleted` TINYINT(1) DEFAULT 0 COMMENT '是否删除标志，0否1是',
+    ADD COLUMN `create_by` VARCHAR(255) DEFAULT NULL COMMENT '创建者',
+    ADD COLUMN `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    ADD COLUMN `update_by` VARCHAR(255) DEFAULT NULL COMMENT '更新者',
+    ADD COLUMN `update_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间';