From 990b694dc6c26f3e57d938a6f121e7fedbb13afd Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Mon, 24 Jun 2024 13:43:08 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=E9=87=87=E8=B4=AD=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=85=A5=E5=BA=93=E9=80=9A=E7=9F=A5=E5=8D=95?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E9=87=87=E8=B4=AD=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=8D=95=E5=89=8D=E7=AB=AF=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=B8=A2=E5=A4=B1=E9=97=AE=E9=A2=98,=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=85=A5=E5=BA=93=E9=80=9A=E7=9F=A5=E5=8D=95?=
 =?UTF-8?q?=E7=9A=84=E6=9F=A5=E8=AF=A2=E8=AF=AD=E5=8F=A5=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E9=87=87=E8=B4=AD=E5=85=A5=E5=BA=93=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E5=8D=95=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E6=9F=A5=E8=AF=A2=20=E6=96=B0=E5=A2=9E=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E5=85=A5=E5=BA=93=E9=80=9A=E7=9F=A5=E5=8D=95=E4=B8=BA?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E5=80=92=E5=8F=99=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BB=93=E5=BA=93=E5=85=A5=E5=BA=93=E5=8D=95?=
 =?UTF-8?q?=E4=B8=BA=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E5=80=92=E5=8F=99?=
 =?UTF-8?q?=20=E5=8E=BB=E6=8E=89=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=96=B0=E5=A2=9E,=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20=E5=92=8C=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PurchaseStorageServiceImpl.java      | 24 ++++++++--------
 .../mapper/WarehouseStorageOrderMapper.java   | 10 +++++++
 .../warehouse/WarehouseStorageOrderMapper.xml | 20 ++++++++++++-
 .../purchaseStorage/purchaseStorage.html      | 28 +++++++++----------
 .../templates/system/makeorder/makeorder.html | 18 ++++++------
 5 files changed, 65 insertions(+), 35 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseStorageServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseStorageServiceImpl.java
