Merge branch 'dev' into pre-production

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceMapper.xml

@@ -29,7 +29,7 @@
         and lbsb.brand_id = t.brand_id and t.effective_time  <![CDATA[ <= ]]>  now() and t.expiry_time >= now()
         left join logpm_basicdata_brand ldb on ldb.id = lbsb.brand_id
         left join logpm_basicdata_price_template lbpt on t.template_id = lbpt.id
-        where lbsb.is_deleted = 0 and cli.is_deleted = 0 and t.is_deleted = 0
+        where lbsb.is_deleted = 0 and cli.is_deleted = 0  and (t.is_deleted = 0 or t.id is null)
         <if test="basicdataPrice.clientName != null and basicdataPrice.clientName != ''">
             and cli.client_name like concat('%',#{basicdataPrice.clientName},'%')
         </if>

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

@@ -1127,7 +1127,7 @@
         LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldla.package_id = ldpl.id
         WHERE
         ldla.reservation_id = #{reservationId} and ldl.reservation_id = #{reservationId} and ldla.delivery_list_id =
-        #{deliveryListId} AND ldl.scan_status != 1 AND ldl.is_deleted = 0
+        #{deliveryListId} AND ldl.scan_status != 1 AND ldl.is_deleted = 0 AND ldla.is_deleted = 0
     </select>
     <select id="selectSignImgsUrl" resultType="com.logpm.distribution.vo.DistributionSignPrintVO">
         SELECT * FROM logpm_distribution_sign_print WHERE reservation_id = #{reservationId} and is_deleted = 0

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

@@ -3303,6 +3303,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 										boolean isExit = checkList(list, reservationEntity.getId(), reservationStockarticleEntity.getStockArticleId(), p.getOrderPackageCode());
 										log.info(">>>>> 修改计划 验证包件是否存在 {}", isExit);
 										if (!isExit) {
+											list.add(reservationPackageEntity);
 											distributionReservationPackageService.save(reservationPackageEntity);
 											distributionAsyncService.checkStockArticleReservationStatus(p);
 											packageLockIds.add(p.getId());
@@ -3353,7 +3354,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 										JSONObject js = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), parcelListEntity.getOrderPackageCode(), content, WorkNodeEnums.PLAN_DISTRIBUTION.getCode());
 										logs.add(js);
 									});
-
 								}
 							} else {
 								//查找该订单没有进行包件选择的操作，  但是存在newOrder列表中  视为该订单保持计划选择

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

@@ -5736,7 +5736,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				if (loadscanEntity.getSignforState().equals(LoadScanSigningStatusConstant.yiqianshou.getValue())) {
 					//已经进行签收了  这里就需要将异常签收的状态变更为正常
 					loadscanEntity.setIsAbnormalSigning(1);
-					loadscanEntity.setIsAbnormalLoading(1);
 				}
 				distributionLoadscanService.updateById(loadscanEntity);
 			}
@@ -5814,6 +5813,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		//维护包件的预约状态
 		DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(distributionLoadscanAbnormalEntity.getPackageId());
 		parcelListEntity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.yiyueyue.getValue());
+		parcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue());
 		distributionParcelListService.updateById(parcelListEntity);
 		distributionLoadscanAbnormalEntity.setAuditingStatus(2);
 		distributionLoadscanAbnormalEntity.setAuditingTime(new Date());

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml

@@ -407,9 +407,8 @@
         END driver_signing,
         ldl.scan_time unload_time,
         ldl.scan_user un_administrators_name,
-
+        ldl.signing_time sjsigning_time,
-        lds.sjsigning_time sjsigning_time,
+        ldl.signing_user lds_signee_name,
-        lds.signee_name lds_signee_name,
         CASE
 
         WHEN lds.signing_status = 1 THEN

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

