Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java

@@ -490,6 +490,11 @@ public class DistributionDeliveryListController extends BladeController {
 	@ApiOperation(value = "PC签收包件")
 	public R cancelDelivery(@Valid @RequestBody DistrilbutionAppsignforDTO distrilbutionloadingscanDTO) {
 		R r = distributionDeliveryListService.cancelDelivery(distrilbutionloadingscanDTO.getDeliveryId());
+		if (r.isSuccess()){
+			//取消成功，维护配送单状态和数量
+			distributionDeliveryListService.maintenanceDeliveryNum(distrilbutionloadingscanDTO.getDeliveryId());
+			distributionDeliveryListService.maintenanceDeliveryInfo(distrilbutionloadingscanDTO.getDeliveryId());
+		}
 		return r;
 	}
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistrilbutionBillLadingController.java

@@ -275,6 +275,13 @@ public class DistrilbutionBillLadingController extends BladeController {
 		return R.status(distrilbutionBillLadingService.ownSaveOrUpdate(distrilbutionBillLading));
 	}
 
+	@PostMapping("/cancelBillLoding")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "批量取消自提单", notes = "传入distrilbutionBillLading")
+	public R cancelBillLoding(@Valid @RequestBody DistrilbutionBillLadingDTO distrilbutionBillLadingDTO) {
+		return R.status(distrilbutionBillLadingService.cancelBillLoding(distrilbutionBillLadingDTO.getBillLodingIds()));
+	}
+
 
 
 	/**

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

@@ -42,6 +42,11 @@ public class DistrilbutionBillLadingDTO extends DistrilbutionBillLadingEntity {
 	 *
 	 */
 	private  String name;
+
+	/**
+	 *
+	 */
+	private  String billLodingIds;
 	/**
 	 * 提货批次
 	 */

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

@@ -210,7 +210,7 @@
         left JOIN logpm_distribution_signfor lds on lddl.id = lds.delivery_id
         LEFT JOIN logpm_distribution_reservation ldr on ldr.id = lds.reservation_id
         <where>
-            lddl.is_deleted = 0 AND (IF(lddl.delivery_number is null ,0,lddl.delivery_number) + IF(lddl.inventory_nub is null ,0,lddl.inventory_nub)) > 0
+            lddl.is_deleted = 0 AND (IF(lddl.delivery_number is null ,0,lddl.delivery_number) + IF(lddl.inventory_nub is null ,0,lddl.inventory_nub)) > 0 AND lddl.customers_number > 0
             <if test="param.trainNumber != null and param.trainNumber!=''">
                 and lddl.train_number like concat('%',#{param.trainNumber},'%')
             </if>

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

@@ -1280,9 +1280,10 @@
 
     </select>
     <select id="selectReservationByDeliveryId">
-        SELECT ldr.* FROM logpm_distribution_signfor AS lds LEFT JOIN logpm_distribution_reservation AS ldr ON lds.reservation_id = ldr.id WHERE lds.delivery_id = #{deliveryId}
+        SELECT ldr.* FROM logpm_distribution_signfor AS lds LEFT JOIN logpm_distribution_reservation AS ldr ON lds.reservation_id = ldr.id
+        WHERE lds.delivery_id = #{deliveryId}
         AND ldr.reservation_status != 40
         AND ldr.is_deleted = 0
-        AND lds.is_ deleted = 0
+        AND lds.is_deleted = 0
     </select>
 </mapper>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillLadingService.java

@@ -214,4 +214,11 @@ public interface IDistrilbutionBillLadingService extends BaseService<Distrilbuti
 	R getReceivedImage(BillLadingAppDTO billLadingAppDTO);
 
 	boolean signImages(DistrilbutionBillLadingDTO distrilbutionBillLading);
+
+	/**
+	 * 批量取消自提单
+	 * @param billLodingIds
+	 * @return
+	 */
+	boolean cancelBillLoding(String billLodingIds);
 }

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

@@ -645,6 +645,12 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		return false;
 	}
 
+	@Override
+	public boolean cancelBillLoding(String billLodingIds) {
+
+		return false;
+	}
+
 	/**
 	 * 自提没有包件信息添加包件
 	 * @param stockArticleId