diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceMapper.xml
index af20944e5..5169d0b2b 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceMapper.xml
+++ b/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 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)
and cli.client_name like concat('%',#{basicdataPrice.clientName},'%')
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
index afc7f9ece..c4237a77b 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
+++ b/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 * FROM logpm_distribution_sign_print WHERE reservation_id = #{reservationId} and is_deleted = 0
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
index 75e06b4a5..de298abb5 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
@@ -3303,6 +3303,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl>>>> 修改计划 验证包件是否存在 {}", 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 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 page = Condition.getPage(query);
QueryWrapper 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 queryWrapper = QueryUtil.buildQueryWrapper(vo, BillLoadingTasksVO.class);
tasksCustomQuery(query, queryWrapper);
// 仓库权限
@@ -92,7 +96,9 @@ public class ReportBillLoadingAsyncService implements IReportBillLoadingAsyncSer
@Override
public IPage 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 page = Condition.getPage(query);
QueryWrapper 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 queryWrapper = QueryUtil.buildQueryWrapper(vo, BillLoadingDetailsVO.class);
detailsCustomQuery(query, queryWrapper);
// 仓库权限
diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java
index 5130be9c2..f9a4ecefb 100644
--- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java
+++ b/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 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 page = Condition.getPage(query);
QueryWrapper 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 queryWrapper = QueryUtil.buildQueryWrapper(vo, ReportDevilerVO.class);
trainCustomQuery(query, queryWrapper);
// 仓库权限
@@ -103,7 +107,9 @@ public class ReportDeliverServiceImpl implements ReportDeliverService {
@Override
public IPage 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 page = Condition.getPage(query);
QueryWrapper 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 queryWrapper = QueryUtil.buildQueryWrapper(vo, ReportCustomerVO.class);
customerCustomQuery(query, queryWrapper);
// 仓库权限
@@ -147,7 +155,9 @@ public class ReportDeliverServiceImpl implements ReportDeliverService {
@Override
public IPage 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 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 queryWrapper = QueryUtil.buildQueryWrapper(vo, ReportDetailVO.class);
detailsCustomQuery(query, queryWrapper);
// 仓库权限
diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportStockServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportStockServiceImpl.java
index e98e9fa06..23f93bd73 100644
--- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportStockServiceImpl.java
+++ b/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 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 page = Condition.getPage(query);
QueryWrapper 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 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 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 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);
diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/util/ReportUtil.java b/blade-service/logpm-report/src/main/java/com/logpm/report/util/ReportUtil.java
index 56eb10c0a..c92e59209 100644
--- a/blade-service/logpm-report/src/main/java/com/logpm/report/util/ReportUtil.java
+++ b/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.isAllNotEmpty(startTaskTime, endTaskTime)) {
+ if (ObjectUtil.isEmpty(taskTime)) {
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;
+ });
}
}