[fix]

仓库管理 库存盘点
修改库存盘点controller物料信息页面加载接口；
修改库存盘点service查找与库存查询有关的物料信息接口，补全字段；
修改库存物料VO类，补全字段；
修改库存物料选择页面，修改数据源，补全字段；

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<WarehouseMaterialVO> list =  warehouseInventoryCheckService.selectAllMaterialInfo();
+        mmap.put("materialList",list);
         return prefix + "/materialSelect";
     }
 

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 materialphotoUrl;
-    private String materialUnit;
 
-    /** 物料描述 */
+    /** 物料类型 */
-    @Excel(name = "物料描述")
+    private String materialType;
-    private String materialDescribe;
+
+    /** 加工方式 */
+    @Excel(name = "加工方式",dictType = "processMethod")
+    private String processMethod;
 
+    /** 单位 */
+    @Excel(name = "单位")
+    private String materialUnit;
+
+    /** 品牌 */
+    @Excel(name = "品牌")
+    private String materialBrand;
 
+    /** 描述 */
+    @Excel(name = "描述")
+    private String materialDescribe;
 
 }

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;

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);