@@ -56,7 +56,9 @@ public class ReportBillLoadingAsyncService implements IReportBillLoadingAsyncSer
 
 	@Override
 	public IPage<BillLoadingTasksVO> tasksPage(BillLoadingTasksVO vo, BillLoadingTasksQuery query) {
-		ReportUtil.dateIsWithinOneMonth(vo.getCreatedTime(), query.getStartCreatedTime(), query.getEndCreatedTime(), "提货时间");
+		if(ReportUtil.areAllPropertiesEmpty(vo)) {
+			ReportUtil.dateIsWithinOneMonth(vo.getCreatedTime(), query.getStartCreatedTime(), query.getEndCreatedTime(), "提货时间");
+		}
 		IPage<BillLoadingTasksVO> page = Condition.getPage(query);
 		QueryWrapper<BillLoadingTasksVO> queryWrapper = QueryUtil.buildQueryWrapper(vo, BillLoadingTasksVO.class);
 		tasksCustomQuery(query, queryWrapper);
@@ -82,7 +84,9 @@ public class ReportBillLoadingAsyncService implements IReportBillLoadingAsyncSer
 
 	@Override
 	public void exportTasks(HttpServletResponse response, BillLoadingTasksVO vo, BillLoadingTasksQuery query) {
-		ReportUtil.dateIsWithinOneMonth(vo.getCreatedTime(), query.getStartCreatedTime(), query.getEndCreatedTime(), "提货时间");
+		if(ReportUtil.areAllPropertiesEmpty(vo)){
+		    ReportUtil.dateIsWithinOneMonth(vo.getCreatedTime(), query.getStartCreatedTime(), query.getEndCreatedTime(), "提货时间");
+		}
 		QueryWrapper<BillLoadingTasksVO> queryWrapper = QueryUtil.buildQueryWrapper(vo, BillLoadingTasksVO.class);
 		tasksCustomQuery(query, queryWrapper);
 		// 仓库权限
@@ -92,7 +96,9 @@ public class ReportBillLoadingAsyncService implements IReportBillLoadingAsyncSer
 
 	@Override
 	public IPage<BillLoadingDetailsVO> detailsPage(BillLoadingDetailsVO vo, BillDetailsQuery query) {
-		ReportUtil.dateIsWithinOneMonth(vo.getScanTime(), query.getStartScanTime(), query.getEndScanTime(), "提货扫描时间");
+		if(ReportUtil.areAllPropertiesEmpty(vo)) {
+			ReportUtil.dateIsWithinOneMonth(vo.getScanTime(), query.getStartScanTime(), query.getEndScanTime(), "提货扫描时间");
+		}
 		IPage<BillLoadingDetailsVO> page = Condition.getPage(query);
 		QueryWrapper<BillLoadingDetailsVO> queryWrapper = QueryUtil.buildQueryWrapper(vo, BillLoadingDetailsVO.class);
 		// 自定义查询
@@ -146,7 +152,9 @@ public class ReportBillLoadingAsyncService implements IReportBillLoadingAsyncSer
 
 	@Override
 	public void exportDetails(HttpServletResponse response, BillLoadingDetailsVO vo, BillDetailsQuery query) {
-		ReportUtil.dateIsWithinOneMonth(vo.getScanTime(), query.getStartScanTime(), query.getEndScanTime(), "提货扫描时间");
+		if(ReportUtil.areAllPropertiesEmpty(vo)) {
+			ReportUtil.dateIsWithinOneMonth(vo.getScanTime(), query.getStartScanTime(), query.getEndScanTime(), "提货扫描时间");
+		}
 		QueryWrapper<BillLoadingDetailsVO> queryWrapper = QueryUtil.buildQueryWrapper(vo, BillLoadingDetailsVO.class);
 		detailsCustomQuery(query, queryWrapper);
 		// 仓库权限

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

@@ -58,7 +58,9 @@ public class ReportDeliverServiceImpl implements ReportDeliverService {
 	@Override
 	public IPage<ReportDevilerVO> deliveryTrainPage(ReportDevilerVO vo, ReportDevilerQuery query) {
 		// 校验时间
-		ReportUtil.dateIsWithinOneMonth(vo.getTaskTime(), query.getStartTaskTime(), query.getEndTaskTime(), "配送日期");
+		if(ReportUtil.areAllPropertiesEmpty(vo)){
+			ReportUtil.dateIsWithinOneMonth(vo.getTaskTime(), query.getStartTaskTime(), query.getEndTaskTime(), "配送日期");
+		}
 		IPage<ReportDevilerVO> page = Condition.getPage(query);
 		QueryWrapper<ReportDevilerVO> queryWrapper = QueryUtil.buildQueryWrapper(vo, ReportDevilerVO.class);
 		// 自定义 sql 查询条件
@@ -92,7 +94,9 @@ public class ReportDeliverServiceImpl implements ReportDeliverService {
 	@Override
 	public void exportTrain(HttpServletResponse response, ReportDevilerVO vo, ReportDevilerQuery query) {
 		// 添加时间校验
-		ReportUtil.dateIsWithinOneMonth(vo.getTaskTime(), query.getStartTaskTime(), query.getEndTaskTime(), "配送日期");
+		if(ReportUtil.areAllPropertiesEmpty(vo)){
+			ReportUtil.dateIsWithinOneMonth(vo.getTaskTime(), query.getStartTaskTime(), query.getEndTaskTime(), "配送日期");
+		}
 		QueryWrapper<ReportDevilerVO> queryWrapper = QueryUtil.buildQueryWrapper(vo, ReportDevilerVO.class);
 		trainCustomQuery(query, queryWrapper);
 		// 仓库权限
@@ -103,7 +107,9 @@ public class ReportDeliverServiceImpl implements ReportDeliverService {
 	@Override
 	public IPage<ReportCustomerVO> customerPage(ReportCustomerVO vo, ReportCustomerQuery query) {
 		// 添加时间校验
-		ReportUtil.dateIsWithinOneMonth(vo.getTaskTime(), query.getStartTaskTime(), query.getEndTaskTime(), "配送日期");
+		if(ReportUtil.areAllPropertiesEmpty(vo)){
+			ReportUtil.dateIsWithinOneMonth(vo.getTaskTime(), query.getStartTaskTime(), query.getEndTaskTime(), "配送日期");
+		}
 		// 构建前端查询参数
 		IPage<ReportCustomerVO> page = Condition.getPage(query);
 		QueryWrapper<ReportCustomerVO> queryWrapper = QueryUtil.buildQueryWrapper(vo, ReportCustomerVO.class);
@@ -136,7 +142,9 @@ public class ReportDeliverServiceImpl implements ReportDeliverService {
 	@Override
 	public void exportCustomer(HttpServletResponse response, ReportCustomerVO vo, ReportCustomerQuery query) {
 		// 添加时间校验
-		ReportUtil.dateIsWithinOneMonth(vo.getTaskTime(), query.getStartTaskTime(), query.getEndTaskTime(), "配送日期");
+		if(ReportUtil.areAllPropertiesEmpty(vo)) {
+			ReportUtil.dateIsWithinOneMonth(vo.getTaskTime(), query.getStartTaskTime(), query.getEndTaskTime(), "配送日期");
+		}
 		QueryWrapper<ReportCustomerVO> queryWrapper = QueryUtil.buildQueryWrapper(vo, ReportCustomerVO.class);
 		customerCustomQuery(query, queryWrapper);
 		// 仓库权限
@@ -147,7 +155,9 @@ public class ReportDeliverServiceImpl implements ReportDeliverService {
 	@Override
 	public IPage<ReportDetailVO> detailsPage(ReportDetailVO vo, DevilerDetailsQuery query) {
 		// 添加时间校验
-		ReportUtil.dateIsWithinOneMonth(vo.getTaskTime(), query.getStartTaskTime(), query.getEndTaskTime(), "配送日期");
+		if(ReportUtil.areAllPropertiesEmpty(vo)) {
+			ReportUtil.dateIsWithinOneMonth(vo.getTaskTime(), query.getStartTaskTime(), query.getEndTaskTime(), "配送日期");
+		}
 		Integer current = query.getCurrent();
 		Integer size = query.getSize();
 		IPage<ReportDetailVO> page = Condition.getPage(query);
@@ -201,7 +211,9 @@ public class ReportDeliverServiceImpl implements ReportDeliverService {
 	@Override
 	public void exportDetails(HttpServletResponse response, ReportDetailVO vo, DevilerDetailsQuery query) {
 		// 添加时间校验
-		ReportUtil.dateIsWithinOneMonth(vo.getTaskTime(), query.getStartTaskTime(), query.getEndTaskTime(), "配送日期");
+		if(ReportUtil.areAllPropertiesEmpty(vo)) {
+			ReportUtil.dateIsWithinOneMonth(vo.getTaskTime(), query.getStartTaskTime(), query.getEndTaskTime(), "配送日期");
+		}
 		QueryWrapper<ReportDetailVO> queryWrapper = QueryUtil.buildQueryWrapper(vo, ReportDetailVO.class);
 		detailsCustomQuery(query, queryWrapper);
 		// 仓库权限

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

@@ -78,7 +78,9 @@ public class ReportStockServiceImpl implements ReportStockService {
 
 	@Override
 	public IPage<ReportInStockVO> inStocks(ReportInStockVO vo, StockInQuery query) {
-		ReportUtil.dateIsWithinOneMonth(vo.getWarehousingTime(), query.getStartWarehousingTime(), query.getEndWarehousingTime(), "入库时间");
+		if(ReportUtil.areAllPropertiesEmpty(vo)) {
+			ReportUtil.dateIsWithinOneMonth(vo.getWarehousingTime(), query.getStartWarehousingTime(), query.getEndWarehousingTime(), "入库时间");
+		}
 		IPage<ReportInStockVO> page = Condition.getPage(query);
 		QueryWrapper<ReportInStockVO> queryWrapper = QueryUtil.buildQueryWrapper(vo, ReportInStockVO.class);
 		inStocksCustomQuery(query, queryWrapper);
@@ -120,7 +122,9 @@ public class ReportStockServiceImpl implements ReportStockService {
 
 	@Override
 	public void exportInStocks(HttpServletResponse response, ReportInStockVO vo, StockInQuery query) {
-		ReportUtil.dateIsWithinOneMonth(vo.getWarehousingTime(), query.getStartWarehousingTime(), query.getEndWarehousingTime(), "入库时间");
+		if(ReportUtil.areAllPropertiesEmpty(vo)) {
+			ReportUtil.dateIsWithinOneMonth(vo.getWarehousingTime(), query.getStartWarehousingTime(), query.getEndWarehousingTime(), "入库时间");
+		}
 		QueryWrapper<ReportInStockVO> queryWrapper = QueryUtil.buildQueryWrapper(vo, ReportInStockVO.class);
 		inStocksCustomQuery(query, queryWrapper);
 		ReportUtil.buildReportWarehouseAuth(vo.getWarehouseName(), query.getWarehouseNameRange(), queryWrapper, warehouseClient);
@@ -129,7 +133,9 @@ public class ReportStockServiceImpl implements ReportStockService {
 
 	@Override
 	public IPage<ReportOutStockVO> outStocks(ReportOutStockVO vo, StockOutQuery query) {
-		ReportUtil.dateIsWithinOneMonth(vo.getCreateTime(), query.getStartCreateTime(), query.getEndCreateTime(), "出库时间");
+		if(ReportUtil.areAllPropertiesEmpty(vo)) {
+			ReportUtil.dateIsWithinOneMonth(vo.getCreateTime(), query.getStartCreateTime(), query.getEndCreateTime(), "出库时间");
+		}
 		IPage<ReportOutStockVO> page = Condition.getPage(query);
 		QueryWrapper queryWrapper = QueryUtil.buildQueryWrapper(vo, ReportOutStockVO.class);
 		outStocksCustomQuery(query, queryWrapper);
@@ -155,7 +161,9 @@ public class ReportStockServiceImpl implements ReportStockService {
 
 	@Override
 	public void exportOutStocks(HttpServletResponse response, ReportOutStockVO vo, StockOutQuery query) {
-		ReportUtil.dateIsWithinOneMonth(vo.getCreateTime(), query.getStartCreateTime(), query.getEndCreateTime(), "出库时间");
+		if(ReportUtil.areAllPropertiesEmpty(vo)) {
+			ReportUtil.dateIsWithinOneMonth(vo.getCreateTime(), query.getStartCreateTime(), query.getEndCreateTime(), "出库时间");
+		}
 		QueryWrapper queryWrapper = QueryUtil.buildQueryWrapper(vo, ReportOutStockVO.class);
 		outStocksCustomQuery(query, queryWrapper);
 		ReportUtil.buildReportWarehouseAuth(vo.getWarehouseName(), query.getWarehouseNameRange(), queryWrapper, warehouseClient);

blade-service/logpm-report/src/main/java/com/logpm/report/util/ReportUtil.java

@@ -9,9 +9,13 @@ import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import org.springblade.core.log.exception.ServiceException;
 
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * 报表工具类
@@ -60,14 +64,34 @@ public class ReportUtil {
 	}
 
 	public static void dateIsWithinOneMonth(String taskTime, Date startTaskTime, Date endTaskTime, String title) {
-		// if (ObjectUtil.isEmpty(taskTime)) {
+		if (ObjectUtil.isEmpty(taskTime)) {
-		if (ObjectUtil.isAllNotEmpty(startTaskTime, endTaskTime)) {
 			boolean withinOneMonth = isWithinOneMonth(startTaskTime, endTaskTime);
 			if (!withinOneMonth) {
 				throw new ServiceException(title + "必选且时间不超过一个月");
 			}
 		}
-		// }
+	}
+
+	public static boolean areAllPropertiesEmpty(Object obj) {
+		if (obj == null) return true;
+		return Stream.of(obj.getClass().getDeclaredFields())
+			.filter(field -> !field.getName().equals("serialVersionUID"))
+			.peek(field -> field.setAccessible(true)) // 设置所有字段可访问
+			.allMatch(field -> {
+				Object value = null;
+				try {
+					value = field.get(obj);
+				} catch (IllegalAccessException e) {
+					throw new RuntimeException(e);
+				}
+				if (value == null) return true;
+				if (value instanceof String) return ((String) value).isEmpty();
+				if (value instanceof Collection) return ((Collection<?>) value).isEmpty();
+				if (value instanceof Map) return ((Map<?, ?>) value).isEmpty();
+				if (value.getClass().isArray()) return Arrays.asList((Object[]) value).isEmpty();
+				// 对于基本类型或其他不可空类型，你可能需要返回 false 或进行更详细的检查
+				return false;
+			});
 	}
 
 }