仓库管理用id查仓库

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/dto/warehouse/InvwWarehouseDetailRequestDTO.java

@@ -0,0 +1,19 @@
+package cn.com.taiji.invw.dto.warehouse;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+
+@ApiModel(description = "查询仓库详情")
+@Getter
+@Setter
+@Accessors(chain = true)
+public class InvwWarehouseDetailRequestDTO {
+    @ApiModelProperty(value = "仓库ID")
+    @NotBlank(message = "id不能为空")
+    private String id;
+}

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/dto/warehouse/InvwWarehouseDetailResponseDTO.java

@@ -0,0 +1,17 @@
+package cn.com.taiji.invw.dto.warehouse;
+
+import cn.com.taiji.invw.model.warehouse.InvwWarehouseIdNameModel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+@ApiModel(description = "仓库详情")
+@Getter
+@Setter
+@Accessors(chain = true)
+public class InvwWarehouseDetailResponseDTO {
+    @ApiModelProperty(value = "仓库ID名称集合")
+    private InvwWarehouseIdNameModel warehouse;
+}

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/dto/warehouse/InvwWarehouseIdNameResponseDTO.java

@@ -1,12 +1,18 @@
 package cn.com.taiji.invw.dto.warehouse;
 
 import cn.com.taiji.invw.model.warehouse.InvwWarehouseIdNameModel;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
 
 import java.util.List;
-
-@Data
+@ApiModel(description = "仓库ID名称集合")
+@Getter
+@Setter
+@Accessors(chain = true)
 public class InvwWarehouseIdNameResponseDTO {
     @ApiModelProperty(value = "仓库ID名称集合")
     private List<InvwWarehouseIdNameModel> idNames;

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/warehouse/InvwWarehouseManager.java

@@ -18,4 +18,6 @@ public interface InvwWarehouseManager {
     void check(InvwWarehouseCheckRequestDTO req) throws ManagerException;
 
     InvwWarehouseIdNameResponseDTO getWarehouseIdNames(InvwWarehouseIdNameRequestDTO req);
+
+    InvwWarehouseDetailResponseDTO detail(InvwWarehouseDetailRequestDTO req) throws ManagerException;
 }

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/warehouse/InvwWarehouseManagerImpl.java

@@ -12,6 +12,7 @@ import cn.com.taiji.core.repo.request.invw.InvwWarehousePageRequest;
 import cn.com.taiji.invw.dto.warehouse.*;
 import cn.com.taiji.invw.manager.AbstractCommManager;
 import cn.com.taiji.invw.model.warehouse.InvwWarehouseIdNameModel;
+import lombok.val;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -282,11 +283,9 @@ public class InvwWarehouseManagerImpl extends AbstractCommManager implements Inv
                 break;
         }
         if (!isEmpty(warehouseList)) {
-            for (InvwWarehouse warehouseLists : warehouseList) {
+            for (InvwWarehouse invwWarehouse : warehouseList) {
                 InvwWarehouseIdNameModel idName = new InvwWarehouseIdNameModel();
-                idName.setId(warehouseLists.getId());
-                idName.setName(warehouseLists.getName());
-                idName.setWarehouseLevel(warehouseLists.getWarehouseLevel());
+                BeanUtils.copyProperties(invwWarehouse, idName);
                 idNames.add(idName);
             }
         }
@@ -294,6 +293,17 @@ public class InvwWarehouseManagerImpl extends AbstractCommManager implements Inv
         return response;
     }
 
+    @Override
+    public InvwWarehouseDetailResponseDTO detail(InvwWarehouseDetailRequestDTO req) throws ManagerException {
+        InvwWarehouse warehouse = warehouseRepo.findById(req.getId()).orElse(null);
+        if(warehouse==null) throw new ManagerException("仓库不存在");
+        InvwWarehouseDetailResponseDTO response = new InvwWarehouseDetailResponseDTO();
+        InvwWarehouseIdNameModel model = new InvwWarehouseIdNameModel();
+        BeanUtils.copyProperties(warehouse, model);
+        response.setWarehouse(model);
+        return response;
+    }
+
     @Override
     public InvwWarehousePageResponseDTO convert(InvwWarehouse warehouse) {
         InvwWarehousePageResponseDTO vo = new InvwWarehousePageResponseDTO();

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/model/warehouse/InvwWarehouseIdNameModel.java

@@ -3,6 +3,9 @@ package cn.com.taiji.invw.model.warehouse;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.persistence.Column;
+import javax.validation.constraints.Size;
+
 @Data
 public class InvwWarehouseIdNameModel {
     @ApiModelProperty(value = "仓库ID")
@@ -11,4 +14,8 @@ public class InvwWarehouseIdNameModel {
     private String  name;
     @ApiModelProperty(value = "仓库层级")
     private Integer  warehouseLevel;
+    @ApiModelProperty(value = "渠道编号")
+    private String agencyId;
+    @ApiModelProperty(value = "网点编号")
+    private String channelId;
 }