From 39efc21f4dc7d587bb85a6c3c588916eac83c4e1 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Fri, 16 Jun 2023 09:15:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=87=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/BasicdataGoodsAreaEntity.java          |  7 +++++++
 .../controller/BasicdataGoodsAreaController.java  | 11 +++++++++++
 .../mapper/BasicdataGoodsAreaMapper.java          |  2 ++
 .../basicdata/mapper/BasicdataGoodsAreaMapper.xml |  7 ++++++-
 .../service/IBasicdataGoodsAreaService.java       |  2 ++
 .../impl/BasicdataGoodsAreaServiceImpl.java       |  5 +++++
 blade-service/logpm-distribution/pom.xml          |  5 +++++
 .../controller/DistributionStockupController.java | 15 +++++++++++++++
 8 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataGoodsAreaEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataGoodsAreaEntity.java
index baa07ba26..a033de927 100644
--- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataGoodsAreaEntity.java
+++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataGoodsAreaEntity.java
@@ -16,6 +16,7 @@
  */
 package com.logpm.basicdata.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import io.swagger.annotations.ApiModel;
@@ -71,6 +72,12 @@ public class BasicdataGoodsAreaEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "标题")
 	private String headline;
+	/**
+	 * 标题
+	 */
+	@ApiModelProperty(value = "标题")
+	@TableField(exist = false)
+	private String department;
 	/**
 	 * 货区状态；1-启用，2-禁用
 	 */
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java
index d4d670363..fbde9fbff 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java
@@ -137,6 +137,17 @@ public class BasicdataGoodsAreaController extends BladeController {
 		return R.status(result);
 	}
 
+	/**
+	 * 仓库 自定义分页
+	 */
+	@GetMapping("/stockUp")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入warehouseWarehouse")
+	public R<List<BasicdataGoodsAreaVO>> stockUp(BasicdataGoodsAreaEntity warehouseWarehouse) {
+		List<BasicdataGoodsAreaVO> pages = basicdataGoodsAreaService.stockUp(warehouseWarehouse);
+		return R.data(pages);
+	}
+
 
 	/**
 	 * 导出数据
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.java
index 3bbae8bde..00397ba0e 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.java
@@ -63,4 +63,6 @@ public interface BasicdataGoodsAreaMapper extends BaseMapper<BasicdataGoodsAreaE
 	List<BasicdataNodeVO> selectSecondNode(String value);
 
     Integer removeGoodsArea(String id);
+
+    List<BasicdataGoodsAreaVO> stockUp(@Param("par") BasicdataGoodsAreaEntity warehouseWarehouse);
 }
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml
index 437ec1e7a..537984034 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml
@@ -30,7 +30,12 @@
              NOT EXISTS(SELECT goods_shelf.id FROM logpm_warehouse_goods_shelf AS  goods_shelf WHERE goods_shelf.goods_area_id=#{id} AND goods_shelf.is_deleted=0)
              AND id = #{id}
     </update>
-
+    <select id="stockUp" resultType="com.logpm.basicdata.vo.BasicdataGoodsAreaVO">
+        select *
+        from logpm_warehouse_goods_area
+        where warehouse_id in (select id
+                               from logpm_warehouse_warehouse where department = #{par.department}) and area_type = 1
+    </select>
 
     <select id="selectWarehouseGoodsAreaPage" resultMap="warehouseGoodsAreaResultMap">
         select * from logpm_warehouse_goods_area where is_deleted = 0
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAreaService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAreaService.java
index a10ed293e..ddedceee9 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAreaService.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAreaService.java
@@ -82,4 +82,6 @@ public interface IBasicdataGoodsAreaService extends BaseService<BasicdataGoodsAr
 	 * @return
 	 */
     boolean removeGoodsArea(List<String> ids);
+
+    List<BasicdataGoodsAreaVO> stockUp(BasicdataGoodsAreaEntity warehouseWarehouse);
 }
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java
index 6a217c9f8..08d3c1be3 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java
@@ -116,4 +116,9 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl<BasicdataGood
 		return result;
 	}
 
+	@Override
+	public List<BasicdataGoodsAreaVO> stockUp(BasicdataGoodsAreaEntity warehouseWarehouse) {
+		return baseMapper.stockUp(warehouseWarehouse);
+	}
+
 }
diff --git a/blade-service/logpm-distribution/pom.xml b/blade-service/logpm-distribution/pom.xml
index 3782e3f2b..8c1ee6ad9 100644
--- a/blade-service/logpm-distribution/pom.xml
+++ b/blade-service/logpm-distribution/pom.xml
@@ -37,6 +37,11 @@
             <artifactId>blade-core-auto</artifactId>
             <scope>compile</scope>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springblade</groupId>-->
+<!--            <artifactId>logpm-basicdata-api</artifactId>-->
+<!--            <version>${bladex.project.version}</version>-->
+<!--        </dependency>-->
         <!--Sms-->
         <dependency>
             <groupId>org.springblade</groupId>
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockupController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockupController.java
index b8b3e9887..aa5375757 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockupController.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockupController.java
@@ -26,6 +26,7 @@ import javax.validation.Valid;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
@@ -78,6 +79,20 @@ public class DistributionStockupController extends BladeController {
 		IPage<DistributionStockupEntity> pages = distributionStockupService.page(Condition.getPage(query), Condition.getQueryWrapper(distributionStockup, DistributionStockupEntity.class));
 		return R.data(pages);
 	}
+	/**
+	 * 备货信息表 分页
+	 */
+	@GetMapping("/listUser")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入distributionStockup")
+	public R<BladeUser> listUser() {
+		//获取当前登录用户
+		BladeUser user = AuthUtil.getUser();
+		BladeUser u = new BladeUser();
+		u.setDeptId(user.getDeptId());
+		u.setTenantId(user.getTenantId());
+		return R.data(u);
+	}
 
 	/**
 	 * 备货信息表 自定义分页