feat(配套设备库模块): 修改了设备生命状态

dev-matching/src/main/java/com/tykj/dev/device/matching/subject/domin/MatchingDeviceLibrary.java

@@ -67,6 +67,12 @@ public class MatchingDeviceLibrary {
 
     @ApiModelProperty(value = "创建单位Id")
     private Integer createUnitId;
+
+    /**
+     * 所在单位
+     */
+    @ApiModelProperty(value = "所在单位Id")
+    private Integer locationUnitId;
     /**
      * 设备序列号
      */
@@ -85,7 +91,7 @@ public class MatchingDeviceLibrary {
     /**
      * 生命状态,0,-入库待审核,1-入库审核失败,2-在库
      */
-    @ApiModelProperty(value = "生命状态,0,-入库待审核,1-入库审核失败,2-在库")
+    @ApiModelProperty(value = "生命状态,0,-入库待审核,1-入库审核失败,2-在库 3 使用中 4 维修 5停用 6 已报废 7 丢失")
     private Integer lifeStatus;
     /**
      * 创建用户id
@@ -145,8 +151,8 @@ public class MatchingDeviceLibrary {
     @ApiModelProperty(value = "存放位置id")
     private Integer matchingDeviceStorageLocationId;
 
-    @ApiModelProperty(value = "设备状态",example = "0 在库 1 使用中 2 维修 3停用")
-    private Integer matchingDeviceStatus = 0;
+//    @ApiModelProperty(value = "设备状态",example = "0 在库 1 使用中 2 维修 3停用")
+//    private Integer matchingDeviceStatus = 0;
 
     @ApiModelProperty(value = "备注")
     @Column(name = "remake",columnDefinition = "TEXT")
@@ -155,6 +161,12 @@ public class MatchingDeviceLibrary {
     @ApiModelProperty(value = "停用设备信息的单位id")
     private Integer stopUnitId = 0;
 
+    /**
+     * 锁定状态,0-未锁定可用,1-锁定不可用
+     */
+    @ApiModelProperty(value = "锁定状态,0-未锁定可用,1-锁定不可用")
+    private Integer lockStatus = 0;
+
     @ApiModelProperty(value = "停用单位的id")
     @Column(name = "status_json",columnDefinition = "TEXT")
     private String statusJson;
@@ -162,6 +174,17 @@ public class MatchingDeviceLibrary {
     @Transient
     private FileRet statusJsonRet;
 
+    /**
+     * 检查结果(0:丢失,1:无误,2:新增)
+     */
+    @ApiModelProperty(value = "检查结果(0:丢失,1:无误,2:新增)")
+    @Transient
+    private Integer checkResult;
+
+    @ApiModelProperty(value = "维修状态")
+    @Transient
+    private Integer repairStatus;
+
     public MatchingDeviceLibrary setConfigName(){
         ConfigCache configCache = SpringUtils.getBean("initConfigCache");
         if (configCache != null) {

dev-matching/src/main/java/com/tykj/dev/device/matching/subject/vo/MatchingDeviceBillSaveVo.java

@@ -46,6 +46,8 @@ public class MatchingDeviceBillSaveVo {
     @ApiModelProperty(value = "任务id")
     private Integer taskId = 0;
 
+
+
     @Valid
     @NotEmpty(message = "matchingDeviceSaveVoList不能为空")
     @ApiModelProperty(value = "配套设备列表")