自提增加收货单位字段、装车和签收PDA展示收货单位客户信息

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

@@ -83,6 +83,12 @@ public class DistrilbutionBillLadingEntity extends TenantEntity {
 	@ApiModelProperty(value = "提货人")
 	private String consignee;
 
+	/**
+	 * 收货单位
+	 */
+	@ApiModelProperty(value = "收货单位")
+	private String consigneeUnit;
+
 	@ApiModelProperty(value = "提货人电话")
 	private String consigneePhone;
 	/**

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

@@ -134,6 +134,8 @@ public class DistributionAppDeliveryListVO extends DistributionDeliveryListEntit
 
 
 
+
+
 	/**
 	 * 预约客户数据
 	 */

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistrilbutionBillLadingDTO.java

@@ -74,10 +74,6 @@ public class DistrilbutionBillLadingDTO extends DistrilbutionBillLadingEntity {
 	 * 运单号
 	 */
 	private  String waybillNumber;
-	/**
-	 * 收货单位
-	 */
-	private  String consigneeUnit;
 	/**
 	 * 收货人
 	 */
@@ -152,7 +148,6 @@ public class DistrilbutionBillLadingDTO extends DistrilbutionBillLadingEntity {
 	 */
 	private  String stockupCode;
 
-
 	/**
 	 * 库存品
 	 */

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

@@ -562,7 +562,7 @@
     <select id="selectAppcustomListPage" resultType="com.logpm.distribution.vo.app.DistributionAppReservationVO">
        SELECT DISTINCT
 	ldr.id id,
-	ldr.consignee consignee,
+        GROUP_CONCAT(DISTINCT CONCAT(ldr.receiving_unit,'(',ldr.consignee),')') AS  consignee,
 <!--	COALESCE ( lds.loaded_number + lds.loadedin_number, 0 ) loadingNub,-->
 	COALESCE ( ldr.reservation_num + ldr.reservation_stock_list_num, 0 ) reservationNum,
 	(

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

@@ -1046,7 +1046,8 @@
         (SELECT COALESCE(sum(lds.loaded_number+lds.loadedin_number), 0) FROM logpm_distribution_signfor lds WHERE
         lddl.id = lds.delivery_id) scannedNumber,
         (
-        select GROUP_CONCAT(ldr.consignee)
+        select
+        group_concat(CONCAT(ldr.mall_name ,'(',ldr.consignee,')'))
         from logpm_distribution_reservation ldr
         where ldr.id in
         (select lds.reservation_id

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

@@ -458,6 +458,9 @@
             <if test=" param.orderCodeNumLike != '' and param.orderCodeNumLike != null  ">and ldsa.order_code like
                 concat('%',#{param.orderCodeNumLike},'%')
             </if>
+            <if test=" param.brand != '' and param.brand != null  ">and ldsa.brand like
+                concat(#{param.brand},'%')
+            </if>
             <if test=" param.reservation != '' and param.reservation != null  ">
                 and ldsa.reservation_status in (10,20) and ldpl.order_package_reservation_status = 10
             </if>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@@ -4593,7 +4593,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 
 		}
 		// 推送数据
-		return Resp.scanFail("发车成功", builder.toString());
+		return Resp.scanSuccess("发车成功", builder.toString());
 	}
 
 	@Override
@@ -7213,6 +7213,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			return Resp.scanFail("该任务已完结！", "该任务已完结!");
 		}
 		String loadingId = distrilbutionloadingscanDTO.getLoadingId();
+
 		Boolean b = false;
 		if ("1".equals(distributionDeliveryListEntity.getKind())) {
 			b = distributionDeliverySelfService.update(new UpdateWrapper<DistributionDeliverySelfEntity>().lambda()

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java

@@ -479,7 +479,6 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 								if (!list1.isEmpty()) {
 									deliveryDetails.setStockStatus("2");
 								}
-
 							}
 							distributionDeliveryDetailsService.updateById(deliveryDetails);
 						}
@@ -493,8 +492,6 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 						deliveryDetails.setStockStatus("1");
 						distributionDeliveryDetailsService.save(deliveryDetails);
 						distributionAsyncService.getInventoryNumUpdate(deliveryDetails.getStockListId(), deliveryDetails.getQuantity(), 1);
-
-
 						//增加
 						List<DisStockListDetailEntity> disStockListDetailEntities = new ArrayList<>();
 						for (int i1 = 0; i1 < deliveryDetails.getQuantity(); i1++) {
@@ -2300,7 +2297,6 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			for (DistrilbutionBillLadingAppVO vo : records) {
 				//有可能存在多个订单所以需要拆分
 				String stockArticleId = vo.getStockArticleId();
-
 				Integer orderNum = 0; //订单总数
 				Integer planNum = 0; //预约数量
 				Integer signedNum = 0; //签收数量