index 88d653c4..7aec9541 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseStorageServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseStorageServiceImpl.java
@@ -52,14 +52,15 @@ public class PurchaseStorageServiceImpl implements IPurchaseStorageService
     @Override
     public List<PurchaseStorage> selectPurchaseStorageList(WarehouseStorageOrder warehouseStorageOrder)
     {
-        List<WarehouseStorageOrder> allWarehouseStorageOrders = warehouseStorageOrderMapper.selectWarehouseStorageOrderList(warehouseStorageOrder);
+//        List<WarehouseStorageOrder> allWarehouseStorageOrders = warehouseStorageOrderMapper.selectWarehouseStorageOrderList(warehouseStorageOrder);
         List<PurchaseStorage> purchaseStorages = new ArrayList<>();
         // 使用流过滤出warehouseOrderType为"0"的记录 也就是采购订单
-        List<WarehouseStorageOrder> filteredWarehouseStorageOrders = allWarehouseStorageOrders.stream()
-                .filter(s -> "0".equals(s.getWarehouseOrderType()))
-                .collect(Collectors.toList());
+//        List<WarehouseStorageOrder> filteredWarehouseStorageOrders = allWarehouseStorageOrders.stream()
+//                .filter(s -> "0".equals(s.getWarehouseOrderType()))
+//                .collect(Collectors.toList());
+        List<WarehouseStorageOrder> allWarehouseStorageOrders = warehouseStorageOrderMapper.selectPurchaseStorageList(warehouseStorageOrder);
 
-        for (WarehouseStorageOrder wso : filteredWarehouseStorageOrders) {
+        for (WarehouseStorageOrder wso : allWarehouseStorageOrders) {
             PurchaseStorage ps = new PurchaseStorage();
             BeanUtils.copyProperties(wso, ps);
             purchaseStorages.add(ps);
@@ -70,13 +71,14 @@ public class PurchaseStorageServiceImpl implements IPurchaseStorageService
     @Override
     public List<WarehouseStorageOrder> selectWarehouseStorageList(WarehouseStorageOrder warehouseStorageOrder) {
         // 先获取所有仓储订单列表
-        List<WarehouseStorageOrder> allWarehouseStorageOrders = warehouseStorageOrderMapper.selectWarehouseStorageOrderList(warehouseStorageOrder);
+        List<WarehouseStorageOrder> allWarehouseStorageOrders = warehouseStorageOrderMapper.selectPurchaseStorageList(warehouseStorageOrder);
 
-        // 使用流过滤出warehouseOrderType为"0"的记录 也就是采购订单
-        List<WarehouseStorageOrder> filteredWarehouseStorageOrders = allWarehouseStorageOrders.stream()
-                .filter(s -> "0".equals(s.getWarehouseOrderType()))
-                .collect(Collectors.toList());
-        return filteredWarehouseStorageOrders;
+//        // 使用流过滤出warehouseOrderType为"0"的记录 也就是采购订单
+//        List<WarehouseStorageOrder> filteredWarehouseStorageOrders = allWarehouseStorageOrders.stream()
+//                .filter(s -> "0".equals(s.getWarehouseOrderType()))
+//                .collect(Collectors.toList());
+//        return filteredWarehouseStorageOrders;
+        return  allWarehouseStorageOrders;
     }
 
     /**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseStorageOrderMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseStorageOrderMapper.java
index 760b974a..8c576ef1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseStorageOrderMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseStorageOrderMapper.java
@@ -28,6 +28,16 @@ public interface WarehouseStorageOrderMapper
      */
     public List<WarehouseStorageOrder> selectWarehouseStorageOrderList(WarehouseStorageOrder warehouseStorageOrder);
 
+
+
+    /**
+     * 采购入库通知单查询仓库入库单列表
+     *
+     * @param warehouseStorageOrder 仓库入库单
+     * @return 仓库入库单集合
+     */
+    public List<WarehouseStorageOrder> selectPurchaseStorageList(WarehouseStorageOrder warehouseStorageOrder);
+
     /**
      * 新增仓库入库单
      * 
diff --git a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderMapper.xml
index 4b98771e..262bc0f0 100644
--- a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderMapper.xml
@@ -50,8 +50,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="warehouseEmployee != null  and warehouseEmployee != ''"> and warehouse_employee = #{warehouseEmployee}</if>
             <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
         </where>
+        order by create_time desc
     </select>
-    
+
+
+
+    <select id="selectPurchaseStorageList" parameterType="WarehouseStorageOrder" resultMap="WarehouseStorageOrderResult">
+        <include refid="selectWarehouseStorageOrderVo"/>
+        <where>
+            <if test="warehouseStorageCode != null  and warehouseStorageCode != ''"> and warehouse_storage_code = #{warehouseStorageCode}</if>
+            <if test="relatedOrderCode != null  and relatedOrderCode != ''"> and related_order_code = #{relatedOrderCode}</if>
+            <if test="warehouseStorageStatus != null  and warehouseStorageStatus != ''"> and warehouse_storage_status = #{warehouseStorageStatus}</if>
+            <if test="warehouseQualityStatus != null  and warehouseQualityStatus != ''"> and warehouse_quality_status = #{warehouseQualityStatus}</if>
+            <if test="warehouseDeptType != null  and warehouseDeptType != ''"> and warehouse_dept_type = #{warehouseDeptType}</if>
+            <if test="warehouseEmployee != null  and warehouseEmployee != ''"> and warehouse_employee = #{warehouseEmployee}</if>
+            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
+           and warehouse_order_type = '0'
+        </where>
+         order by create_time desc
+    </select>
+
     <select id="selectWarehouseStorageOrderById" parameterType="Long" resultMap="WarehouseStorageOrderResult">
         <include refid="selectWarehouseStorageOrderVo"/>
         where warehouse_storage_id = #{warehouseStorageId}
diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseStorage/purchaseStorage.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseStorage/purchaseStorage.html
index eb435a5d..1dfca6a3 100644
--- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseStorage/purchaseStorage.html
+++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseStorage/purchaseStorage.html
@@ -12,33 +12,34 @@
                         <ul>
                             <li>
                                 <label>入库单号：</label>
-                                <input type="text" name="purchaseStorageCode"/>
-                            </li>
-                            <li>
-                                <label>关联订单号：</label>
-                                <input type="text" name="purchaseOrderCode"/>
-                            </li>
-                            <li>
-                                <label>仓库员：</label>
-                                <input type="text" name="storageEmployee"/>
+                                <input type="text" name="warehouseStorageCode"/>
                             </li>
                             <li>
                                 <label>入库状态：</label>
-                                <select name="storageStatus" th:with="type=${@dict.getType('eceiptStatus')}">
+                                <select name="warehouseStorageStatus" th:with="type=${@dict.getType('warehouse_storage_status')}">
                                     <option value="">所有</option>
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                 </select>
                             </li>
                             <li>
                                 <label>品质状态：</label>
-                                <select name="qualityStatus" th:with="type=${@dict.getType('qualityStatus')}">
+                                <select name="warehouseQualityStatus" th:with="type=${@dict.getType('warehouse_quality_status')}">
                                     <option value="">所有</option>
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                 </select>
                             </li>
+                            <li>
+                                <label>关联订单号：</label>
+                                <input type="text" name="relatedOrderCode"/>
+                            </li>
+
+                            <li>
+                                <label>仓库员：</label>
+                                <input type="text" name="warehouseEmployee"/>
+                            </li>
                             <li>
                                 <label>入库部门：</label>
-                                <select name="purchaseDeptType" th:with="type=${@dict.getType('warehouseDept')}">
+                                <select name="warehouseDeptType" th:with="type=${@dict.getType('warehouse_dept_type')}">
                                     <option value="">所有</option>
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                 </select>
@@ -97,8 +98,7 @@
                 restoreUrl: prefix + "/restore/{id}",
                 exportUrl: prefix + "/export",
                 modalName: "采购入库通知单",
-                fixedColumns: true, // 启用冻结列
-                fixedRightNumber: 1, // 冻结右列个数
+
                 columns: [
                     {checkbox: true},
                     {title: '入库单id',field: 'warehouseStorageId',visible: false},
diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/makeorder.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/makeorder.html
index 1c0c1582..ef301b71 100644
--- a/ruoyi-admin/src/main/resources/templates/system/makeorder/makeorder.html
+++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/makeorder.html
@@ -78,15 +78,15 @@
             </div>
 
             <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:makeorder:add">
-                    <i class="fa fa-plus"></i> 添加
-                </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:makeorder:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:makeorder:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
+<!--                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:makeorder:add">-->
+<!--                    <i class="fa fa-plus"></i> 添加-->
+<!--                </a>-->
+<!--                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:makeorder:edit">-->
+<!--                    <i class="fa fa-edit"></i> 修改-->
+<!--                </a>-->
+<!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:makeorder:remove">-->
+<!--                    <i class="fa fa-remove"></i> 删除-->
+<!--                </a>-->
                 <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:makeorder:export">
                     <i class="fa fa-download"></i> 导出
                 </a>