root/yiBinGaoCe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

库存记录报表月维度改为日维度

Browse Source
This commit is contained in:
psh
2024-08-12 10:12:21 +08:00
parent 4bcf26d04b
commit 8b51613571
2 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/data/service/dao/mapper/MaterialDataMapper.xml
View File

@@ -8,13 +8,13 @@
<select id="queryAll" resultType="org.nl.wms.sch.data.service.dto.MaterialDataResponse">
SELECT
supplierCode,
MAX(md.supplierName) AS supplierName,
productName,
specification,
MAX(batch) AS batch,
MAX(barLevel) AS barLevel,
DATE_FORMAT(md.createTime, '%Y-%m') AS date,
supplierCode,
MAX(md.supplierName) AS supplierName,
productName,
specification,
MAX(batch) AS batch,
MAX(barLevel) AS barLevel,
DATE_FORMAT(md.createTime, '%Y-%m-%d') AS date,
COALESCE(SUM(CASE WHEN md.type = 1 THEN md.length ELSE 0 END), 0) AS ll_length,
COALESCE(SUM(CASE WHEN md.type = 1 THEN md.weight ELSE 0 END), 0) AS ll_weight,
COALESCE(SUM(CASE WHEN md.type = 2 THEN md.length ELSE 0 END), 0) AS sc_length,
@@ -26,37 +26,37 @@
WHERE
supplierCode = md.supplierCode AND
createTime <![CDATA[ < ]]> DATE_FORMAT(DATE_SUB(CONCAT(YEAR(#{query.start_time}), '-', MONTH(#{query.start_time}), '-01'), INTERVAL 1 DAY), '%Y-%m-%d')
), 0) AS sy_length,
COALESCE(
(SELECT
SUM(CASE WHEN type = 1 THEN weight ELSE 0 END) - SUM(CASE WHEN type = 2 THEN weight ELSE 0 END)
FROM material_data
WHERE
supplierCode = md.supplierCode AND
createTime <![CDATA[ < ]]> DATE_FORMAT(DATE_SUB(CONCAT(YEAR(#{query.start_time}), '-', MONTH(#{query.start_time}), '-01'), INTERVAL 1 DAY), '%Y-%m-%d')
), 0) AS sy_weight,
COALESCE(
(SELECT
SUM(CASE WHEN type = 1 THEN length ELSE 0 END) - SUM(CASE WHEN type = 2 THEN length ELSE 0 END)
FROM material_data
WHERE
supplierCode = md.supplierCode and productName = md.productName and specification = md.specification
), 0) AS jc_length,
COALESCE(
(SELECT
SUM(CASE WHEN type = 1 THEN weight ELSE 0 END) - SUM(CASE WHEN type = 2 THEN weight ELSE 0 END)
FROM material_data
WHERE
supplierCode = md.supplierCode and productName =md.productName and specification = md.specification
), 0) AS jc_weight
), 0) AS sy_length,
COALESCE(
(SELECT
SUM(CASE WHEN type = 1 THEN weight ELSE 0 END) - SUM(CASE WHEN type = 2 THEN weight ELSE 0 END)
FROM material_data
WHERE
supplierCode = md.supplierCode AND
createTime <![CDATA[ < ]]> DATE_FORMAT(DATE_SUB(CONCAT(YEAR(#{query.start_time}), '-', DAY(#{query.start_time}), '-01'), INTERVAL 1 DAY), '%Y-%m-%d')
), 0) AS sy_weight,
COALESCE(
(SELECT
SUM(CASE WHEN type = 1 THEN length ELSE 0 END) - SUM(CASE WHEN type = 2 THEN length ELSE 0 END)
FROM material_data
WHERE
supplierCode = md.supplierCode and productName = md.productName and specification = md.specification
), 0) AS jc_length,
COALESCE(
(SELECT
SUM(CASE WHEN type = 1 THEN weight ELSE 0 END) - SUM(CASE WHEN type = 2 THEN weight ELSE 0 END)
FROM material_data
WHERE
supplierCode = md.supplierCode and productName =md.productName and specification = md.specification
), 0) AS jc_weight
FROM
material_data md
material_data md
WHERE
DATE_FORMAT(md.createTime, '%Y-%m') = DATE_FORMAT(#{query.start_time}, '%Y-%m')
DATE_FORMAT(md.createTime, '%Y-%m-%d') = DATE_FORMAT(#{query.start_time}, '%Y-%m-%d')
GROUP BY
md.productName,md.specification,supplierCode, DATE_FORMAT(md.createTime, '%Y-%m')
md.productName,md.specification,supplierCode, DATE_FORMAT(md.createTime, '%Y-%m-%d')
ORDER BY
md.supplierCode, md.productName
md.supplierCode, md.productName
</select>

4
lms/nladmin-ui/src/views/wms/sch/data/index.vue
View File

@@ -14,7 +14,7 @@
<el-date-picker
v-model="query.start_time"
value-format="yyyy-MM-dd"
type="month"
type="date"
style="width: 240px;"
placeholder="选择日期时间"
/>
@@ -44,7 +44,7 @@
<el-table-column prop="specification" label="规格" />
<el-table-column prop="batch" label="来料批次" />
<el-table-column prop="barLevel" label="棒源等级" />
<el-table-column label="上月结存">
<el-table-column label="昨日结存">
<el-table-column prop="sy_length" label="实际长度(mm)" />
<el-table-column prop="sy_weight" label="实际重量(KG)" />
</el-table-column>