[fix]

入库-仓库、入库-采购、入库-退换货、入库-委外；暂收-仓库、暂收-采购、暂收、委外前端页面和其对应的详情页面，都加上物料型号字段，物料类型和物料加工方式都引用字段字段

ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMakeDetail.html

@@ -190,6 +190,11 @@
                     align: 'center',
                     field: 'materialPhotourl',
                 },
+                {
+                    title: '物料型号',
+                    align: 'center',
+                    field: 'materialModel',
+                },
                 {
                     title: '描述',
                     align: 'center',

ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOutOrder.html

@@ -115,6 +115,7 @@
                 "materialName": item.materialName,
                 "materialType": item.materialType,
                 "materialPhotourl": item.materialPhotourl,
+                "materialModel": item.materialModel,
                 "materialDescribe": item.materialDescribe,
                 "materialBrand": item.materialBrand,
                 "materialUnit": item.materialUnit,
@@ -211,6 +212,11 @@
                         align: 'center',
                         field: 'materialPhotourl',
                     },
+                    {
+                        title: '型号',
+                        align: 'center',
+                        field: 'materialModel',
+                    },
                     {
                         title: '描述',
                         align: 'center',

ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOutOrderDetail.html

@@ -150,6 +150,11 @@
                     align: 'center',
                     field: 'materialPhotourl',
                 },
+                {
+                    title: '型号',
+                    align: 'center',
+                    field: 'materialModel',
+                },
                 {
                     title: '描述',
                     align: 'center',

ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchase.html

@@ -126,6 +126,11 @@
 
     var warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]]
     var warehouseCode = [[${warehouseStorageOrder.warehouseCode}]]
