From c0c76d3ccf61eae1bd1da69d6be0bd1c0818b995 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Sat, 22 Jul 2023 16:40:12 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=87=AA=E6=8F=90=E6=A8=A1=E5=9D=97=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=EF=BC=88=E6=9C=AA=E5=AE=8C=E6=88=90=EF=BC=89=202.?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BasicdataStorageServicesEntity.java       |  4 +-
 .../vo/DistrilbutionBillLadingAppVO.java      | 39 +++++++++++++++++++
 .../mapper/BasicdataStorageServicesMapper.xml |  4 +-
 .../DistributionBillLadingAppController.java  | 34 +++++++++++-----
 4 files changed, 68 insertions(+), 13 deletions(-)
 create mode 100644 blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingAppVO.java

diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStorageServicesEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStorageServicesEntity.java
index 8249fdd62..75aa642dc 100644
--- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStorageServicesEntity.java
+++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStorageServicesEntity.java
@@ -77,7 +77,7 @@ public class BasicdataStorageServicesEntity extends TenantEntity {
 	 * 服务仓库
 	 */
 	@ApiModelProperty(value = "服务仓库ID")
-	private String serveWarehouseId;
+	private Long serveWarehouseId;
 	@ApiModelProperty(value = "服务仓库Name")
 	private String serveWarehouseName;
 
@@ -86,7 +86,7 @@ public class BasicdataStorageServicesEntity extends TenantEntity {
 	 * 发货仓库 发货仓库客户允许未null
 	 */
 	@ApiModelProperty(value = "发货仓库ID")
-	private String sendWarehouseId;
+	private Long sendWarehouseId;
 	@ApiModelProperty(value = "发货仓库Name")
 	private String sendWarehouseName;
 
diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingAppVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingAppVO.java
new file mode 100644
index 000000000..5c2b3e57c
--- /dev/null
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingAppVO.java
@@ -0,0 +1,39 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.distribution.vo;
+
+import com.logpm.distribution.entity.DistrilbutionBillLadingEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 提货单 视图实体类
+ *
+ * @author cyz
+ * @since 2023-06-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class DistrilbutionBillLadingAppVO extends DistrilbutionBillLadingEntity {
+	private static final long serialVersionUID = 1L;
+
+	private Integer carType;
+	private String carTypeStr;
+
+//	private Integer
+
+}
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.xml
index 9633c1fa4..89b9424fc 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.xml
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.xml
@@ -9,7 +9,7 @@
 
 
     <select id="selectBasicdataStorageServicesPage" resultType="com.logpm.basicdata.vo.BasicdataStorageServicesVO">
-
+        select
         lbss.tenant_id,
         lbss.create_user,
         lbss.create_time,
@@ -34,7 +34,7 @@
 
         <where>
             lbss.is_deleted = 0
-            <if test="param.clientId != null and param.clientId != null"> and lbss.clinet_id = #{param.clientId}  </if>
+            <if test="param.clientId != null and param.clientId != null"> and lbss.client_id = #{param.clientId}  </if>
             <if test="param.serveWarehouseId != null and param.serveWarehouseId != null"> and lbss.serve_warehouse_id = #{param.serveWarehouseId}  </if>
             <if test="param.sendWarehouseId != null and param.sendWarehouseId != null"> and lbss.send_warehouse_id = #{param.sendWarehouseId}  </if>
 
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionBillLadingAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionBillLadingAppController.java
index f9342eb98..c6608bab5 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionBillLadingAppController.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionBillLadingAppController.java
@@ -16,15 +16,29 @@
  */
 package com.logpm.distribution.appcontroller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.logpm.distribution.service.IDistrilbutionBillLadingService;
+import com.logpm.distribution.vo.DistrilbutionBillLadingVO;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.system.feign.IDictBizClient;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.Map;
 
 /**
- * 备货信息表 app控制器
+ * 自提列表信息 app控制器
  *
  * @author zhy
  * @since 2023-07-22
@@ -33,20 +47,22 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/app/billLading")
-@Api(value = "备货信息表", tags = "备货信息表接口")
+@Api(value = "自提", tags = "自提信息表接口")
 public class DistributionBillLadingAppController extends BladeController {
 
 
+	private final IDistrilbutionBillLadingService distrilbutionBillLadingService;
+	private final IDictBizClient dictBizClient;
 	/**
 	 * 备货信息表 分页列表
 	 */
-//	@GetMapping("/pageList")
-//	@ApiOperationSupport(order = 1)
-//	@ApiOperation(value = "分页列表", notes = "传入stockupDTO")
-//	public R<IPage<DistributionStockupListVO>> pageList(StockupDTO stockupDTO) {
-//		IPage<DistributionStockupListVO> pages = distributionStockupService.selectStockupPage(stockupDTO);
-//		return R.data(pages);
-//	}
+	@GetMapping("/pageList")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "分页列表", notes = "传入stockupDTO")
+	public R<IPage<DistrilbutionBillLadingVO>> pageList(@ApiIgnore @RequestParam Map<String, Object> distrilbutionBillLading, Query query) {
+		IPage<DistrilbutionBillLadingVO> pages = distrilbutionBillLadingService.pageList(Condition.getPage(query), distrilbutionBillLading);
+		return R.data(pages);
+	}