From 8b5161357190eb8708d6773ac609520196d86b71 Mon Sep 17 00:00:00 2001
From: psh <psh>
Date: Mon, 12 Aug 2024 10:12:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E8=AE=B0=E5=BD=95=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E6=9C=88=E7=BB=B4=E5=BA=A6=E6=94=B9=E4=B8=BA=E6=97=A5?=
 =?UTF-8?q?=E7=BB=B4=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/dao/mapper/MaterialDataMapper.xml | 68 +++++++++----------
 .../src/views/wms/sch/data/index.vue          |  4 +-
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/data/service/dao/mapper/MaterialDataMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/data/service/dao/mapper/MaterialDataMapper.xml
index c49e463..e4e71d2 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/data/service/dao/mapper/MaterialDataMapper.xml
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/data/service/dao/mapper/MaterialDataMapper.xml
@@ -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>
diff --git a/lms/nladmin-ui/src/views/wms/sch/data/index.vue b/lms/nladmin-ui/src/views/wms/sch/data/index.vue
index 7fb4370..009ea64 100644
--- a/lms/nladmin-ui/src/views/wms/sch/data/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/data/index.vue
@@ -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>