From 75f61efe4d14c1756ee45d9b3fb1bf08ae8d8f52 Mon Sep 17 00:00:00 2001
From: kilo <wan.ren@foxmail.com>
Date: Mon, 29 May 2023 18:33:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/BasicPrintTemplateEntity.java      | 11 ++---
 .../mapper/BasicdataGoodsAreaMapper.xml       |  1 +
 .../mapper/BasicdataWarehouseMapper.xml       | 48 ++++++++++++++++++-
 doc/dpm/物流租户系统.pdma.json          | 21 +++++++-
 4 files changed, 72 insertions(+), 9 deletions(-)

diff --git a/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicPrintTemplateEntity.java b/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicPrintTemplateEntity.java
index 02d440a06..13e260892 100644
--- a/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicPrintTemplateEntity.java
+++ b/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicPrintTemplateEntity.java
@@ -51,11 +51,6 @@ public class BasicPrintTemplateEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "模板创建人")
 	private String founder;
-	/**
-	 * 模板地址
-	 */
-	@ApiModelProperty(value = "模板地址")
-	private String templateAddress;
 	/**
 	 * 模板版本
 	 */
@@ -66,6 +61,11 @@ public class BasicPrintTemplateEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "模板路径")
 	private String templateUrl;
+	/**
+	 * 模板版本
+	 */
+	@ApiModelProperty(value = "文件名称")
+	private String fileName;
 	/**
 	 * 预留1
 	 */
@@ -91,5 +91,4 @@ public class BasicPrintTemplateEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "预留5")
 	private String reserve5;
-
 }
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 9a9ca1ed8..6536e946e 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
@@ -82,6 +82,7 @@
            </if>
        </where>
     </select>
+
     <select id="getGoodsAreaList" resultType="com.logpm.basicdata.vo.BasicdataGoodsAreaVO">
         SELECT * FROM logpm_warehouse_goods_area WHERE warehouse_id = #{po.id}
     </select>
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.xml
index 8224b412c..471a5f400 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.xml
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.xml
@@ -71,7 +71,53 @@
     </select>
 
     <select id="getWarehouseList" resultType="com.logpm.basicdata.vo.BasicdataWarehouseVO">
-        SELECT * FROM logpm_warehouse_warehouse WHERE is_deleted=0
+        SELECT
+            tenant_id,
+            create_user,
+            create_time,
+            update_user,
+            update_time,
+            status,
+            is_deleted,
+            create_dept,
+            id,
+            reserve1,
+            reserve2,
+            reserve3,
+            reserve4,
+            reserve5,
+            name,
+            code,
+            abbreviation,
+            linkman,
+            contact_number,
+            administrative_areas,
+            distribution_mall,
+            business_line,
+            depot_base,
+            money_receiving_code,
+            remarks,
+            warehouse_address,
+            longitude,
+            latitude,
+            department,
+            warehouse_type,
+            fire_grade,
+            fire_rating_not,
+            merchant_factory,
+            warehouse_structure,
+            elevated_not,
+            storey_height,
+            power_condition,
+            acreage,
+            unit_price,
+            administrative_fee,
+            seating,
+            grade
+        FROM
+            logpm_warehouse_warehouse
+        WHERE
+            is_deleted =0
     </select>
     <select id="selectWarehouseWarehouseDictionary" resultType="com.logpm.basicdata.vo.BasicdataWarehouseVO">
         select id id,name name,linkman linkman,contact_number contactNumber,remarks remarks from logpm_warehouse_warehouse where is_deleted = 0
diff --git a/doc/dpm/物流租户系统.pdma.json b/doc/dpm/物流租户系统.pdma.json
index 2e6f4fb2a..714ba7bf3 100644
--- a/doc/dpm/物流租户系统.pdma.json
+++ b/doc/dpm/物流租户系统.pdma.json
@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.5.1",
   "createdTime": "2023-3-27 13:32:56",
-  "updatedTime": "2023-5-29 14:01:34",
+  "updatedTime": "2023-5-29 18:12:52",
   "dbConns": [],
   "profile": {
     "default": {
@@ -10714,6 +10714,23 @@
           "domain": "",
           "id": "10E08F76-1D1F-4EE5-A9A0-5A50648B5743"
         },
+        {
+          "defKey": "fileName",
+          "defName": "文件名称",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "id": "A3E1C45F-E97C-4D7D-A910-E253D9C553F1"
+        },
         {
           "defKey": "reserve1",
           "defName": "预留1",
@@ -12103,7 +12120,7 @@
         },
         {
           "defKey": "warehouse_id",
-          "defName": "仓库id",
+          "defName": "仓库编号",
           "comment": "",
           "type": "VARCHAR",
           "len": 32,