Merge branch 'refs/heads/dev' into chenglong

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

@@ -87,4 +87,7 @@ public class DistrilbutionBillLadingVO extends DistrilbutionBillLadingEntity {
 	private String otherFee;
 
 
+
+
+
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStoreContactServiceImpl.java

@@ -158,7 +158,7 @@ public class BasicdataStoreContactServiceImpl extends BaseServiceImpl<BasicdataS
 		String content = "";
 		if (Objects.isNull(basicdataStoreContact.getId())){
 			//新增
-			content = "新增品牌-->["+basicdataStoreContact.getLinkman()+"]";
+			content = "新增联系人-->["+basicdataStoreContact.getLinkman()+"]";
 		}else {
 			//修改
 			BasicdataStoreContactEntity contactEntity = this.getById(basicdataStoreContact.getId());

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTripartiteMallServiceImpl.java

@@ -118,7 +118,7 @@ public class BasicdataTripartiteMallServiceImpl extends BaseServiceImpl<Basicdat
 		basicdataClientLogEntity.setOperator(AuthUtil.getNickName());
 		String content = "";
 		if (Objects.isNull(basicdataTripartiteMall.getId())) {
-			String str = basicdataTripartiteMall.getTripartiteCoding().isEmpty() ? "空" : basicdataTripartiteMall.getTripartiteCoding();
+			String str = Func.isEmpty(basicdataTripartiteMall.getTripartiteCoding()) ? "空" : basicdataTripartiteMall.getTripartiteCoding();
 			//新增
 			content = "新增三方商场-->[名称:" + basicdataTripartiteMall.getTripartiteMall() + ",编码:" + str + ",品牌:" + basicdataTripartiteMall.getBrandName() + "]";
 			basicdataClientLogEntity.setContent(content);

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

@@ -138,20 +138,26 @@ public class DistrilbutionBillLadingController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入distrilbutionBillLading")
 	public R<IPage<DistrilbutionBillLadingVO>> listOwn(@ApiIgnore @RequestParam Map<String, Object> distrilbutionBillLading, Query query) {
-		IPage<DistrilbutionBillLadingVO> pages = distrilbutionBillLadingService.pageList(Condition.getPage(query), distrilbutionBillLading);
-		List<DistrilbutionBillLadingVO> records = pages.getRecords();
-		records.forEach( i ->{
-			i.setTypeServiceName(DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE, i.getTypeService()));
-			i.setCertificateTypeName(DictBizCache.getValue(DictBizConstant.CERTIFICATE_TYPE, i.getCertificateType()));
-			//查询图片数据
-			// 遍历BillLadingStatusConstant的所有枚举值
-			Arrays.stream(BillLadingStatusConstant.values())
-				.filter(ii -> i.getConditions().equals(ii.getValue())) // 根据条件过滤
-				.findFirst() // 找到第一个匹配的枚举值
-				.ifPresent(ii -> i.setConditionName(ii.getName())); // 修改属性值（如果有匹配的枚举值）
-
-		});
-		return R.data(pages);
+		try {
+			IPage<DistrilbutionBillLadingVO> pages = distrilbutionBillLadingService.pageList(Condition.getPage(query), distrilbutionBillLading);
+			List<DistrilbutionBillLadingVO> records = pages.getRecords();
+			records.forEach( i ->{
+				i.setTypeServiceName(DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE, i.getTypeService()));
+				i.setCertificateTypeName(DictBizCache.getValue(DictBizConstant.CERTIFICATE_TYPE, i.getCertificateType()));
+				//查询图片数据
+				// 遍历BillLadingStatusConstant的所有枚举值
+				Arrays.stream(BillLadingStatusConstant.values())
+					.filter(ii -> i.getConditions().equals(ii.getValue())) // 根据条件过滤
+					.findFirst() // 找到第一个匹配的枚举值
+					.ifPresent(ii -> i.setConditionName(ii.getName())); // 修改属性值（如果有匹配的枚举值）
+
+			});
+			return R.data(pages);
+		}catch (Exception e){
+			log.error(e.getMessage(), e);
+		}
+		return R.data(null);
+
 	}
 
 	/**

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

@@ -179,6 +179,8 @@ public class DistrilbutionBillLadingDTO extends DistrilbutionBillLadingEntity {
 	private String packageIds;
 	// 1 不是零担 2 是零担
 	private String zeroType;
+	private String pickUpTimeStart;
+	private String pickUpTimeEnd;
 
 	@Data
 	public static  class Print{

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

@@ -365,6 +365,8 @@
         association_value ) AS t2 ON t.cargo_number = t2.association_value
         where ldslNew.is_deleted = 0
         AND ldslNew.warehouse_id=#{warehouseId}
+        GROUP BY
+        ldslNew.cargo_number
     </select>
 
     <select id="selectOrderNumByReservationId" resultType="Integer">

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

@@ -180,6 +180,15 @@ public interface DistrilbutionBillLadingMapper extends BaseMapper<DistrilbutionB
 	 */
 	List<SignPushDataUnitDTO> selectPushOldInventorySigning(@Param("id")Long billId);
 
+	/**
+	 * 查询视图
+	 * @param page
+	 * @param distrilbutionBillLadingDTO
+	 * @param collect
+	 * @return
+	 */
+	IPage<DistrilbutionBillLadingVO> getAllBillLadingByView(IPage<Object> page,@Param("param") DistrilbutionBillLadingDTO distrilbutionBillLadingDTO, List<Long> collect);
+
 //	Page<DistrilbutionBillLadingAppVO> getInventoryPage(IPage<Object> page, DistrilbutionBillLadingEntity distrilbutionBillLadingEntity);
 
 }

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

