From 0473d0bbb616679078011f8ac4f9e9be98b357d7 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Thu, 20 Jun 2024 20:02:48 +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=E6=96=B0=E5=A2=9E=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=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=20=E4=BB=8E=E4=BB=93=E5=BA=93=E4=B8=AD=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E5=87=BA=20=E8=AE=A2=E5=8D=95=E7=B1=BB=E5=9E=8B=E4=B8=BA?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E7=9A=84=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=20=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=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PurchaseStorageController.java | 8 +- .../service/IPurchaseStorageService.java | 11 +++ .../impl/PurchaseStorageServiceImpl.java | 19 +++++ .../purchaseStorage/purchaseStorage.html | 82 ++++++++++++++----- 4 files changed, 95 insertions(+), 25 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchaseStorageController.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchaseStorageController.java index b4fb8712..c8d33fda 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchaseStorageController.java +++ b/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 list = purchaseStorageService.selectPurchaseStorageList(purchaseStorage); + List list = purchaseStorageService.selectWarehouseStorageList(warehouseStorageOrder); return getDataTable(list); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/IPurchaseStorageService.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/IPurchaseStorageService.java index 093522bf..b7deaf12 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/IPurchaseStorageService.java +++ b/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 selectPurchaseStorageList(PurchaseStorage purchaseStorage); + + /** + * 从仓库入库单查询采购入库通知单列表 + * + * @param warehouseStorageOrder 仓库入库单 + * @return 采购入库通知单集合 + */ + public List selectWarehouseStorageList(WarehouseStorageOrder warehouseStorageOrder); + + /** * 新增采购入库通知单 * 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 71e32f79..272c3616 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 @@ -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 selectWarehouseStorageList(WarehouseStorageOrder warehouseStorageOrder) { + // 先获取所有仓储订单列表 + List allWarehouseStorageOrders = warehouseStorageOrderMapper.selectWarehouseStorageOrderList(warehouseStorageOrder); + + // 使用流过滤出warehouseOrderType为"0"的记录 也就是采购订单 + List filteredWarehouseStorageOrders = allWarehouseStorageOrders.stream() + .filter(s -> "0".equals(s.getWarehouseOrderType())) + .collect(Collectors.toList()); + return filteredWarehouseStorageOrders; + } + /** * 新增采购入库通知单 * 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 81598d9c..a15931e0 100644 --- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseStorage/purchaseStorage.html +++ b/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', },