Merge branch 'dev' into pre-production

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSigndetailVO.java

@@ -85,6 +85,12 @@ public class DistributionSigndetailVO extends DistributionSigndetailEntity {
 	@ApiModelProperty(value = "司机名称")
 	private String driverName;
 
+	/**
+	 * 司机电话
+	 */
+	@ApiModelProperty(value = "司机电话")
+	private String driverPhone;
+
 	/**
 	 * 车牌号
 	 */

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSigndetailMapper.xml

@@ -139,6 +139,11 @@
         lddl.driver_name driverName,
         lddl.vehicle_name vehicleName,
         lddl.kind,
+        CASE lddl.kind
+        WHEN '1' THEN  (SELECT ldds.driver_phone  FROM logpm_distribution_delivery_self AS ldds WHERE ldds.delivery_id = lddl.id AND ldds.is_master = 2)
+        WHEN '2' THEN  (SELECT lddt.driver_phone  FROM logpm_distribution_delivery_tripartite AS lddt WHERE lddt.delivery_id = lddl.id )
+        ELSE ''
+        END driverPhone,
         (SELECT GROUP_CONCAT(ldpl.material_name SEPARATOR ',')  FROM logpm_distribution_parcel_list ldpl WHERE ldpl.stock_article_id = ldsa.id) materialName,
         (SELECT COALESCE (count(*) ,0)  FROM logpm_distribution_reservation_package ldrpp WHERE ldsa.id = ldrpp.stock_article_id and ldrpp.reservation_id  =ldrs.reservation_id) totalNumber,
         (select COALESCE (count(*) ,0) from logpm_distribution_loadscan ldl WHERE ldl.order_id =ldsa.id and  ldl.signfor_state =2) signfornum

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/QuestDetailMapper.xml

@@ -23,7 +23,7 @@
         <result column="order_id" property="orderId"/>
         <result column="quest_type" property="questType"/>
         <result column="quest_target" property="questTarget"/>
-        <result column="orde_package_code" property="ordePackageCode"/>
+        <result column="order_package_code" property="orderPackageCode"/>
         <result column="order_package_id" property="orderPackageId"/>
         <result column="category_name" property="categoryName"/>
         <result column="stock_id" property="stockId"/>

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml

@@ -440,7 +440,7 @@
         lqd.stock_num stockNum,
         lqd.position_code positionCode,
         lqd.grounding_position_code groundingPositionCode,
-        lqd.orde_package_code ordePackageCode,
+        lqd.order_package_code ordePackageCode,
         lqd.order_package_id orderPackageId,
         lqd.update_time updateTime,
         ldpl.service_number serviceNumber,