From 10be65e2d82fe963bf31f1f9b95d1db21c57dbd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Tue, 3 Sep 2024 13:50:49 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=9B=98=E7=82=B9=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=9B=98=E7=82=B9controller=E7=89=A9?= =?UTF-8?q?=E6=96=99=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E7=9B=98=E7=82=B9service=E6=9F=A5=E6=89=BE=E4=B8=8E?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=E6=9C=89=E5=85=B3=E7=9A=84?= =?UTF-8?q?=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=EF=BC=8C?= =?UTF-8?q?=E8=A1=A5=E5=85=A8=E5=AD=97=E6=AE=B5=EF=BC=9B=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=BA=93=E5=AD=98=E7=89=A9=E6=96=99VO=E7=B1=BB?= =?UTF-8?q?=EF=BC=8C=E8=A1=A5=E5=85=A8=E5=AD=97=E6=AE=B5=EF=BC=9B=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98=E7=89=A9=E6=96=99=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E9=A1=B5=E9=9D=A2=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=BA=90=EF=BC=8C=E8=A1=A5=E5=85=A8=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WarehouseInventoryCheckController.java | 4 +- .../domain/VO/WarehouseMaterialVO.java | 24 ++++++++--- .../WarehouseInventoryCheckServiceImpl.java | 4 ++ .../inventoryCheck/materialSelect.html | 40 ++++++++++++++++++- 4 files changed, 64 insertions(+), 8 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseInventoryCheckController.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseInventoryCheckController.java index 588c06b7..52eb44db 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseInventoryCheckController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseInventoryCheckController.java @@ -153,8 +153,10 @@ public class WarehouseInventoryCheckController extends BaseController * 物料信息弹出页面 */ @GetMapping("/materialSelect") - public String materialSelect() + public String materialSelect(ModelMap mmap) { + List list = warehouseInventoryCheckService.selectAllMaterialInfo(); + mmap.put("materialList",list); return prefix + "/materialSelect"; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/VO/WarehouseMaterialVO.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/VO/WarehouseMaterialVO.java index 92d12b9b..824580e9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/VO/WarehouseMaterialVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/VO/WarehouseMaterialVO.java @@ -17,14 +17,26 @@ public class WarehouseMaterialVO extends BaseEntity { @Excel(name = "物料名称") private String materialName; - /** 物料单位 */ - @Excel(name = "物料单位") - private String materialUnit; + /** 照片 */ + private String materialphotoUrl; - /** 物料描述 */ - @Excel(name = "物料描述") - private String materialDescribe; + /** 物料类型 */ + private String materialType; + + /** 加工方式 */ + @Excel(name = "加工方式",dictType = "processMethod") + private String processMethod; + /** 单位 */ + @Excel(name = "单位") + private String materialUnit; + + /** 品牌 */ + @Excel(name = "品牌") + private String materialBrand; + /** 描述 */ + @Excel(name = "描述") + private String materialDescribe; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryCheckServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryCheckServiceImpl.java index 53c08b73..a45e53f3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryCheckServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryCheckServiceImpl.java @@ -156,6 +156,10 @@ public class WarehouseInventoryCheckServiceImpl implements IWarehouseInventoryCh warehouseMaterialVO.setMaterialName(erpMaterialVo.getMaterialName()); warehouseMaterialVO.setMaterialDescribe(erpMaterialVo.getDescribe()); warehouseMaterialVO.setMaterialUnit(erpMaterialVo.getUnit()); + warehouseMaterialVO.setMaterialType(erpMaterialVo.getMaterialType()); + warehouseMaterialVO.setProcessMethod(erpMaterialVo.getProcessMethod()); + warehouseMaterialVO.setMaterialBrand(erpMaterialVo.getBrand()); + warehouseMaterialVO.setMaterialphotoUrl(erpMaterialVo.getPhotoUrl()); warehouseMaterialVOs.add(warehouseMaterialVO); } return warehouseMaterialVOs; diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/inventoryCheck/materialSelect.html b/ruoyi-admin/src/main/resources/templates/warehouse/inventoryCheck/materialSelect.html index ae13ccad..0f418ed5 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/inventoryCheck/materialSelect.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/inventoryCheck/materialSelect.html @@ -16,12 +16,25 @@ var prefix = ctx + "warehouse/inventoryCheck"; // 从后端拿到传入的makeNo // var makeNo = /*[[${makeNo}]]*/ ''; + var processMethodDatas = [[${@dict.getType('processMethod')}]]; + + var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; + $(function() { + var materialList = [[${materialList}]]; + var formattedData = { + total: materialList.length, // 总记录数 + rows: materialList // 数据行 + }; var options = { id: 'bootstrap-materialSelect-table', clickToSelect: true, // 点击选中行 singleSelect: true, // 单选 - url: prefix + "/getAllMaterialInfo", + // url: prefix + "/getAllMaterialInfo", + data: formattedData, + pagination: true, + pageList: [10, 25, 50], + pageSize: 10, modalName: "物料信息", columns: [{ checkbox: true @@ -30,18 +43,43 @@ title: '料号', field: 'materialNo', }, + { + title: '图片', + field: 'materialPhotourl', + formatter: function(value, row, index) { + return $.table.imageView(value); + } + + }, { title: '物料名称', field: 'materialName', }, + { + title: '类型', + field: 'materialType', + formatter: function(value, row, index) { + return $.table.selectCategoryLabel(materialTypeDatas, value); + } + }, { title: '描述', field: 'materialDescribe', }, + { + title: '品牌', + field: 'materialBrand', + }, { title: '单位', field: 'materialUnit', }, + { title: '加工方式', + field: 'processMethod', + formatter: function(value, row, index) { + return $.table.selectDictLabel(processMethodDatas, value); + } + }, ] }; $.table.init(options);