Merge branch 'dev' into pre-production

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

@@ -28,11 +28,11 @@
                      end                                               service_type,
                      t.cargo_number,
                      t.description_goods,
-                     t.quantity_stock,
+                    t.quantity_stock +  t.outbound_quantity quantity_stock,
-                     t.outbound_quantity,
+                    t.outbound_quantity,
-                     t.quantity_stock - t.outbound_quantity                       current_quantity,
+                    t.quantity_stock                      current_quantity,
-                     t.quantity_occupied,
+                    t.quantity_occupied,
-                     t.quantity_stock - t.outbound_quantity - t.quantity_occupied usable_quantity,
+                    t.quantity_stock - t.quantity_occupied usable_quantity,
                      lwug.allocation_title
               from logpm_distribution_stock_list t
                        left join (select group_concat(t.allocation_title) allocation_title, t.association_value

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

@@ -250,8 +250,13 @@ public class ReportDeliverServiceImpl implements ReportDeliverService {
 	@Override
 	public IPage<ReportDetailVO> detailsPage(ReportDetailVO vo, DevilerDetailsQuery query) {
 		// 添加时间校验
-		if (ReportUtil.areAllPropertiesEmpty(vo)) {
+		if(ReportUtil.areAllPropertiesEmpty(vo)){
-			ReportUtil.dateIsWithinOneMonth(vo.getTaskTime(), query.getStartTaskTime(), query.getEndTaskTime(), "配送日期");
+			if (ObjectUtil.isNotEmpty(query.getStartTaskTime()) && ObjectUtil.isNotEmpty(query.getEndTaskTime())) {
+				ReportUtil.dateIsWithinOneMonth(vo.getTaskTime(), query.getStartTaskTime(), query.getEndTaskTime(), "配送日期");
+			}
+			if(ObjectUtil.isNotEmpty(query.getStartSjsigningTime()) && ObjectUtil.isNotEmpty(query.getEndSjsigningTime())){
+				ReportUtil.dateIsWithinOneMonth(null, query.getStartTaskTime(), query.getEndTaskTime(), "签收日期");
+			}
 		}
 		Integer current = query.getCurrent();
 		Integer size = query.getSize();