[fix]采购管理:

采购入库通知单
新增采购入库通知单列表页面
从仓库中筛选出 订单类型为采购订单的数据
新增 采购入库通知单后端接口

ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchaseStorageController.java

@@ -1,6 +1,8 @@
 package com.ruoyi.purchase.controller;
 
 import java.util.List;
+
+import com.ruoyi.warehouse.domain.WarehouseStorageOrder;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -42,15 +44,15 @@ public class PurchaseStorageController extends BaseController
     }
 
     /**
-     * 查询采购入库通知单列表
+     * 查询仓库入库单采购入库通知单列表
      */
     @RequiresPermissions("purchase:purchaseStorage:list")
     @PostMapping("/list")
     @ResponseBody
-    public TableDataInfo list(PurchaseStorage purchaseStorage)
+    public TableDataInfo list(WarehouseStorageOrder warehouseStorageOrder)
     {
         startPage();
-        List<PurchaseStorage> list = purchaseStorageService.selectPurchaseStorageList(purchaseStorage);
+        List<WarehouseStorageOrder> list = purchaseStorageService.selectWarehouseStorageList(warehouseStorageOrder);
         return getDataTable(list);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/purchase/service/IPurchaseStorageService.java

@@ -2,6 +2,7 @@ package com.ruoyi.purchase.service;
 
 import java.util.List;
 import com.ruoyi.purchase.domain.PurchaseStorage;
+import com.ruoyi.warehouse.domain.WarehouseStorageOrder;
 
 /**
  * 采购入库通知单Service接口
@@ -27,6 +28,16 @@ public interface IPurchaseStorageService
      */
     public List<PurchaseStorage> selectPurchaseStorageList(PurchaseStorage purchaseStorage);
 
+
+    /**
+     * 从仓库入库单查询采购入库通知单列表
+     *
+     * @param warehouseStorageOrder 仓库入库单
+     * @return 采购入库通知单集合
+     */
+    public List<WarehouseStorageOrder> selectWarehouseStorageList(WarehouseStorageOrder warehouseStorageOrder);
+
+
     /**
      * 新增采购入库通知单
      * 

ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseStorageServiceImpl.java

@@ -1,8 +1,12 @@
 package com.ruoyi.purchase.service.impl;
 
 import java.util.List;
+import java.util.stream.Collectors;
+
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.ShiroUtils;
+import com.ruoyi.warehouse.domain.WarehouseStorageOrder;
+import com.ruoyi.warehouse.mapper.WarehouseStorageOrderMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.purchase.mapper.PurchaseStorageMapper;
@@ -22,6 +26,9 @@ public class PurchaseStorageServiceImpl implements IPurchaseStorageService
     @Autowired
     private PurchaseStorageMapper purchaseStorageMapper;
 
+    @Autowired
+    private WarehouseStorageOrderMapper warehouseStorageOrderMapper;
+
     /**
      * 查询采购入库通知单
      * 
@@ -46,6 +53,18 @@ public class PurchaseStorageServiceImpl implements IPurchaseStorageService
         return purchaseStorageMapper.selectPurchaseStorageList(purchaseStorage);
     }
 
+    @Override
+    public List<WarehouseStorageOrder> selectWarehouseStorageList(WarehouseStorageOrder warehouseStorageOrder) {
+        // 先获取所有仓储订单列表
+        List<WarehouseStorageOrder> allWarehouseStorageOrders = warehouseStorageOrderMapper.selectWarehouseStorageOrderList(warehouseStorageOrder);
+
+        // 使用流过滤出warehouseOrderType为"0"的记录 也就是采购订单
+        List<WarehouseStorageOrder> filteredWarehouseStorageOrders = allWarehouseStorageOrders.stream()
+                .filter(s -> "0".equals(s.getWarehouseOrderType()))
+                .collect(Collectors.toList());
+        return filteredWarehouseStorageOrders;
+    }
+
     /**
      * 新增采购入库通知单
      * 

ruoyi-admin/src/main/resources/templates/purchase/purchaseStorage/purchaseStorage.html

@@ -74,11 +74,20 @@
         var removeFlag = [[${@permission.hasPermi('purchase:purchaseStorage:remove')}]];
         var cancelFlag = [[${@permission.hasPermi('purchase:purchaseStorage:cancel')}]];
         var restoreFlag = [[${@permission.hasPermi('purchase:purchaseStorage:restore')}]];
-        var storageStatusDatas = [[${@dict.getType('eceiptStatus')}]];
-        var qualityStatusDatas = [[${@dict.getType('qualityStatus')}]];
-        var purchaseStorageTypeDatas = [[${@dict.getType('purchase_storage_type')}]];
-        var purchaseOrderTypeDatas = [[${@dict.getType('sys_order_type')}]];
-        var purchaseDeptTypeDatas = [[${@dict.getType('warehouseDept')}]];
+
+
+        // var storageStatusDatas = [[${@dict.getType('eceiptStatus')}]];
+        // var qualityStatusDatas = [[${@dict.getType('qualityStatus')}]];
+        // var purchaseStorageTypeDatas = [[${@dict.getType('purchase_storage_type')}]];
+        // var purchaseOrderTypeDatas = [[${@dict.getType('sys_order_type')}]];
+        // var purchaseDeptTypeDatas = [[${@dict.getType('warehouseDept')}]];
+        var warehouseStorageStatusDatas = [[${@dict.getType('warehouse_storage_status')}]];
+        var warehouseQualityStatusDatas = [[${@dict.getType('warehouse_quality_status')}]];
+        var warehouseStorageTypeDatas = [[${@dict.getType('warehouse_storage_type')}]];
+        var warehouseOrderTypeDatas = [[${@dict.getType('storage_order_type')}]];
+        var warehouseDeptTypeDatas = [[${@dict.getType('warehouse_dept_type')}]];
+
+
         var prefix = ctx + "purchase/purchaseStorage";
         $(function() {
             var options = {
@@ -94,23 +103,43 @@
                 fixedRightNumber: 1, // 冻结右列个数
                 columns: [
                     {checkbox: true},
-                    {title: '采购入库单id',field: 'purchaseStorageId',visible: false},
-                    {title: '入库单号',field: 'purchaseStorageCode',},
-                    {title: '关联订单号',field: 'purchaseOrderCode',},
-                    {title: '入库状态',field: 'storageStatus',
-                        formatter: function(value, row, index) {return $.table.selectDictLabel(storageStatusDatas, value);}
+                    {title: '入库单id',field: 'warehouseStorageId',visible: false},
+                    {title: '入库单号',field: 'warehouseStorageCode',},
+                    {title: '关联订单号',field: 'relatedOrderCode',},
+                    {
+                        title: '入库状态',
+                        field: 'warehouseStorageStatus',
+                        formatter: function(value, row, index) {
+                            return $.table.selectDictLabel(warehouseStorageStatusDatas, value);
+                        }
                     },
-                    {title: '品质状态',field: 'qualityStatus',
-                        formatter: function(value, row, index) {return $.table.selectDictLabel(qualityStatusDatas, value);}
+                    {
+                        title: '品质状态',
+                        field: 'warehouseQualityStatus',
+                        formatter: function(value, row, index) {
+                            return $.table.selectDictLabel(warehouseQualityStatusDatas, value);
+                        }
                     },
-                    {title: '入库类型',field: 'purchaseStorageType',
-                        formatter: function(value, row, index) {return $.table.selectDictLabel(purchaseStorageTypeDatas, value);}
+                    {
+                        title: '入库类型',
+                        field: 'warehouseStorageType',
+                        formatter: function(value, row, index) {
+                            return $.table.selectDictLabel(warehouseStorageTypeDatas, value);
+                        }
                     },
-                    {title: '订单类型',field: 'purchaseOrderType',
-                        formatter: function(value, row, index) {return $.table.selectDictLabel(purchaseOrderTypeDatas, value);}
+                    {
+                        title: '订单类型',
+                        field: 'warehouseOrderType',
+                        formatter: function(value, row, index) {
+                            return $.table.selectDictLabel(warehouseOrderTypeDatas, value);
+                        }
                     },
-                    {title: '入库部门',field: 'purchaseDeptType',
-                        formatter: function(value, row, index) {return $.table.selectDictLabel(purchaseDeptTypeDatas, value);}
+                    {
+                        title: '入库部门',
+                        field: 'warehouseDeptType',
+                        formatter: function(value, row, index) {
+                            return $.table.selectDictLabel(warehouseDeptTypeDatas, value);
+                        }
                     },
                     {title: '通知已到货数量',field: 'notifyArrivedNum',},
                     {title: '实际已到货数量',field: 'actualArrivedNum',},
@@ -120,12 +149,21 @@
                     {title: '入库数量',field: 'storageNum',},
                     {title: '到货时间',field: 'arrivedTime',},
                     {title: '暂收时间',field: 'temporaryTime',},
-                    {title: '交付质检时间',field: 'deliveryInspectionTime',},
+                    {title: '交检时间',field: 'deliveryInspectionTime',},
                     {title: '品质时间',field: 'qualityTime',},
                     {title: '入库时间',field: 'storageTime',},
-                    {title: '仓库员', field: 'storageEmployee',},
-                    {title: '仓库ID',field: 'stockId',},
-                    {title: '仓库名称',field: 'stockName',},
+                    {
+                        title: '仓库员',
+                        field: 'warehouseEmployee',
+                    },
+                    {
+                        title: '仓库ID',
+                        field: 'warehouseCode',
+                    },
+                    {
+                        title: '仓库名称',
+                        field: 'warehouseName',
+                    },
                     {title: '录入时间',field: 'createTime',},
                     {title: '录入人',field: 'createBy',},
                     {title: '更新人',field: 'updateBy', },