@@ -172,6 +172,12 @@
             <if test="param.pickupBatch != null and param.pickupBatch != ''">and dbl.pickup_batch like
                 concat('%',#{param.pickupBatch},'%')
             </if>
+            <if test="param.pickUpTime != null ">and
+                DATE_FORMAT(pick_up_time,'%y%m%d') = DATE_FORMAT(#{param.pickUpTime},'%y%m%d')
+            </if>
+            <if test="param.pickUpTimeStart != null">and
+                AND DATE_FORMAT(pick_up_time,'%y%m%d') BETWEEN DATE_FORMAT(#{param.pickUpTimeStart},'%y%m%d') AND DATE_FORMAT(#{param.pickUpTimeEnd},'%y%m%d')
+            </if>
             <if test="collect != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(collect)">
                 and dbl.warehouse_id in
                 <foreach collection="collect" item="item" open="(" close=")" separator=",">
@@ -181,9 +187,6 @@
             <if test="param.warehouseEntryTime != null ">and date(t.warehouseEntryTime) =
                 #{param.warehouseEntryTime}
             </if>
-            <if test="param.pickUpTime != null ">and date(dbl.pick_up_time) =
-                #{param.pickUpTime}
-            </if>
             <if test="param.startDate != null ">and t.warehouseEntryTime between #{param.startDate} and
                 #{param.entDate}
             </if>
@@ -982,6 +985,29 @@
         GROUP BY
         ldsld.id
     </select>
+    <select id="getAllBillLadingByView" resultType="com.logpm.distribution.vo.DistrilbutionBillLadingVO">
+        SELECT 	id,
+        orderCode,
+        serviceNumber,
+        consigneeUnit,
+        customerName,
+        customerTelephone,
+        waybillNumber,
+        typeService,
+        warehouseEntryTime,
+        storageFee,
+        totalNumber,
+        certificateType,
+        pickUpTime,
+        consignee,
+        deliveryDocument,
+        conditions,
+        totalCost,
+        pickUpPlate,
+        pickupBatch,
+        stopNum,
+        productInformation  FROM bill_lading_view
+    </select>
 
 
 </mapper>

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

@@ -131,11 +131,11 @@
         END handQuantity,
         (select IFNULL(sum(quantity) ,0) from  logpm_distribution_bill_lading_scan
         where  stock_article_id = ldsa.id AND bill_lading_id =  #{param.billLadingId}  AND is_deleted = 0 ) pick_up_quantity,
-        CASE
-        WHEN (SELECT COUNT(id) FROM logpm_distribution_bill_lading_scan WHERE stock_article_id = ldsa.id AND is_deleted = 0) - (SELECT COUNT(id) FROM logpm_distrilbution_bill_package WHERE stock_article_id = ldsa.id AND packet_bar_status IN (1,3) AND is_deleted = 0) = 0 THEN '30'
-        WHEN (SELECT COUNT(id) FROM logpm_distribution_bill_lading_scan WHERE stock_article_id = ldsa.id AND is_deleted = 0) = 0 THEN '10'
-        WHEN (SELECT COUNT(id) FROM logpm_distribution_bill_lading_scan WHERE stock_article_id = ldsa.id AND is_deleted = 0) - (SELECT COUNT(id) FROM logpm_distrilbution_bill_package WHERE stock_article_id = ldsa.id AND packet_bar_status IN (1,3) AND is_deleted = 0) <  0 THEN '20'
-        END AS conditions,
+        CASE ldsa.is_zero
+        WHEN 1 THEN	 IF(( SELECT IFNULL(SUM(quantity),0) FROM logpm_distribution_bill_lading_scan WHERE stock_article_id = ldsa.id AND is_deleted = 0 ) - ( SELECT IFNULL(quantity,0) FROM logpm_distribution_reservation_zero_package WHERE stock_article_id = ldsa.id AND zero_package_status IN ( 1, 3 ) AND is_deleted = 0 ) = 0,'30',IF(( SELECT IFNULL(quantity,0) FROM logpm_distribution_bill_lading_scan WHERE stock_article_id = ldsa.id AND is_deleted = 0 ) = 0,'10','20'))
+        ELSE
+        IF(( SELECT count( id ) FROM logpm_distribution_bill_lading_scan WHERE stock_article_id = ldsa.id AND is_deleted = 0 ) - ( SELECT count( id ) FROM logpm_distrilbution_bill_package WHERE stock_article_id = ldsa.id AND packet_bar_status IN ( 1, 3 ) AND is_deleted = 0 ) = 0,'30',IF(( SELECT IFNULL(quantity,0) FROM logpm_distribution_bill_lading_scan WHERE stock_article_id = ldsa.id AND is_deleted = 0 ) = 0,'10','20'))
+        END conditions,
         (select GROUP_CONCAT(DISTINCT ldpl.material_name )
         from logpm_distribution_parcel_list ldpl
         where  ldpl.material_name is not null and ldpl.stock_article_id = ldbs.stock_article_id)   materialName,

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

@@ -1854,7 +1854,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 			List<Long> ids = list.stream().map(DistrilbutionBillPackageEntity::getParceListId).collect(Collectors.toList());
 			//查询包件
 			List<DistributionParcelListEntity> distributionParcelListEntities = distributionParcelListService.listByIds(ids);
-			List<Long> packageIds = distributionParcelListEntities.stream().filter(f -> OrderPackageLoadingStatusConstant.yizhuangche.getValue().equals(f.getOrderPackageLoadingStatus()) || !OrderPackageStatusConstant.yiqianshou.getValue().equals(f.getOrderPackageStatus())).map(DistributionParcelListEntity::getId).collect(Collectors.toList());
+			List<Long> packageIds = distributionParcelListEntities.stream().filter(f -> !OrderPackageLoadingStatusConstant.yizhuangche.getValue().equals(f.getOrderPackageLoadingStatus()) || !OrderPackageStatusConstant.yiqianshou.getValue().equals(f.getOrderPackageStatus())).map(DistributionParcelListEntity::getId).collect(Collectors.toList());
 			if (Func.isNotEmpty(packageIds)) {
 				distributionParcelListService.update(new UpdateWrapper<DistributionParcelListEntity>().lambda()
 					.set(DistributionParcelListEntity::getOrderPackageReservationStatus, OrderPackageReservationStatusConstant.daiyuyue.getValue())

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

@@ -2353,18 +2353,20 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 
 		List<Long> collect = null;
 
-
+		IPage<DistrilbutionBillLadingVO> distrilbutionBillLadingVOIPage = null;
 		if (Func.isNotEmpty(myCurrentWarehouse)) {
 			collect = new ArrayList<>();
 			collect.add(myCurrentWarehouse.getId());
+			 distrilbutionBillLadingVOIPage = baseMapper.pageList(page, distrilbutionBillLadingDTO, collect);
+
 		} else {
+			distrilbutionBillLadingVOIPage = baseMapper.getAllBillLadingByView(page, distrilbutionBillLadingDTO, collect);
 			collect = warehouseList.stream()
 				.map(BasicdataWarehouseEntity::getId)
 				.collect(Collectors.toList());
 		}
 
 
-		IPage<DistrilbutionBillLadingVO> distrilbutionBillLadingVOIPage = baseMapper.pageList(page, distrilbutionBillLadingDTO, collect);
 		List<DistrilbutionBillLadingVO> records = distrilbutionBillLadingVOIPage.getRecords();
 
 		// 获取所有的提货单ID
@@ -2403,8 +2405,11 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		records.forEach(i -> {
 			if (groupedEntities != null) {
 				List<DistributionDeliveryChargeEntity> list = groupedEntities.get(i.getId());
-				list.forEach(ii -> ii.setCostName(DictBizCache.getValue(DictBizConstant.DELIVERY_COST, ii.getCost())));
-				i.setList(list);
+				if (!Func.isEmpty(groupedEntities.get(i.getId()))){
+					list.forEach(ii -> ii.setCostName(DictBizCache.getValue(DictBizConstant.DELIVERY_COST, ii.getCost())));
+					i.setList(list);
+				}
+
 			}
 			if (groupDistributionPrintEntityEntities != null) {
 				List<DistributionPrintEntity> list1 = groupDistributionPrintEntityEntities.get(i.getId());

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

@@ -53,6 +53,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -254,6 +255,7 @@ public class DistrilbutionBillStockServiceImpl extends BaseServiceImpl<Distrilbu
 			.ne(DistrilbutionBillStockEntity::getOrderStatus, "2")
 		);
 		List<Long> ids = new ArrayList<>();
+		List<Long> completeIds = new ArrayList<>();
 		if (Func.isNotEmpty(entityList)){
 			for (DistrilbutionBillStockEntity distrilbutionBillStockEntity : entityList) {
 				List<DistrilbutionBillPackageEntity> packageEntities = distrilbutionBillPackageService.list(Wrappers.<DistrilbutionBillPackageEntity>query().lambda()
@@ -266,9 +268,13 @@ public class DistrilbutionBillStockServiceImpl extends BaseServiceImpl<Distrilbu
 					ids.add(distrilbutionBillStockEntity.getId());
 				}else {
 					int sum = packageEntities.stream().mapToInt(DistrilbutionBillPackageEntity::getPacketNumber).sum();
+					int planNum = packageEntities.stream().mapToInt(DistrilbutionBillPackageEntity::getPacketNumber).sum();
 					if (sum == 0){
 						ids.add(distrilbutionBillStockEntity.getId());
 					}
+					if (Objects.equals(sum,planNum)){
+						completeIds.add(distrilbutionBillStockEntity.getId());
+					}
 				}
 			}
 		}
@@ -278,6 +284,12 @@ public class DistrilbutionBillStockServiceImpl extends BaseServiceImpl<Distrilbu
 				.in(DistrilbutionBillStockEntity::getId, ids)
 			);
 		}
+		if (Func.isNotEmpty(completeIds)){
+			this.update(new UpdateWrapper<DistrilbutionBillStockEntity>().lambda()
+				.set(DistrilbutionBillStockEntity::getConditions, "30")
+				.in(DistrilbutionBillStockEntity::getId, completeIds)
+			);
+		}
 	}
 
 	@Override

blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java

@@ -196,7 +196,7 @@ public class ReportDeliverServiceImpl implements ReportDeliverService {
 		trainCustomQuery(query, queryWrapper);
 		// 仓库权限
 		ReportUtil.buildReportWarehouseAuth(vo.getWarehouseName(), query.getWarehouseNameRange(), queryWrapper, warehouseClient);
-		reportExcelUtil.export(response, deliveryTrainReader, ReportDevilerVO.class, queryWrapper, "配送车次维度报表");
+		reportExcelUtil.export(response, deliveryTrainReader, ReportDevilerVO.class, queryWrapper, "配送车次维度报表",20L, ReportExcelUtil.SHEETDATANUM);
 	}
 
 	@Override