Merge remote-tracking branch 'origin/dev' into pre-production

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java

@@ -225,7 +225,7 @@ public class BasicdataDriverArteryEntity extends TenantEntity {
 	 * 结算渠道
 	 */
 	@ApiModelProperty(value = "结算渠道 1-微信 2-支付宝 3-银行卡 4-现金")
-	private Integer settlementChannel ;
+	private String settlementChannel ;
 
 	/**
 	 * 结算渠道

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/QualityDeliverEntity.java

@@ -589,6 +589,11 @@ public class QualityDeliverEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "滞留时间")
 	private String retentionTime;
+	/**
+	 * 滞留数量
+	 */
+	@ApiModelProperty(value = "滞留数量")
+	private Integer retentionNum;
 	/**
 	 * 配送成本
 	 */

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java

@@ -61,12 +61,7 @@ import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -234,6 +229,9 @@ public class BasicdataDriverArteryController extends BladeController {
 		if (null != basicdataDriverArtery.getBindVehicles()) {
 			basicdataDriverArteryService.updateVehicle(basicdataDriverArtery);
 		}
+		if (Objects.isNull(basicdataDriverArtery.getSettlementChannel())){
+			basicdataDriverArtery.setSettlementChannel("");
+		}
 		boolean b = basicdataDriverArteryService.updateById(basicdataDriverArtery);
 		if (b) {
 			List<Long> warehouseIds = basicdataDriverArtery.getWarehouseIds();

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

@@ -259,15 +259,12 @@
         lds.type_service typeService,
         lds.outbound_date outboundDate,
         lds.stockup_code stockupCode,
-        COALESCE ( group_concat( DISTINCT ldpl.goods_allocation SEPARATOR ',' ), '' ) AS stockipAllocation,
-        COALESCE ( group_concat( DISTINCT ldpl.pallet SEPARATOR ',' ), '' ) AS pallet,
         COALESCE ( group_concat( DISTINCT ldr.consignee SEPARATOR ',' ), '' ) AS consignee
         FROM
         logpm_distribution_stockup lds
         LEFT JOIN logpm_distribution_stockup_info ldsi ON ldsi.stockup_id = lds.id
         LEFT JOIN logpm_distribution_reservation ldr ON ldsi.reservation_id = ldr.id
         LEFT JOIN logpm_distribution_reservation_package ldrp ON ldrp.reservation_id = ldsi.reservation_id
-        LEFT JOIN logpm_distribution_parcel_list ldpl ON ldpl.id = ldrp.parce_list_id
         <where>
             lds.is_deleted = 0  AND ldsi.stock_status != 4
 
@@ -356,14 +353,14 @@
         lds.loader_name loaderName, lds.forklift_id forkliftId,lds.loader_id loaderId,lds.fix_time
         fixTime,lds.assign_time assignTime,
         lds.type_service typeService,lds.outbound_date outboundDate,lds.stockup_code stockupCode,
-        COALESCE(GROUP_CONCAT(DISTINCT ldpl.goods_allocation SEPARATOR ','), '')stockipAllocation,
+
-        COALESCE(GROUP_CONCAT(DISTINCT ldpl.pallet SEPARATOR ','), '') pallet,
+
         COALESCE(group_concat(DISTINCT ldsa.mall_name separator ','), '') as consignee
         from logpm_distribution_stockup lds
         LEFT JOIN logpm_distribution_stockup_info ldsi on ldsi.stockup_id = lds.id
         LEFT JOIN logpm_distrilbution_bill_stock ldbs on ldbs.bill_lading_id = ldsi.reservation_id
         LEFT JOIN logpm_distribution_stock_article ldsa on ldsa.id = ldbs.stock_article_id and ldbs.order_status in (1,2)
-        LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.stock_article_id = ldbs.stock_article_id
+
 
         LEFT JOIN (
         SELECT
@@ -391,12 +388,6 @@
             <if test="param.stockupUser != null and param.stockupUser != '' ">and lds.stockup_user like
                 concat('%',#{param.stockupUser},'%')
             </if>
-            <if test="param.stockipAllocation != null and param.stockipAllocation != '' ">and ldpl.goods_allocation
-                like concat('%',#{param.stockipAllocation},'%')
-            </if>
-            <if test="param.pallet != null and param.pallet != '' ">and ldpl.pallet
-                like concat('%',#{param.pallet},'%')
-            </if>
 
             <if test="param.stockupCode != null and param.stockupCode != '' ">and lds.stockup_code like
                 concat('%',#{param.stockupCode},'%')