From 8354395d916633c357528e2f38785ab1f34b7165 Mon Sep 17 00:00:00 2001
From: "0.0" <1092404103.qq.com>
Date: Thu, 21 Sep 2023 17:39:53 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=9B=B6=E6=8B=85=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicdata/vo/BasicdataStockArticleVO.java |  5 ++-
 .../basicdata/mapper/BasicdataTrayMapper.xml  | 35 +++++++++++--------
 .../WarehouseGoodsAllocationController.java   |  4 ++-
 3 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataStockArticleVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataStockArticleVO.java
index 2d0795eb9..1bbd1ca7c 100644
--- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataStockArticleVO.java
+++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataStockArticleVO.java
@@ -145,7 +145,10 @@ public class BasicdataStockArticleVO extends BasicdataStockArticleEntity {
 	@ApiModelProperty(value = "完整货位")
 	private String positionCode;
 
-
+	@ApiModelProperty(name = "数量",notes = "")
+	private Integer num;
+	@ApiModelProperty(name = "运单号",notes = "")
+	private String waybillNo;
 	/**
 	 * 是否齐套名称
 	 */
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml
index 3a3ec48f7..17a4eba76 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml
@@ -206,20 +206,23 @@
     </select>
     <select id="selectlclList" resultType="com.logpm.basicdata.vo.BasicdataStockArticleVO">
         SELECT
-            ldsa.dealer_name dealerName,
-            ldsa.waybill_number waybillNumber,
-            ldsa.dealer_code dealerCode,
-            ldsa.consignee_person consigneePerson,
-            ldsa.consignee_address consigneeAddress,
+        lww.consignee dealerName,
+        lww.waybill_no waybillNo,
+        ldsa.dealer_code dealerCode,
+        lww.consignee_name consigneePerson,
+        lww.consignee_address consigneeAddress,
+        lww.consignee_mobile consigneeMobile,
         lwug.position_code positionCode,
-            lwga.column_num columnNum,
-            lwga.layer_num layerNum,
+        lwga.column_num columnNum,
+        lwga.layer_num layerNum,
+        lwtg.num num,
         lwtg.create_time operateTime,
         lwtg.create_user operateUser
         FROM
-            logpm_warehouse_tray_goods lwtg
-                JOIN logpm_distribution_stock_article ldsa ON lwtg.association_id = ldsa.id
-                left join (logpm_warehouse_updown_goods lwug join logpm_warehouse_goods_allocation lwga on lwug.allocation_id =lwga.id) on lwug.association_id = ldsa.id
+        logpm_warehouse_tray_goods lwtg
+        JOIN logpm_distribution_stock_article ldsa ON lwtg.association_id = ldsa.id
+        LEFT join logpm_warehouse_waybill lww   on  lww.waybill_no = ldsa.waybill_number
+        LEFT JOIN ( logpm_warehouse_updown_goods lwug JOIN logpm_warehouse_goods_allocation lwga ON lwug.allocation_id = lwga.id ) ON lwug.association_id = ldsa.id
         <where>
             ldsa.is_deleted = 0  and lwtg.is_deleted = 0 and  lwtg.association_type = 1  and  lwtg.tray_id = #{param.id}
             <if test="param.dealerName !=null and param.dealerName != ''">
@@ -356,11 +359,12 @@
     </select>
     <select id="selectlclListhistory" resultType="com.logpm.basicdata.vo.BasicdataStockArticleVO">
         SELECT
-            ldsa.dealer_name dealerName,
-            ldsa.waybill_number waybillNumber,
-            ldsa.dealer_code dealerCode,
-            ldsa.consignee_person consigneePerson,
-            ldsa.consignee_address consigneeAddress,
+        lww.consignee dealerName,
+        lww.waybill_no waybillNo,
+        ldsa.dealer_code dealerCode,
+        lww.consignee_name consigneePerson,
+        lww.consignee_address consigneeAddress,
+        lww.consignee_mobile consigneeMobile,
             lwug.position_code  positionCode,
             lwga.column_num columnNum,
             lwga.layer_num layerNum,
@@ -375,6 +379,7 @@
         FROM
             logpm_warehouse_tray_goods_log lwtgl
                 JOIN logpm_distribution_stock_article ldsa ON lwtgl.association_id = ldsa.id
+        LEFT join logpm_warehouse_waybill lww   on  lww.waybill_no = ldsa.waybill_number
                 left join (logpm_warehouse_updown_goods lwug join logpm_warehouse_goods_allocation lwga on lwug.allocation_id =lwga.id) on lwug.association_id = ldsa.id
         <where>
             ldsa.is_deleted = 0  and lwtgl.is_deleted = 0  and  lwtgl.association_type = 1  and  lwtgl.tray_id = #{param.id}
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseGoodsAllocationController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseGoodsAllocationController.java
index a35b026d7..4d9aadd54 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseGoodsAllocationController.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseGoodsAllocationController.java
@@ -55,6 +55,7 @@ import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -523,7 +524,8 @@ public class WarehouseGoodsAllocationController extends BladeController {
 			return R.fail(e.code, e.message);
 		} catch (Exception e) {
 			log.error("/downStock系统异常，联系管理员", e);
-			return R.fail(500, "系统异常，联系管理员");
+			return R.fail(500, "系统异常，" +
+				"联系管理员");
 		}
 	}