ERP_override.git

			@@ -1023,50 +1023,49 @@
			product_id,
			order_number,
			CASE

			WHEN height < 3660 THEN
			' '
			WHEN height < 4000 AND height >= 3660 THEN
			WHEN height < 4000 AND height >= 3660 and height>width THEN
			'3660<H<4000'
			WHEN height < 5000 AND height >= 4000 THEN
			WHEN height < 5000 AND height >= 4000 and height>width THEN
			'4000<H<5000'
			WHEN height < 6000 AND height >= 5000 THEN
			WHEN height < 6000 AND height >= 5000 and height>width THEN
			'5000<H<6000'
			WHEN height < 7000 AND height >= 6000 THEN
			WHEN height < 7000 AND height >= 6000 and height>width THEN
			'6000<H<7000'
			WHEN height < 8000 AND height >= 7000 THEN
			WHEN height < 8000 AND height >= 7000 and height>width THEN
			'7000<H<8000'
			WHEN height < 9000 AND height >= 8000 THEN
			WHEN height < 9000 AND height >= 8000 and height>width THEN
			'8000<H<9000'
			WHEN height < 10000 AND height >= 9000 THEN
			WHEN height < 10000 AND height >= 9000 and height>width THEN
			'9000<H<10000'
			WHEN height < 11000 AND height >= 10000 THEN
			WHEN height < 11000 AND height >= 10000 and height>width THEN
			'10000<H<11000'
			WHEN height < 12000 AND height >= 11000 THEN
			WHEN height < 12000 AND height >= 11000 and height>width THEN
			'11000<H<12000'
			ELSE
			''
			END height,
			CASE

			WHEN width < 3660 THEN
			' '
			WHEN width < 4000 AND width >= 3660 THEN
			WHEN width < 4000 AND width >= 3660 and width>height THEN
			'3660<W<4000'
			WHEN width < 5000 AND width >= 4000 THEN
			WHEN width < 5000 AND width >= 4000 and width>height THEN
			'4000<W<5000'
			WHEN width < 6000 AND width >= 5000 THEN
			WHEN width < 6000 AND width >= 5000 and width>height THEN
			'5000<W<6000'
			WHEN width < 7000 AND width >= 6000 THEN
			WHEN width < 7000 AND width >= 6000 and width>height THEN
			'6000<W<7000'
			WHEN width < 8000 AND width >= 7000 THEN
			WHEN width < 8000 AND width >= 7000 and width>height THEN
			'7000<W<8000'
			WHEN width < 9000 AND width >= 8000 THEN
			WHEN width < 9000 AND width >= 8000 and width>height THEN
			'8000<W<9000'
			WHEN width < 10000 AND width >= 9000 THEN
			WHEN width < 10000 AND width >= 9000 and width>height THEN
			'9000<W<10000'
			WHEN width < 11000 AND width >= 10000 THEN
			WHEN width < 11000 AND width >= 10000 and width>height THEN
			'10000<W<11000'
			WHEN width < 12000 AND width >= 11000 THEN
			WHEN width < 12000 AND width >= 11000 and width>height THEN
			'11000<W<12000'
			ELSE
			''
			END width
			from order_detail) as od on dd.order_id = od.order_id and dd.order_number = od.order_number
			left join product pt on pt.id = od.product_id
			@@ -1093,50 +1092,49 @@
			product_id,
			order_number,
			CASE

			WHEN height < 3660 THEN
			' '
			WHEN height < 4000 AND height >= 3660 THEN
			WHEN height < 4000 AND height >= 3660 and height>width THEN
			'3660<H<4000'
			WHEN height < 5000 AND height >= 4000 THEN
			WHEN height < 5000 AND height >= 4000 and height>width THEN
			'4000<H<5000'
			WHEN height < 6000 AND height >= 5000 THEN
			WHEN height < 6000 AND height >= 5000 and height>width THEN
			'5000<H<6000'
			WHEN height < 7000 AND height >= 6000 THEN
			WHEN height < 7000 AND height >= 6000 and height>width THEN
			'6000<H<7000'
			WHEN height < 8000 AND height >= 7000 THEN
			WHEN height < 8000 AND height >= 7000 and height>width THEN
			'7000<H<8000'
			WHEN height < 9000 AND height >= 8000 THEN
			WHEN height < 9000 AND height >= 8000 and height>width THEN
			'8000<H<9000'
			WHEN height < 10000 AND height >= 9000 THEN
			WHEN height < 10000 AND height >= 9000 and height>width THEN
			'9000<H<10000'
			WHEN height < 11000 AND height >= 10000 THEN
			WHEN height < 11000 AND height >= 10000 and height>width THEN
			'10000<H<11000'
			WHEN height < 12000 AND height >= 11000 THEN
			WHEN height < 12000 AND height >= 11000 and height>width THEN
			'11000<H<12000'
			ELSE
			''
			END height,
			CASE

			WHEN width < 3660 THEN
			' '
			WHEN width < 4000 AND width >= 3660 THEN
			WHEN width < 4000 AND width >= 3660 and width>height THEN
			'3660<W<4000'
			WHEN width < 5000 AND width >= 4000 THEN
			WHEN width < 5000 AND width >= 4000 and width>height THEN
			'4000<W<5000'
			WHEN width < 6000 AND width >= 5000 THEN
			WHEN width < 6000 AND width >= 5000 and width>height THEN
			'5000<W<6000'
			WHEN width < 7000 AND width >= 6000 THEN
			WHEN width < 7000 AND width >= 6000 and width>height THEN
			'6000<W<7000'
			WHEN width < 8000 AND width >= 7000 THEN
			WHEN width < 8000 AND width >= 7000 and width>height THEN
			'7000<W<8000'
			WHEN width < 9000 AND width >= 8000 THEN
			WHEN width < 9000 AND width >= 8000 and width>height THEN
			'8000<W<9000'
			WHEN width < 10000 AND width >= 9000 THEN
			WHEN width < 10000 AND width >= 9000 and width>height THEN
			'9000<W<10000'
			WHEN width < 11000 AND width >= 10000 THEN
			WHEN width < 11000 AND width >= 10000 and width>height THEN
			'10000<W<11000'
			WHEN width < 12000 AND width >= 11000 THEN
			WHEN width < 12000 AND width >= 11000 and width>height THEN
			'11000<W<12000'
			ELSE
			''
			END width
			from order_detail) as od on dd.order_id = od.order_id and dd.order_number = od.order_number
			left join product pt on pt.id = od.product_id

	north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml	90 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -1181,7 +1181,10 @@
			date.add(endDate);
			Map<String, Object> result = new HashMap<>();
			BasicData basicData = basicDataMapper
			.selectOne(new QueryWrapper<BasicData>().eq("basic_name", reportingWork.get("process")));
			.selectOne(new QueryWrapper<BasicData>()
			.eq("basic_name", reportingWork.get("process"))
			.last("limit 1")
			);
			result.put("data",orderProcessDetailMapper.selectShiftQuantitySv(creatorId, startDate, endDate,basicData==null?null:basicData.getNickname()));
			result.put("date",date);
			return result;