Merge branch 'dev_v1.0.0' into dev_v1.0.1

# Conflicts:
#	sop-business/src/main/resources/db/log/caozixuan_update_log.sql

sop-business/src/main/resources/db/log/caozixuan_update_log.sql

@@ -432,4 +432,16 @@ ALTER TABLE t_b_device_delivery
     ADD COLUMN effect TINYINT NOT NULL COMMENT '有效的可操作的发货记录（当一个设备处于一个发货出入库生命周期时为有效）, 0: 无效，1: 有效' AFTER update_time;
 
 ALTER TABLE t_b_device_delivery
-    CHANGE COLUMN device_no serial_no VARCHAR(50) NOT NULL COMMENT '设备序列号' ;
+    CHANGE COLUMN device_no serial_no VARCHAR(50) NOT NULL COMMENT '设备序列号' ;
+
+-- 2023-11-29
+ALTER TABLE sys_device_brand
+    ADD UNIQUE INDEX sys_device_brand_un_brand (brand);
+;
+ALTER TABLE sys_device_model
+    ADD UNIQUE INDEX sys_device_model_un (brand_id, model);
+;
+ALTER TABLE sys_device
+    DROP INDEX sys_device_un_device_code ,
+    ADD UNIQUE INDEX sys_device_un_serial_no (serial_no);
+;

sop-common/src/main/java/com/qmth/sop/common/enums/FieldUniqueEnum.java

@@ -25,7 +25,11 @@ public enum FieldUniqueEnum {
 
     t_b_ding_apply_UN_ding_exception_no("考勤异常编号"),
 
-    sys_device_un_device_code("设备编号"),
+    sys_device_brand_un_brand("设备品牌"),
+
+    sys_device_model_un("设备品牌-设备型号"),
+
+    sys_device_un_serial_no("设备编号"),
 
     t_b_device_in_out_un_serial_no("设备出入编号"),