+
+    var processMethodDatas = [[${@dict.getType('processMethod')}]];
+    var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
+
+
     var prefix = ctx + "warehouse/storageOrder";
     $("#form-storagePurchase-edit").validate({
         focusCleanup: true
@@ -233,6 +238,9 @@
                 {
                     title: '物料类型',
                     field: 'materialType',
+                    formatter: function(value, row, index) {
+                        return $.table.selectCategoryLabel(materialTypeDatas, value);
+                    }
                 },
                 {
                     title: '物料图片地址',
@@ -258,6 +266,9 @@
                 {
                     title: '物料加工方式',
                     field: 'materialProcessMethod',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(processMethodDatas, value);
+                    }
                 },
 
                 {

ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseDetail.html

@@ -124,6 +124,11 @@
 
     var warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]]
     var warehouseCode = [[${warehouseStorageOrder.warehouseCode}]]
+
+    var processMethodDatas = [[${@dict.getType('processMethod')}]];
+    var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
+
+
     var prefix = ctx + "warehouse/storageOrder";
     $("#form-storagePurchase-edit").validate({
         focusCleanup: true
@@ -230,6 +235,9 @@
                 {
                     title: '物料类型',
                     field: 'materialType',
+                    formatter: function(value, row, index) {
+                        return $.table.selectCategoryLabel(materialTypeDatas, value);
+                    }
                 },
                 {
                     title: '物料图片地址',
@@ -255,6 +263,9 @@
                 {
                     title: '物料加工方式',
                     field: 'materialProcessMethod',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(processMethodDatas, value);
+                    }
                 },
 
                 {

ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouse.html

@@ -124,6 +124,10 @@
 
     var warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]]
     var warehouseCode = [[${warehouseStorageOrder.warehouseCode}]]
+
+    var processMethodDatas = [[${@dict.getType('processMethod')}]];
+    var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
+
     var prefix = ctx + "warehouse/storageOrder";
     $("#form-storagePurchaseWarehouse-edit").validate({
         focusCleanup: true
@@ -231,6 +235,9 @@
                 {
                     title: '物料类型',
                     field: 'materialType',
+                    formatter: function(value, row, index) {
+                        return $.table.selectCategoryLabel(materialTypeDatas, value);
+                    }
                 },
                 {
                     title: '物料图片地址',
@@ -256,6 +263,9 @@
                 {
                     title: '物料加工方式',
                     field: 'materialProcessMethod',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(processMethodDatas, value);
+                    }
                 },
 
                 {

ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouseDetail.html

@@ -124,6 +124,10 @@
 
     var warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]]
     var warehouseCode = [[${warehouseStorageOrder.warehouseCode}]]
+
+    var processMethodDatas = [[${@dict.getType('processMethod')}]];
+    var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
+
     var prefix = ctx + "warehouse/storageOrder";
     $("#form-temporaryPurchaseWarehouse-edit").validate({
         focusCleanup: true
@@ -229,6 +233,9 @@
                 {
                     title: '物料类型',
                     field: 'materialType',
+                    formatter: function(value, row, index) {
+                        return $.table.selectCategoryLabel(materialTypeDatas, value);
+                    }
                 },
                 {
                     title: '物料图片地址',
@@ -254,6 +261,9 @@
                 {
                     title: '物料加工方式',
                     field: 'materialProcessMethod',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(processMethodDatas, value);
+                    }
                 },
 
                 {

ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsExchanges.html

@@ -123,6 +123,7 @@
                         "materialName": item.materialName,
                         "materialType": item.materialType,
                         "materialPhotourl": item.materialPhotourl,
+                        "materialModel": item.materialModel,
                         "materialDescribe": item.materialDescribe,
                         "materialBrand": item.materialBrand,
                         "materialUnit": item.materialUnit,
@@ -218,6 +219,10 @@
                     title: '图片',
                     field: 'materialPhotourl',
                 },
+                {
+                    title: '物料型号',
+                    field: 'materialModel',
+                },
                 {
                     title: '物料描述',
                     field: 'materialDescribe',

ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsExchangesDetail.html

@@ -213,6 +213,10 @@
                     title: '物料图片地址',
                     field: 'materialPhotourl',
                 },
+                {
+                    title: '物料型号',
+                    field: 'materialModel',
+                },
                 {
                     title: '物料描述',
                     field: 'materialDescribe',

ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryOutOrder.html

@@ -117,6 +117,7 @@
                 "materialName": item.materialName,
                 "materialType": item.materialType,
                 "materialPhotourl": item.materialPhotourl,
+                "materialModel": item.materialModel,
                 "materialDescribe": item.materialDescribe,
                 "materialBrand": item.materialBrand,
                 "materialUnit": item.materialUnit,
@@ -204,6 +205,10 @@
                     align: 'center',
                     field: 'materialPhotourl',
                 },
+                {
+                    title: '物料型号',
+                    field: 'materialModel',
+                },
                 {
                     title: '物料描述',
                     align: 'center',

ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryOutOrderDetail.html

@@ -145,6 +145,10 @@
                     align: 'center',
                     field: 'materialPhotourl',
                 },
+                {
+                    title: '物料型号',
+                    field: 'materialModel',
+                },
                 {
                     title: '描述',
                     align: 'center',

ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchase.html

@@ -128,6 +128,7 @@
 
     var warehouseDeptTypeDatas = [[${@dict.getType('warehouse_dept_type')}]];
     var processMethodDatas = [[${@dict.getType('processMethod')}]];
+    var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
 
     var prefix = ctx + "warehouse/storageOrder";
     $("#form-temporaryPurchaseWarehouse-edit").validate({
@@ -232,6 +233,9 @@
                 {
                     title: '物料类型',
                     field: 'materialType',
+                    formatter: function(value, row, index) {
+                        return $.table.selectCategoryLabel(materialTypeDatas, value);
+                    }
                 },
                 {
                     title: '物料图片地址',

ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseDetail.html

@@ -128,6 +128,7 @@
 
     var warehouseDeptTypeDatas = [[${@dict.getType('warehouse_dept_type')}]];
     var processMethodDatas = [[${@dict.getType('processMethod')}]];
+    var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
 
     var prefix = ctx + "warehouse/storageOrder";
     $("#form-temporaryPurchaseWarehouse-edit").validate({
@@ -231,6 +232,9 @@
                 {
                     title: '物料类型',
                     field: 'materialType',
+                    formatter: function(value, row, index) {
+                        return $.table.selectCategoryLabel(materialTypeDatas, value);
+                    }
                 },
                 {
                     title: '物料图片地址',

ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseWarehouse.html

@@ -122,9 +122,9 @@
 
     var warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]]
     var warehouseCode = [[${warehouseStorageOrder.warehouseCode}]]
-    var processMethodDatas = [[${@dict.getType('processMethod')}]];
-
     var warehouseDeptTypeDatas = [[${@dict.getType('warehouse_dept_type')}]];
+    var processMethodDatas = [[${@dict.getType('processMethod')}]];
+    var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
 
     var prefix = ctx + "warehouse/storageOrder";
     $("#form-temporaryPurchaseWarehouse-edit").validate({
@@ -226,6 +226,9 @@
                 {
                     title: '物料类型',
                     field: 'materialType',
+                    formatter: function(value, row, index) {
+                        return $.table.selectCategoryLabel(materialTypeDatas, value);
+                    }
                 },
                 {
                     title: '物料图片地址',

ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseWarehouseDetail.html

@@ -126,6 +126,7 @@
 
     var warehouseDeptTypeDatas = [[${@dict.getType('warehouse_dept_type')}]];
     var processMethodDatas = [[${@dict.getType('processMethod')}]];
+    var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
 
     var prefix = ctx + "warehouse/storageOrder";
     $("#form-temporaryPurchaseWarehouse-edit").validate({
@@ -228,6 +229,9 @@
                 {
                     title: '物料类型',
                     field: 'materialType',
+                    formatter: function(value, row, index) {
+                        return $.table.selectCategoryLabel(materialTypeDatas, value);
+                    }
                 },
                 {
                     title: '物料图片地址',