From ca8a5c661cc1cdce0f5a4a1636dba34b948e4732 Mon Sep 17 00:00:00 2001
From: wg <2023838292@qq.com>
Date: Tue, 5 Nov 2024 17:58:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BD=AE=E6=A1=A3=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=88=86=E7=B1=BB=E8=AE=B0=E5=BD=95=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/controller/RecordInController.java | 36 +++++++++++++++++++
 .../ruoyi/manage/mapper/RecordInMapper.java   | 16 +++++++++
 .../manage/service/IRecordInService.java      | 15 ++++++++
 .../service/impl/RecordInServiceImpl.java     | 21 +++++++++++
 .../mapper/manage/RecordInMapper.xml          | 24 +++++++++++--
 5 files changed, 110 insertions(+), 2 deletions(-)

diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInController.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInController.java
index b572be4..b50fc05 100644
--- a/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInController.java
+++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/RecordInController.java
@@ -1,6 +1,9 @@
 package com.ruoyi.manage.controller;
 
 import java.util.List;
+
+import com.github.pagehelper.Page;
+import com.ruoyi.manage.domain.RecordInSort;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -30,6 +33,8 @@ import com.ruoyi.common.core.page.TableDataInfo;
 public class RecordInController extends BaseController
 {
     private String prefix = "manage/record_in";
+    private String prefix2 = "manage/record_in_sort";
+
 
     @Autowired
     private IRecordInService recordInService;
@@ -41,7 +46,38 @@ public class RecordInController extends BaseController
         return prefix + "/record_in";
     }
 
+    @RequiresPermissions("manage:record_in_sort:view")
+    @GetMapping("/record_in_sort")
+    public String record_in_sort()
+    {
+        return prefix2 + "/record_in_sort";
+    }
+    /**
+     * 分类查询轮挡入库记录列表
+     */
+    @RequiresPermissions("manage:record_in:sort_list")
+    @PostMapping("/sort_list")
+    @ResponseBody
+    public TableDataInfo sort_list(RecordInSort recordInSort)
+    {
+        startPage();
+        List<RecordInSort> list = recordInService.selectRecordInSortList(recordInSort);
+        return getDataTable(list);
+    }
+    /**
+     * 按批次码分类查询轮挡入库记录列表
+     */
+    @RequiresPermissions("manage:record_in:sort_list")
+    @PostMapping("/sort_BatchCode")
+    @ResponseBody
+    public TableDataInfo selectByBatchCode(String batchCode)
+    {
+        startPage();
+        List<RecordIn> list = recordInService.selectByBatchCode(batchCode);
+        return getDataTable(list);
+    }
     /**
+     *
      * 查询轮挡入库记录列表
      */
     @RequiresPermissions("manage:record_in:list")
diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInMapper.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInMapper.java
index 89c8f36..27327b1 100644
--- a/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInMapper.java
+++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/RecordInMapper.java
@@ -2,6 +2,7 @@ package com.ruoyi.manage.mapper;
 
 import java.util.List;
 import com.ruoyi.manage.domain.RecordIn;
+import com.ruoyi.manage.domain.RecordInSort;
 import org.springframework.stereotype.Repository;
 /**
  * 轮挡入库记录Mapper接口
@@ -59,4 +60,19 @@ public interface RecordInMapper
      * @return 结果
      */
     public int deleteRecordInByObjids(String[] objids);
+    /**
+     * 分类查询轮挡入库记录列表
+     *
+     * @param recordInSort 分类轮挡入库记录
+     * @return 分类轮挡入库记录
+     */
+    List<RecordInSort> selectRecordInSortList(RecordInSort recordInSort);
+    /**
+     * 按批次码分类查询轮挡入库记录列表
+     *
+     * @param batchCode
+     * @return 轮挡入库记录
+     */
+    public List<RecordIn> selectByBatchCode(String batchCode);
+
 }
diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInService.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInService.java
index 3995711..d6b1809 100644
--- a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInService.java
+++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/IRecordInService.java
@@ -2,6 +2,7 @@ package com.ruoyi.manage.service;
 
 import java.util.List;
 import com.ruoyi.manage.domain.RecordIn;
+import com.ruoyi.manage.domain.RecordInSort;
 
 /**
  * 轮挡入库记录Service接口
@@ -58,4 +59,18 @@ public interface IRecordInService
      * @return 结果
      */
     public int deleteRecordInByObjid(Long objid);
+    /**
+     * 分类查询轮挡入库记录列表
+     *
+     * @param recordInSort 轮挡入库记录
+     * @return 轮挡入库记录集合
+     */
+    List<RecordInSort> selectRecordInSortList(RecordInSort recordInSort);
+    /**
+     * 按批次码分类查询轮挡入库记录列表
+     *
+     * @param
+     * @return 分类轮挡入库记录
+     */
+    public List<RecordIn> selectByBatchCode(String bathCode);
 }
diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInServiceImpl.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInServiceImpl.java
index 7ee70f0..37f3446 100644
--- a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInServiceImpl.java
+++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/RecordInServiceImpl.java
@@ -5,6 +5,7 @@ import java.util.List;
 
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.ShiroUtils;
+import com.ruoyi.manage.domain.RecordInSort;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.manage.mapper.RecordInMapper;
@@ -90,4 +91,24 @@ public class RecordInServiceImpl implements IRecordInService {
     public int deleteRecordInByObjid(Long objid) {
         return recordInMapper.deleteRecordInByObjid(objid);
     }
+    /**
+     * 分类查询轮挡入库记录列表
+     *
+     * @param recordInSort 分类轮挡入库记录
+     * @return 分类轮挡入库记录
+     */
+    @Override
+    public List<RecordInSort> selectRecordInSortList(RecordInSort recordInSort) {
+        return recordInMapper.selectRecordInSortList(recordInSort);
+    }
+    /**
+     * 按批次码分类查询轮挡入库记录列表
+     *
+     * @param
+     * @return 分类轮挡入库记录
+     */
+    @Override
+    public List<RecordIn> selectByBatchCode(String batchCode) {
+        return recordInMapper.selectByBatchCode(batchCode);
+    }
 }
diff --git a/ruoyi-manage/src/main/resources/mapper/manage/RecordInMapper.xml b/ruoyi-manage/src/main/resources/mapper/manage/RecordInMapper.xml
index f3ffb55..3bc604e 100644
--- a/ruoyi-manage/src/main/resources/mapper/manage/RecordInMapper.xml
+++ b/ruoyi-manage/src/main/resources/mapper/manage/RecordInMapper.xml
@@ -14,7 +14,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
     </resultMap>
-
+    <resultMap type="RecordInSort" id="RecordInSortResult">
+<!--        <result property="objid"    column="objid"    />-->
+        <result property="batchCode"    column="batch_code"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="recordCount"    column="record_count"    />
+<!--        <result property="remark"    column="remark"    />-->
+<!--        <result property="createBy"    column="create_by"    />-->
+    </resultMap>
     <sql id="selectRecordInVo">
         select objid, epc_code, batch_code, location_code, manufacturer_Name, remark, create_by, create_time from record_in
     </sql>
@@ -33,7 +40,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectRecordInVo"/>
         where objid = #{objid}
     </select>
-        
+
+
+
+    <select id="selectRecordInSortList" resultMap="RecordInSortResult">
+        SELECT batch_code, create_time, COUNT(*) AS record_count
+        FROM record_in
+        GROUP BY batch_code
+        ORDER BY batch_code
+    </select>
+
+    <select id="selectByBatchCode" parameterType="String" resultMap="RecordInResult">
+        SELECT * FROM record_in WHERE batch_code = #{batchCode}
+    </select>
+
     <insert id="insertRecordIn" parameterType="RecordIn" useGeneratedKeys="true" keyProperty="objid">
         insert into record_in
         <trim prefix="(" suffix=")" suffixOverrides=",">