From cc9dc3c2b8bfcf61dd8790ce43534c367fd1ff16 Mon Sep 17 00:00:00 2001
From: zhoujj <1549112868@qq.com>
Date: Sat, 22 Mar 2025 17:12:08 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E5=85=A5=E5=BA=93=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/SchBaseVehiclematerialgroup.java      |  2 +-
 .../SchBaseVehiclematerialgroupMapper.xml     | 46 +++++++++++++++++++
 .../dto/SchBaseVehiclematerialgroupQuery.java |  1 +
 ...chBaseVehiclematerialgroupServiceImpl.java |  2 +-
 .../service/dao/mapper/SchBasePointMapper.xml | 20 ++++----
 .../service/impl/SchBasePointServiceImpl.java |  7 ++-
 .../src/views/wms/sch/group/index.vue         | 11 ++++-
 7 files changed, 75 insertions(+), 14 deletions(-)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/SchBaseVehiclematerialgroup.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/SchBaseVehiclematerialgroup.java
index d4cc5ed..ef8a99b 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/SchBaseVehiclematerialgroup.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/SchBaseVehiclematerialgroup.java
@@ -169,7 +169,7 @@ public class SchBaseVehiclematerialgroup implements Serializable {
     private String materialFile;
 
     @TableField(exist = false)
-    private String between;
+    private String daybetween;
     @TableField(exist = false)
     private String material_name;
     @TableField(exist = false)
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.xml
index 5fe649b..0656c19 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.xml
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.xml
@@ -64,6 +64,49 @@
         GROUP BY
         sbv.order_code
     </select>
+    <select id="selectAllByPage" resultType="org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup">
+        WITH RankedVehicles AS (
+        SELECT
+        vg.*,
+        ROW_NUMBER() OVER (PARTITION BY vg.vehicle_code ORDER BY vg.due_date) AS rn
+        FROM
+        sch_base_vehiclematerialgroup vg
+        <where>
+            <if test="query.vehicle_code != null">
+                AND vg.vehicle_code LIKE CONCAT('%', #{query.vehicle_code}, '%')
+            </if>
+            <if test="query.workshop_code != null">
+                AND vg.workshop_code = #{query.workshop_code}
+            </if>
+            <if test="query.job_name != null">
+                AND vg.job_name LIKE CONCAT('%', #{query.job_name}, '%')
+            </if>
+            <if test="query.region_code != null">
+                <choose>
+                    <when test="query.region_code.equals('111-100')">
+                        AND vg.region_code IS NULL
+                    </when>
+                    <otherwise>
+                        AND vg.region_code = #{query.region_code}
+                    </otherwise>
+                </choose>
+            </if>
+            <if test="query.order_code != null">
+                AND vg.order_code LIKE CONCAT('%', #{query.order_code}, '%')
+            </if>
+            <if test="query.material_id != null">
+                AND vg.material_id LIKE CONCAT('%', #{query.material_id}, '%')
+            </if>
+            <if test="query.daybetween != null">
+                AND DATEDIFF(NOW(), vg.create_time) > #{query.daybetween}
+            </if>
+        </where>
+        ORDER BY vg.create_time DESC
+        )
+        SELECT *
+        FROM RankedVehicles
+        WHERE rn = 1
+    </select>
     <select id="selectAllByPage" resultType="org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup">
         WITH RankedVehicles AS (
         SELECT
@@ -97,6 +140,9 @@
         <if test="query.material_id != null">
             AND vg.material_id like CONCAT('%', #{query.material_id}, '%')
         </if>
+        <if test="query.daybetween != null">
+            WHERE DATEDIFF(NOW(), create_time) >= #{query.daybetween}
+        </if>
         order by vg.create_time desc
         )
         SELECT *
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupQuery.java
index 66dfdce..208f124 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupQuery.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupQuery.java
@@ -18,4 +18,5 @@ public class SchBaseVehiclematerialgroupQuery implements Serializable {
     private String job_name;
     private String order_code;
     private String material_id;
+    private Integer daybetween;
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java
index 9610f9e..8c16597 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java
@@ -114,7 +114,7 @@ public class SchBaseVehiclematerialgroupServiceImpl extends ServiceImpl<SchBaseV
             }
             // 计算两个日期之间的天数差
             long daysBetween = DateUtil.between(DateUtil.parse(item.getCreate_time()), new Date(), DateUnit.DAY);
-            item.setBetween(daysBetween + "");
+            item.setDaybetween(daysBetween + "");
             item.setHas_work(true);
         });
         return schBaseVehiclematerialgroupIPage;
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml
index aff3451..e60710b 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml
@@ -33,29 +33,29 @@
         sch_base_vehiclematerialgroup.priority
         FROM
         sch_base_point
-        inner JOIN sch_base_vehiclematerialgroup ON sch_base_point.vehicle_code =
-        sch_base_vehiclematerialgroup.vehicle_code
+        INNER JOIN sch_base_vehiclematerialgroup
+        ON sch_base_point.vehicle_code = sch_base_vehiclematerialgroup.vehicle_code
         WHERE
         is_lock = FALSE
         AND sch_base_point.vehicle_code IS NOT NULL
-        and sch_base_point.point_status = '2'
-        and sch_base_vehiclematerialgroup.is_delete = false
+        AND sch_base_point.point_status = '2'
+        AND sch_base_vehiclematerialgroup.is_delete = FALSE
         <if test="vehicle_type != null and vehicle_type != ''">
-            and sch_base_point.can_vehicle_type = #{vehicle_type}
+            AND sch_base_point.can_vehicle_type = #{vehicle_type}
         </if>
         <if test="due_date != null and due_date != ''">
-            and #{due_date} > sch_base_vehiclematerialgroup.due_date
+            AND #{due_date} > sch_base_vehiclematerialgroup.due_date
         </if>
         <if test="region_code != null and region_code != ''">
             AND sch_base_vehiclematerialgroup.region_code = #{region_code}
         </if>
-        <if test="due_date == null">
-            and sch_base_vehiclematerialgroup.due_date IS NULL
-        </if>
         <if test="region_code == null">
-            AND sch_base_vehiclematerialgroup.region_code IS NULL
+            AND sch_base_vehiclematerialgroup.region_code = ''
             AND sch_base_vehiclematerialgroup.create_name = 'Sorting'
         </if>
+        <if test="due_date == null">
+            AND sch_base_vehiclematerialgroup.due_date IS NULL
+        </if>
     </select>
 
     <select id="selectByRegionCode" resultType="java.lang.String">
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java
index 04a5178..f24d903 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java
@@ -636,7 +636,12 @@ public class SchBasePointServiceImpl extends ServiceImpl<SchBasePointMapper, Sch
         }
         SchBasePoint schBasePoint = this.getOne(Wrappers.lambdaQuery(SchBasePoint.class)
                 .eq(SchBasePoint::getPoint_code, pointCode));
-        List<OrderMater> structList = pointMapper.getStructList(schBasePoint.getRegion_code(), "G01", s);
+        List<OrderMater> structList=null;
+        if(schBasePoint.getPoint_code().equals("13-01-01")||schBasePoint.getPoint_code().equals("13-01-04")){
+            structList = pointMapper.getStructList(null, "G01", s);
+        }else{
+         structList = pointMapper.getStructList(schBasePoint.getRegion_code(), "G01", s);
+        }
         List<OrderMater> collect = structList.stream().collect(Collectors.groupingBy(
                         OrderMater::getVehicle_code,
                         Collectors.collectingAndThen(
diff --git a/lms/nladmin-ui/src/views/wms/sch/group/index.vue b/lms/nladmin-ui/src/views/wms/sch/group/index.vue
index d86d6b4..2a0d44a 100644
--- a/lms/nladmin-ui/src/views/wms/sch/group/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/group/index.vue
@@ -76,6 +76,15 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
+          <el-form-item label="入库天数">
+            <el-input
+              v-model="query.daybetween"
+              clearable
+              style="width: 250px"
+              placeholder="查找的为输入天数以上的组盘信息"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
           <rrOperation />
         </el-form>
       </div>
@@ -224,7 +233,7 @@
         <el-table-column prop="material_path" label="物料图片路径" :min-width="flexWidth('material_path',crud.data,'物料图片路径')" />
         <el-table-column prop="create_name" label="创建人" width="100" />
         <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
-        <el-table-column prop="between" label="入库天数" :min-width="flexWidth('between',crud.data,'入库天数')" />
+        <el-table-column prop="daybetween" label="入库天数" :min-width="flexWidth('daybetween',crud.data,'入库天数')" />
         <el-table-column v-if="false" prop="update_name" label="修改人" :min-width="flexWidth('update_name',crud.data,'修改人')" />
         <el-table-column v-if="false" prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
         <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">