Merge branch 'dev' into pre-production

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

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

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

@@ -121,40 +121,35 @@
     </select>
 
     <select id="exportDistributionBillLading" resultType="com.logpm.distribution.vo.DistrilbutionBillLadingVO">
-        select dbl.id,
+        SELECT
-               dsa.service_number serviceNumber,
+        dbl.id,
-               dsa.waybill_number waybillNumber,
+        dsa.service_number AS serviceNumber,
-               dsa.consignee_unit consigneeUnit,
+        dsa.waybill_number AS waybillNumber,
-               dsa.customer_name customerName,
+        dsa.consignee_unit AS consigneeUnit,
-               dsa.customer_telephone customerTelephone,
+        dsa.customer_name AS customerName,
-               dsa.warehouse,
+        dsa.customer_telephone AS customerTelephone,
-               dsa.warehouse_entry_time warehouseEntryTime,
+        dsa.warehouse,
-               dsa.storage_fee storageFee,
+        dsa.warehouse_entry_time AS warehouseEntryTime,
-               dsa.total_number totalNumber,
+        dsa.storage_fee AS storageFee,
-               dbl.certificate_type certificateType,
+        (count(DISTINCT ldbp.id,0)+count(DISTINCT lddd.quantity,0)) AS totalNumber,
-               dsa.brand,
+        dbl.certificate_type AS certificateType,
-               dsa.type_service typeService,
+        dsa.brand,
-               dbl.pick_up_time pickUpTime,
+        dsa.type_service AS typeService,
-               dbl.consignee,
+        dbl.pick_up_time AS pickUpTime,
-               dbl.delivery_document deliveryDocument,
+        dbl.consignee,
-               dbl.conditions,
+        dbl.delivery_document AS deliveryDocument,
-               dbl.total_cost totalCost,
+        dbl.conditions,
-               dbl.pick_up_plate pickUpPlate,
+        dbl.total_cost AS totalCost,
-               dbl.pickup_batch pickupBatch,
+        dbl.pick_up_plate AS pickUpPlate,
-                (
+        dbl.pickup_batch AS pickupBatch,
-                select COUNT(lds.id)
+        count(DISTINCT ldbls.id ) AS stopNum
-                from logpm_distribution_delivery_details lddd
+        FROM
-                LEFT JOIN logpm_distribution_stock lds on lds.stock_list_id = lddd.stock_list_id
+        logpm_distrilbution_bill_lading dbl
-                where lddd.bill_lading_id = dbl.id
+        LEFT JOIN logpm_distrilbution_bill_stock AS ldbs ON ldbs.bill_lading_id = dbl.id AND ldbs.order_status != 3
-                ) + (
+        LEFT JOIN logpm_distribution_stock_article dsa ON ldbs.stock_article_id = dsa.id
-                select COUNT(lds.id)
+        LEFT JOIN logpm_distrilbution_bill_package AS ldbp ON ldbp.stock_article_id = dsa.id AND ldbp.bill_lading_id = dbl.id AND ldbp.packet_bar_status != 3
-                from logpm_distrilbution_bill_stock ldbs
+        LEFT JOIN logpm_distribution_delivery_details AS lddd ON   lddd.bill_lading_id = dbl.id AND lddd.inventory_status != 3
-                LEFT JOIN logpm_distribution_stock lds on lds.stock_article = ldbs.stock_article_id
+        LEFT JOIN logpm_distribution_bill_lading_scan ldbls ON ldbls.bill_lading_id = dbl.id
-                where ldbs.bill_lading_id = dbl.id
-                ) stopNum
-        from logpm_distrilbution_bill_lading dbl
-        LEFT JOIN logpm_distribution_stock_article dsa
-        on dbl.stock_article_id = dsa.id
         <where>
             dbl.is_deleted = 0
             <if test="param.serviceNumber != null and param.serviceNumber != ''">
@@ -219,6 +214,7 @@
             </if>
 
         </where>
+        GROUP BY dbl.id
     </select>
 
     <select id="selectDistrilbutionBillLadingPage" resultMap="distrilbutionBillLadingResultMap">

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

@@ -220,5 +220,5 @@ public interface IDistrilbutionBillLadingService extends BaseService<Distrilbuti
 	 * @param billLodingIds
 	 * @return
 	 */
-	boolean cancelBillLoding(String billLodingIds);
+	R cancelBillLoding(String billLodingIds);
 }

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

@@ -646,9 +646,35 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 	}
 
 	@Override
-	public boolean cancelBillLoding(String billLodingIds) {
+	public R cancelBillLoding(String billLodingIds) {
+		String method = "##########类DistrilbutionBillLadingServiceImpl执行方法cancelBillLoding,";
+		List<Long> ids = Func.toLongList(",", billLodingIds);
+		List<DistrilbutionBillLadingEntity> distrilbutionBillLadingEntities = this.listByIds(ids);
+		if (Func.isEmpty(distrilbutionBillLadingEntities)){
+			log.error(method+"查询自提单信息失败:{}",billLodingIds);
+			return R.fail("服务器正忙，请联系管理员!!!");
+		}
+		String errorBillLading = distrilbutionBillLadingEntities.stream().filter(f -> !f.getConditions().equals(BillLadingStatusConstant.daitihuo.getValue())).map(DistrilbutionBillLadingEntity::getPickupBatch).collect(Collectors.joining(","));
+		if (Func.isNotEmpty(errorBillLading)){
+			log.error(method+"存在已提货或签收自提单:{}",errorBillLading);
+			return R.fail(errorBillLading+"已提货或已签收!!!");
+		}
+		//查询是否存在自提扫描的有效包件
+		List<DistributionBillLadingScanEntity> ladingScanEntities = distributionBillLadingScanService.list(Wrappers.<DistributionBillLadingScanEntity>query().lambda()
+			.in(DistributionBillLadingScanEntity::getBillLadingId, ids)
+		);
+		if (Func.isNotEmpty(ladingScanEntities)){
+			log.error(method+"取消自提单存在自提扫描数据:{}",errorBillLading);
+			return R.fail(errorBillLading+"已提货或已签收!!!");
+		}
 
-		return false;
+		//满足进行取消自提，进行自提单的资源释放
+
+
+
+
+
+		return R.status(true);
 	}
 
 	/**