设备管理 接口设计

sop-business/src/main/java/com/qmth/sop/business/bean/params/DevicePlaceParam.java

@@ -2,6 +2,7 @@ package com.qmth.sop.business.bean.params;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.sop.common.enums.DeviceUseStatusEnum;
 import com.qmth.sop.common.enums.TransferModeEnum;
 import io.swagger.annotations.ApiModelProperty;
 import org.hibernate.validator.constraints.Range;
@@ -21,6 +22,9 @@ public class DevicePlaceParam {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
+    @ApiModelProperty("使用方式: TRANSFER-中转，IN-入库")
+    private DeviceUseStatusEnum transferStatus;
+
     @ApiModelProperty("中转方式: MAIL-邮寄，OTHER-其他")
     private TransferModeEnum transferMode;
 
@@ -41,6 +45,14 @@ public class DevicePlaceParam {
         this.id = id;
     }
 
+    public DeviceUseStatusEnum getTransferStatus() {
+        return transferStatus;
+    }
+
+    public void setTransferStatus(DeviceUseStatusEnum transferStatus) {
+        this.transferStatus = transferStatus;
+    }
+
     public TransferModeEnum getTransferMode() {
         return transferMode;
     }

sop-business/src/main/java/com/qmth/sop/business/entity/TBDeviceDelivery.java

@@ -100,6 +100,9 @@ public class TBDeviceDelivery extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "设备来源ID，不为空，说明该设备由其他单号中转过来")
     private Long sourceId;
 
+    @ApiModelProperty(value = "其他的运输方式说明")
+    private String remark;
+
     public String getExpressNo() {
         return expressNo;
     }
@@ -275,4 +278,12 @@ public class TBDeviceDelivery extends BaseEntity implements Serializable {
     public void setSourceId(Long sourceId) {
         this.sourceId = sourceId;
     }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 }

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

@@ -13,6 +13,14 @@ public enum DeviceDeliveryStatusEnum {
 
     DELIVER("已发货"),
 
+    USING("使用中"),
+
+    TRANSFER("中转"),
+
+    TRANSFER_SIGN("中转已签收"),
+
+    IN("入库"),
+
     RECEIVE("已签收"),
 
     CANCEL("作废"),

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

@@ -0,0 +1,22 @@
+package com.qmth.sop.common.enums;
+
+/**
+ * @Description: 设备使用状态
+ * @Author: haoguanghui
+ * @Date: 2024/5/16
+ */
+public enum DeviceUseStatusEnum {
+    TRANSFER("中转"),
+
+    IN("入库");
+
+    private String title;
+
+    DeviceUseStatusEnum(String title) {
+        this.title = title;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+}