配送任务增加签收数量、签收明细增加司机信息

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

@@ -268,6 +268,13 @@ public class DistributionDeliveryListEntity extends TenantEntity {
 	@TableField(exist = false)
 	private String clineName;
 
+	/**
+	 * 签收件数
+	 */
+	@ApiModelProperty(value = "客户名称")
+	@TableField(exist = false)
+	private Integer signingNumber;
+
 
 
 

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

@@ -79,6 +79,18 @@ public class DistributionSigndetailVO extends DistributionSigndetailEntity {
 	@ApiModelProperty(value = "订单自编号")
 	private String orderCode;
 
+	/**
+	 * 司机名称
+	 */
+	@ApiModelProperty(value = "司机名称")
+	private String driverName;
+
+	/**
+	 * 车牌号
+	 */
+	@ApiModelProperty(value = "车牌号")
+	private String vehicleName;
+
 	/**
 	 * 签收数
 	 */

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

@@ -188,6 +188,13 @@
         WHERE
         lddl.id = lds.delivery_id
         ) scannedNumber,
+        (SELECT
+        COALESCE (sum(lds.received_quantity), 0)
+        FROM
+        logpm_distribution_signfor lds
+        WHERE
+        lddl.id = lds.delivery_id
+        ) signingNumber,
         GROUP_CONCAT(DISTINCT ldr.consignee SEPARATOR ',') clineName
         FROM  logpm_distribution_delivery_list lddl
         left JOIN logpm_distribution_signfor lds on lddl.id = lds.delivery_id

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

@@ -119,6 +119,11 @@
         ldr.service_number serviceNumber,
         ldsa.order_code orderCode,
         lddl.train_number trainNumber,
+        case lddl.type
+        when 1 then '商配'
+        when 2 then '市配'
+        else ''
+        end serveType,
         lddl.type type,
         ldsa.mall_name mallName,
         ldsa.warehouse warehouse,
@@ -131,6 +136,9 @@
         ldr.delivery_address deliveryAddress,
         lds.signing_time signingTime,
         lds.sjsigning_time sjsigningTime,
+        lddl.driver_name driverName,
+        lddl.vehicle_name vehicleName,
+        lddl.kind,
         (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-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@@ -189,6 +189,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		List<Long> collect = myWatchWarehouse.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList());
 		distributionDeliveryList.setWarehouseIdList(collect);
 		List<DistributionDeliveryListEntity> distributionDeliveryListEntities = baseMapper.selectDistributionDeliveryListPage(page, distributionDeliveryList);
+
 		return page.setRecords(distributionDeliveryListEntities);
 	}
 
@@ -1429,6 +1430,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 							loadscanEntity.setVehicleName(finalDistributionDeliverySelfEntity.getVehicleNub());
 							loadscanEntity.setScanStatus(LoadingStatusConstant.yijianzhuangche.getValue());
 							loadscanEntity.setOneClick(2);
+							loadscanEntity.setScanType(parcelListEntity.getConditions().toString());
 							loadscanEntity.setScanUser(user.getUserName());
 							loadscanEntity.setReservationId(distrilbutionloadingscanDTO.getReservationId());
 							loadscanEntity.setTrainNumber(distributionDeliveryListEntity.getTrainNumber());

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

@@ -1792,7 +1792,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				parcelListEntity.setOrderPackageStatus(OrderPackageStatusConstant.yiqianshou.getValue());
 				if (Func.isEmpty(loadscanEntities)) {
 					//没有进行过装车操作
-
 					DistributionLoadscanEntity loadscanEntity = new DistributionLoadscanEntity();
 					loadscanEntity.setPackageId(parcelListEntity.getId());
 					loadscanEntity.setOrderPackageCode(parcelListEntity.getOrderPackageCode());

blade-service/logpm-distribution/src/test/java/com/logpm/distribution/TestService.java

@@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import java.util.List;
 
 @ExtendWith(BladeSpringExtension.class)
-@BladeBootTest(appName = "logpm-distribution-pref", enableLoader = true)
+@BladeBootTest(appName = "logpm-distribution-tjj", enableLoader = true)
 public class TestService {
 
 	@Autowired