v3项目-修改0917

app-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -50,8 +50,10 @@ public class SysLoginController
     {
         AjaxResult ajax = AjaxResult.success();
         // 生成令牌
-        String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
-                loginBody.getUuid());
+//        String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
+//                loginBody.getUuid());
+        //根据现场需求，去除验证码
+        String token = loginService.loginNoCaptcha(loginBody.getUsername(), loginBody.getPassword());
         ajax.put(Constants.TOKEN, token);
         return ajax;
     }

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

@@ -70,4 +70,7 @@ public class JsDrugCheck implements Serializable {
     @ApiModelProperty(value = "药物类型：1.违禁药物2.疫病检测3.抗生素")
     private String type;
 
+    @ApiModelProperty(value = "检测项目集")
+    private String examineItems;
+
 }

app-admin/src/main/java/com/ruoyi/web/v2/v1/model/vo/CircleVo.java

@@ -9,6 +9,9 @@ import java.time.LocalDate;
 @Data
 public class CircleVo implements Serializable {
 
+    @ApiModelProperty(value = "供应商id")
+    private Integer supplierId;
+
     @ApiModelProperty(value = "供应商")
     private String supplierName;
 
@@ -24,5 +27,7 @@ public class CircleVo implements Serializable {
     @ApiModelProperty(value = "批次id")
     private Integer entranceBatchId;
 
+    //存栏量
+    private Integer amount;
 
 }

app-admin/src/main/java/com/ruoyi/web/v2/v1/service/impl/JsDivideCircleServiceImpl.java

@@ -239,6 +239,8 @@ public class JsDivideCircleServiceImpl extends ServiceImpl<JsDivideCircleMapper,
                 }catch (Exception e) {
                     log.warn(String.format("处理入场日期出现异常：seriesNo -> %s", circle.getSeriesNo()));
                 }
+                circleVo.setSupplierId(circle.getSupplierId());
+                circleVo.setAmount(circle.getAmount());
                 circleVo.setEntranceBatchId(circle.getEntranceBatchId());
                 circleVoList.add(circleVo);
             }

sql/v3_biz_20250814.sql

@@ -565,6 +565,15 @@ INSERT INTO `hb_device_maintenance_dictionary` (id, device_name, maintenance_ite
 INSERT INTO `hb_device_maintenance_dictionary` (id, device_name, maintenance_item, remarks, is_deleted, create_by, create_time, update_by, update_time) VALUES (NULL, '劈半锯','检查限位导向器、启动开关、轴承',null, 0, 'admin', CURRENT_TIMESTAMP, NULL, CURRENT_TIMESTAMP);
 INSERT INTO `hb_device_maintenance_dictionary` (id, device_name, maintenance_item, remarks, is_deleted, create_by, create_time, update_by, update_time) VALUES (NULL, '劈半锯','检查锯片',null, 0, 'admin', CURRENT_TIMESTAMP, NULL, CURRENT_TIMESTAMP);
 
+-- 设备维护字典表 新增item_category字段，区分维护项目是设备还是仪器的范畴，默认是设备
+ALTER TABLE `hb_device_maintenance_dictionary` ADD COLUMN item_category integer(1) DEFAULT 0 COMMENT '区分维护项目是设备还是仪器的范畴,0表示设备；1表示仪器，默认是0';
+INSERT INTO `hb_device_maintenance_dictionary` (id, device_name, maintenance_item, remarks, is_deleted, create_by, create_time, update_by, update_time, item_category) VALUES (NULL, '默认设备','检查设备运行状态','名称是默认设备的，表示该项目是所有设备类的可选维护项目，在新增设备时，维护项目下拉框中会默认加载', 0, 'admin', CURRENT_TIMESTAMP, NULL, CURRENT_TIMESTAMP, 0);
+INSERT INTO `hb_device_maintenance_dictionary` (id, device_name, maintenance_item, remarks, is_deleted, create_by, create_time, update_by, update_time, item_category) VALUES (NULL, '默认设备','传动部件润滑','名称是默认设备的，表示该项目是所有设备类的可选维护项目，在新增设备时，维护项目下拉框中会默认加载', 0, 'admin', CURRENT_TIMESTAMP, NULL, CURRENT_TIMESTAMP, 0);
+INSERT INTO `hb_device_maintenance_dictionary` (id, device_name, maintenance_item, remarks, is_deleted, create_by, create_time, update_by, update_time, item_category) VALUES (NULL, '默认设备','传动部件润滑','名称是默认设备的，表示该项目是所有设备类的可选维护项目，在新增设备时，维护项目下拉框中会默认加载', 0, 'admin', CURRENT_TIMESTAMP, NULL, CURRENT_TIMESTAMP, 0);
+INSERT INTO `hb_device_maintenance_dictionary` (id, device_name, maintenance_item, remarks, is_deleted, create_by, create_time, update_by, update_time, item_category) VALUES (NULL, '默认仪器','仪器清洗','名称是默认仪器的，表示该项目是所有仪器类的可选维护项目，在新增仪器时，维护项目下拉框中会默认加载', 0, 'admin', CURRENT_TIMESTAMP, NULL, CURRENT_TIMESTAMP, 1);
+INSERT INTO `hb_device_maintenance_dictionary` (id, device_name, maintenance_item, remarks, is_deleted, create_by, create_time, update_by, update_time, item_category) VALUES (NULL, '默认仪器','仪器校准','名称是默认仪器的，表示该项目是所有仪器类的可选维护项目，在新增仪器时，维护项目下拉框中会默认加载', 0, 'admin', CURRENT_TIMESTAMP, NULL, CURRENT_TIMESTAMP, 1);
+INSERT INTO `hb_device_maintenance_dictionary` (id, device_name, maintenance_item, remarks, is_deleted, create_by, create_time, update_by, update_time, item_category) VALUES (NULL, '默认仪器','仪器完好程度检查','名称是默认仪器的，表示该项目是所有仪器类的可选维护项目，在新增仪器时，维护项目下拉框中会默认加载', 0, 'admin', CURRENT_TIMESTAMP, NULL, CURRENT_TIMESTAMP, 1);
+
 
 -- 人员管理 添加“健康证明号”
 ALTER TABLE `staff` ADD COLUMN health_cert_no VARCHAR(20) COMMENT '健康证明号';
@@ -606,4 +615,7 @@ ALTER TABLE `js_sample` ADD COLUMN `examine_items` VARCHAR(1000) COMMENT '检测
 ALTER TABLE `product_category` ADD COLUMN `on_sale_flag` TINYINT ( 1 ) DEFAULT 1 COMMENT '是否可销售标志，用于控制可售状态；0.不可销售；1.可销售';
 
 -- 完工记录添加“操作信息”字段，记录数据的变化情况
-ALTER TABLE `js_report` ADD COLUMN `operation_log` VARCHAR(600) COMMENT '操作信息，用于记录数据的变化情况';
+ALTER TABLE `js_report` ADD COLUMN `operation_log` VARCHAR(600) COMMENT '操作信息，用于记录数据的变化情况';
+
+-- 药物登记 添加“检测项目数组”字段，用于存放多个检测项目及对应的检测值
+ALTER TABLE `js_drug_check` ADD COLUMN `examine_items` VARCHAR(1000) COMMENT '检测项目集，包含多个检测项目名称及对应检测值，key/value方式的数组';