[fix]

按照万材调整，修改前端58个页面的半成品类型 -> 加工方式
3 months ago · ad44e84b32
58 changed files with 78 additions and 78 deletions
--- a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpBom.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpBom.java
@ -46,7 +46,7 @@ public class ErpBom extends BaseEntity
    /** 加工方式 */
-    @Excel(name = "半成品类型",sort = 8,dictType = "processMethod")
+    @Excel(name = "加工方式",sort = 8,dictType = "processMethod")
    private String processMethod;
    /** 单位 */
--- a/ruoyi-admin/src/main/resources/templates/aftersales/complaintNotice/materialSelect.html
+++ b/ruoyi-admin/src/main/resources/templates/aftersales/complaintNotice/materialSelect.html
@ -56,7 +56,7 @@
                    field: 'materialUnit',
                },
                {
-                    title: '半成品类型',
+                    title: '加工方式',
                    field: 'materialProcessMethod',
                },
--- a/ruoyi-admin/src/main/resources/templates/erp/bom/add.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/bom/add.html
@ -40,7 +40,7 @@
                <input type="text" name="materialType" id="materialType"  readonly hidden />
            </div>
            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">半成品类型：</label>
+                <label class="col-sm-3 control-label is-required">加工方式：</label>
                <div class="col-sm-8">
                    <select id="selectProcessMethod" name="processMethod"
                            class="form-control m-b"  th:with="type=${@dict.getType('processMethod')}" disabled required>
@ -376,7 +376,7 @@
                {
                    field: 'processMethod',
                    align: 'center',
-                    title: '半成品类型',
+                    title: '加工方式',
                    formatter: function(value, row, index) {
                        return $.table.selectDictLabel(processMethodDatas, value);
                    }
--- a/ruoyi-admin/src/main/resources/templates/erp/bom/bom.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/bom/bom.html
@ -400,7 +400,7 @@
                },
                {
                    field: 'processMethod',
-                    title: '半成品类型',
+                    title: '加工方式',
                    formatter: function(value, row, index) {
                        return $.table.selectDictLabel(processMethodDatas, value);
                    }
@ -547,7 +547,7 @@
                    },
                {
                    field: 'processMethod',
-                    title: '半成品类型',
+                    title: '加工方式',
                    formatter: function(value, row, index) {
                        return $.table.selectDictLabel(processMethodDatas, value);
                    }
@ -709,7 +709,7 @@
                    },
                {
                    field: 'processMethod',
-                    title: '半成品类型',
+                    title: '加工方式',
                    formatter: function(value, row, index) {
                        return $.table.selectDictLabel(processMethodDatas, value);
                    }
--- a/ruoyi-admin/src/main/resources/templates/erp/bom/detail.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/bom/detail.html
@ -34,7 +34,7 @@
                </div>
            </div>
            <div class="form-group">    
-                <label class="col-sm-3 control-label">半成品类型：</label>
+                <label class="col-sm-3 control-label">加工方式：</label>
                <div class="col-sm-8">
                   <select disabled id="selectProcessMethod" name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}">
                        <option value=""></option>
@ -220,7 +220,7 @@
                    {
                        field: 'processMethod',
                        align: 'center',
-                        title: '半成品类型',
+                        title: '加工方式',
                        formatter: function(value, row, index) {
                            return $.table.selectDictLabel(processMethodDatas, value);
                        }
--- a/ruoyi-admin/src/main/resources/templates/erp/bom/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/bom/edit.html
@ -37,7 +37,7 @@
            </div>
            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">半成品类型：</label>
+                <label class="col-sm-3 control-label is-required">加工方式：</label>
                <div class="col-sm-8">
                   <select id="selectProcessMethod" name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}" required disabled>
                        <option value=""></option>
--- a/ruoyi-admin/src/main/resources/templates/erp/bom/taskGcjlVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/bom/taskGcjlVerify.html
@ -63,7 +63,7 @@
            <input type="text" id="materialType" name="materialType" th:field="*{materialType}" readonly hidden />
        </div>
        <div class="form-group">
-            <label class="col-sm-3 control-label is-required">半成品类型：</label>
+            <label class="col-sm-3 control-label is-required">加工方式：</label>
            <div class="col-sm-8">
                <select name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}" disabled required>
                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{processMethod}"></option>
@ -394,7 +394,7 @@
                },
                {
                    field: 'processMethod',
-                    title: '半成品类型',
+                    title: '加工方式',
                    formatter: function (value, row, index) {
                        return $.table.selectDictLabel(processMethodDatas, value);
                    }
--- a/ruoyi-admin/src/main/resources/templates/erp/bom/taskGczgVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/bom/taskGczgVerify.html
@ -64,7 +64,7 @@
            <input type="text" id="materialType" name="materialType" th:field="*{materialType}" readonly hidden />
        </div>
        <div class="form-group">
-            <label class="col-sm-3 control-label is-required">半成品类型：</label>
+            <label class="col-sm-3 control-label is-required">加工方式：</label>
            <div class="col-sm-8">
                <select name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}" disabled required>
                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{processMethod}"></option>
@ -394,7 +394,7 @@
                },
                {
                    field: 'processMethod',
-                    title: '半成品类型',
+                    title: '加工方式',
                    formatter: function (value, row, index) {
                        return $.table.selectDictLabel(processMethodDatas, value);
                    }
--- a/ruoyi-admin/src/main/resources/templates/erp/bom/taskModifyApply.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/bom/taskModifyApply.html
@ -64,7 +64,7 @@
            <input type="text" id="materialType" name="materialType" th:field="*{materialType}" readonly hidden />
        </div>
        <div class="form-group">
-            <label class="col-sm-3 control-label is-required">半成品类型：</label>
+            <label class="col-sm-3 control-label is-required">加工方式：</label>
            <div class="col-sm-8">
                <select name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}" disabled required>
                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{processMethod}"></option>
--- a/ruoyi-admin/src/main/resources/templates/erp/bom/taskYfzjVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/bom/taskYfzjVerify.html
@ -63,7 +63,7 @@
            <input type="text" id="materialType" name="materialType" th:field="*{materialType}" readonly hidden />
        </div>
        <div class="form-group">
-            <label class="col-sm-3 control-label is-required">半成品类型：</label>
+            <label class="col-sm-3 control-label is-required">加工方式：</label>
            <div class="col-sm-8">
                <select name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}" disabled required>
                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{processMethod}"></option>
@ -393,7 +393,7 @@
                },
                {
                    field: 'processMethod',
-                    title: '半成品类型',
+                    title: '加工方式',
                    formatter: function (value, row, index) {
                        return $.table.selectDictLabel(processMethodDatas, value);
                    }
--- a/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/confirm.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/confirm.html
@ -179,7 +179,7 @@
                            return $.table.selectDictLabel(sysUnitClassDatas, value);
                        }
                    },
-                    {title: '半成品类型',field: 'processMethod',align: 'center',
+                    {title: '加工方式',field: 'processMethod',align: 'center',
                        formatter: function(value, row, index) {
                            return $.table.selectDictLabel(processMethodDatas, value);
                        }
@ -234,7 +234,7 @@
                    {field: 'photoUrl',title: '图片',formatter: function(value, row, index) {return $.table.imageView(value);}},
                    {title: '物料名称',field: 'materialName', },
                    {field: 'materialType',title: '物料类型',formatter: function(value, row, index) { return $.table.selectCategoryLabel(materialTypeDatas, value);}},
-                    {field: 'processMethod', title: '半成品类型',formatter: function(value, row, index) {return $.table.selectDictLabel(processMethodDatas, value);}},
+                    {field: 'processMethod', title: '加工方式',formatter: function(value, row, index) {return $.table.selectDictLabel(processMethodDatas, value);}},
                    {field: 'unit',title: '单位',},
                    { title: '品牌',field: 'brand', },
                    {title: '描述',field: 'describe'},
--- a/ruoyi-admin/src/main/resources/templates/erp/inboundOrder/add.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/inboundOrder/add.html
@ -132,7 +132,7 @@
                    {
                        field: 'processMethod',
                        align: 'center',
-                        title: '半成品类型',
+                        title: '加工方式',
                        formatter: function(value, row, index) {
                            return $.table.selectDictLabel(processMethodDatas, value);
                        }
@ -264,7 +264,7 @@
                    {
                        field: 'processMethod',
-                        title: '半成品类型',
+                        title: '加工方式',
                        formatter: function(value, row, index) {
                            return $.table.selectDictLabel(processMethodDatas, value);
                        }
--- a/ruoyi-admin/src/main/resources/templates/erp/inboundOrder/equipmentResumeDetail.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/inboundOrder/equipmentResumeDetail.html
@ -62,7 +62,7 @@
                </div>
                <div class="col-sm-6">
                    <div class="form-group">
-                        <label class="col-sm-4 control-label">半成品类型：</label>
+                        <label class="col-sm-4 control-label">加工方式：</label>
                        <div class="col-sm-8">
                            <select disabled name="processMethod" class="form-control m-b" th:field="*{processMethod}" th:with="type=${@dict.getType('processMethod')}" required>
                                <option value=""></option>
--- a/ruoyi-admin/src/main/resources/templates/erp/inboundOrder/processInboundDetail.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/inboundOrder/processInboundDetail.html
@ -128,7 +128,7 @@
                {
                    field: 'processMethod',
                    align: 'center',
-                    title: '半成品类型',
+                    title: '加工方式',
                    formatter: function(value, row, index) {
                        return $.table.selectDictLabel(processMethodDatas, value);
                    }
@ -260,7 +260,7 @@
                {
                    field: 'processMethod',
-                    title: '半成品类型',
+                    title: '加工方式',
                    formatter: function(value, row, index) {
                        return $.table.selectDictLabel(processMethodDatas, value);
                    }
--- a/ruoyi-admin/src/main/resources/templates/erp/inboundOrder/produceInboundDetail.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/inboundOrder/produceInboundDetail.html
@ -127,7 +127,7 @@
                {
                    field: 'processMethod',
                    align: 'center',
-                    title: '半成品类型',
+                    title: '加工方式',
                    formatter: function(value, row, index) {
                        return $.table.selectDictLabel(processMethodDatas, value);
                    }
@ -277,7 +277,7 @@
                {
                    field: 'processMethod',
-                    title: '半成品类型',
+                    title: '加工方式',
                    formatter: function(value, row, index) {
                        return $.table.selectDictLabel(processMethodDatas, value);
                    }
--- a/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspection/add.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspection/add.html
@ -172,7 +172,7 @@
                {
                    field: 'processMethod',
                    align: 'center',
-                    title: '半成品类型',
+                    title: '加工方式',
                    formatter: function(value, row, index) {
                        var curIndex = index;
                        var columnInput = $.common.sprintf("<input type='hidden' name='inspectionDetails[%s].processMethod' value='%s'>", curIndex, value);
--- a/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspection/detail.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspection/detail.html
@ -162,7 +162,7 @@
                {
                    field: 'processMethod',
                    align: 'center',
-                    title: '半成品类型',
+                    title: '加工方式',
                    formatter: function(value, row, index) {
                        return $.table.selectDictLabel(processMethodDatas, value);
                    }
--- a/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspection/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspection/edit.html
@ -192,7 +192,7 @@
                    {
                        field: 'processMethod',
                        align: 'center',
-                        title: '半成品类型',
+                        title: '加工方式',
                        formatter: function(value, row, index) {
                            var curIndex = index;
                            var columnInput = $.common.sprintf("<input type='hidden' name='inspectionDetails[%s].processMethod' value='%s'>", curIndex, value);
--- a/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspectionDetail/add.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspectionDetail/add.html
@ -47,7 +47,7 @@
                </div>
            </div>
            <div class="form-group">    
-                <label class="col-sm-3 control-label">半成品类型：</label>
+                <label class="col-sm-3 control-label">加工方式：</label>
                <div class="col-sm-8">
                    <input name="processMethod" class="form-control" type="text">
                </div>
--- a/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspectionDetail/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspectionDetail/edit.html
@ -42,7 +42,7 @@
                </div>
            </div>
            <div class="form-group">    
-                <label class="col-sm-3 control-label">半成品类型：</label>
+                <label class="col-sm-3 control-label">加工方式：</label>
                <div class="col-sm-8">
                    <input name="processMethod" th:field="*{processMethod}" class="form-control" type="text">
                </div>
--- a/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspectionDetail/materialReturnInspectionDetail.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspectionDetail/materialReturnInspectionDetail.html
@ -30,7 +30,7 @@
                                </select>
                            </li>
                            <li>
-                                <label>半成品类型：</label>
+                                <label>加工方式：</label>
                                <input type="text" name="processMethod"/>
                            </li>
                            <li>
@ -155,7 +155,7 @@
                    field: 'materialType',
                },
                {
-                    title: '半成品类型',
+                    title: '加工方式',
                    field: 'processMethod',
                },
                {
--- a/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/add.html
+++ b/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/add.html
@ -98,7 +98,7 @@
                    },
                    {field: 'describe',title: '描述',},
                    {field: 'brand',title: '品牌',},
-                    {field: 'processMethod',title: '半成品类型',
+                    {field: 'processMethod',title: '加工方式',
                        formatter: function(value, row, index) {return $.table.selectDictLabel(processMethodDatas, value);}
                    },
                    {field: 'unit',title: '单位',
--- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/add.html
+++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/add.html
@ -155,7 +155,7 @@
                            return $.table.selectDictLabel(sysUnitClassData, value);
                        }
                    },
-                    {title: '半成品类型',field: 'processMethod',align: 'center',
+                    {title: '加工方式',field: 'processMethod',align: 'center',
                        formatter: function(value, row, index) {
                            return $.table.selectDictLabel(processMethodData, value);
                        }
--- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/detail.html
+++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/detail.html
@ -197,7 +197,7 @@
                            return $.table.selectDictLabel(sysUnitClassDatas, value);
                        }
                    },
-                    {title: '半成品类型',field: 'processMethod',align: 'center',
+                    {title: '加工方式',field: 'processMethod',align: 'center',
                        formatter: function(value, row, index) {
                            return $.table.selectDictLabel(processMethodDatas, value);
                        }
--- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/edit.html
@ -205,7 +205,7 @@
                            return $.table.selectDictLabel(sysUnitClassDatas, value);
                        }
                    },
-                    {title: '半成品类型',field: 'processMethod',align: 'center',
+                    {title: '加工方式',field: 'processMethod',align: 'center',
                        formatter: function(value, row, index) {
                            return $.table.selectDictLabel(processMethodDatas, value);
                        }
--- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskCgjlVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskCgjlVerify.html
@ -240,7 +240,7 @@
                            return $.table.selectDictLabel(sysUnitClassDatas, value);
                        }
                    },
-                    {title: '半成品类型',field: 'processMethod',align: 'center',
+                    {title: '加工方式',field: 'processMethod',align: 'center',
                        formatter: function(value, row, index) {
                            return $.table.selectDictLabel(processMethodDatas, value);
                        }
--- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskFzjlVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskFzjlVerify.html
@ -240,7 +240,7 @@
                            return $.table.selectDictLabel(sysUnitClassDatas, value);
                        }
                    },
-                    {title: '半成品类型',field: 'processMethod',align: 'center',
+                    {title: '加工方式',field: 'processMethod',align: 'center',
                        formatter: function(value, row, index) {
                            return $.table.selectDictLabel(processMethodDatas, value);
                        }
--- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskModifyApply.html
+++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskModifyApply.html
@ -223,7 +223,7 @@
                            return $.table.selectDictLabel(sysUnitClassDatas, value);
                        }
                    },
-                    {title: '半成品类型',field: 'processMethod',align: 'center',
+                    {title: '加工方式',field: 'processMethod',align: 'center',
                        formatter: function(value, row, index) {
                            return $.table.selectDictLabel(processMethodDatas, value);
                        }
--- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuoteChild/add.html
+++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuoteChild/add.html
@ -42,7 +42,7 @@
                </select>
            </div>
            <div class="form-group">    
-                <label class="col-sm-3 control-label">半成品类型：</label>
+                <label class="col-sm-3 control-label">加工方式：</label>
                <div class="col-sm-8">
                    <input name="processMethod" class="form-control" type="text">
                </div>
--- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuoteChild/purchaseQuoteChild.html
+++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuoteChild/purchaseQuoteChild.html
@ -38,7 +38,7 @@
                                </select>
                            </li>
                            <li>
-                                <label>物料的半成品类型：</label>
+                                <label>物料的加工方式：</label>
                                <input type="text" name="processMethod"/>
                            </li>
                            <li>
--- a/ruoyi-admin/src/main/resources/templates/quality/complaintNotice/returnInspectionProcessing.html
+++ b/ruoyi-admin/src/main/resources/templates/quality/complaintNotice/returnInspectionProcessing.html
@ -291,7 +291,7 @@
                    field: 'materialDescribe',
                },
                {
-                    title: '半成品类型',
+                    title: '加工方式',
                    field: 'materialProcessMethod',
                },
                {
--- a/ruoyi-admin/src/main/resources/templates/quality/manufacturingCheckout/materialSelect.html
+++ b/ruoyi-admin/src/main/resources/templates/quality/manufacturingCheckout/materialSelect.html
@ -69,7 +69,7 @@
                    field: 'materialUnit',
                },
                {
-                    title: '半成品类型',
+                    title: '加工方式',
                    field: 'materialProcessMethod',
                    formatter: function(value, row, index) {
                        return $.table.selectDictLabel(processMethodDatas, value);
--- a/ruoyi-admin/src/main/resources/templates/quality/returnInspection/detail.html
+++ b/ruoyi-admin/src/main/resources/templates/quality/returnInspection/detail.html
@ -162,7 +162,7 @@
                {
                    field: 'processMethod',
                    align: 'center',
-                    title: '半成品类型',
+                    title: '加工方式',
                    formatter: function(value, row, index) {
                        return $.table.selectDictLabel(processMethodDatas, value);
                    }
--- a/ruoyi-admin/src/main/resources/templates/quality/returnInspection/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/quality/returnInspection/edit.html
@ -192,7 +192,7 @@
                    {
                        field: 'processMethod',
                        align: 'center',
-                        title: '半成品类型',
+                        title: '加工方式',
                        formatter: function(value, row, index) {
                            var curIndex = index;
                            var columnInput = $.common.sprintf("<input type='hidden' name='inspectionDetails[%s].processMethod' value='%s'>", curIndex, value);
--- a/ruoyi-admin/src/main/resources/templates/quality/returnInspection/returnInspectionProcessing.html
+++ b/ruoyi-admin/src/main/resources/templates/quality/returnInspection/returnInspectionProcessing.html
@ -192,7 +192,7 @@
                {
                    field: 'processMethod',
                    align: 'center',
-                    title: '半成品类型',
+                    title: '加工方式',
                    formatter: function(value, row, index) {
                        var curIndex = index;
                        var columnInput = $.common.sprintf("<input type='hidden' name='inspectionDetails[%s].processMethod' value='%s'>", curIndex, value);
--- a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/add.html
@ -113,7 +113,7 @@
                            return $.table.selectDictLabel(sysUnitClassDatas, value);
                        }
                    },
-                    {title: '半成品类型',field: 'processMethod',align: 'center',visible: false,
+                    {title: '加工方式',field: 'processMethod',align: 'center',visible: false,
                        formatter: function(value, row, index) {
                            return $.table.selectDictLabel(processMethodDatas, value);
                        }
--- a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/detail.html
+++ b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/detail.html
@ -108,7 +108,7 @@
                            return $.table.selectDictLabel(sysUnitClassDatas, value);
                        }
                    },
-                    {title: '半成品类型',field: 'processMethod',align: 'center',visible: false,
+                    {title: '加工方式',field: 'processMethod',align: 'center',visible: false,
                        formatter: function(value, row, index) {
                            return $.table.selectDictLabel(processMethodDatas, value);
                        }
--- a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/edit.html
@ -111,7 +111,7 @@
                            return $.table.selectDictLabel(sysUnitClassDatas, value);
                        }
                    },
-                    {title: '半成品类型',field: 'processMethod',align: 'center',visible: false,
+                    {title: '加工方式',field: 'processMethod',align: 'center',visible: false,
                        formatter: function(value, row, index) {
                            return $.table.selectDictLabel(processMethodDatas, value);
                        }
--- a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/taskBmjlVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/taskBmjlVerify.html
@ -132,7 +132,7 @@
                        return $.table.selectDictLabel(sysUnitClassDatas, value);
                    }
                },
-                {title: '半成品类型',field: 'processMethod',align: 'center',
+                {title: '加工方式',field: 'processMethod',align: 'center',
                    formatter: function(value, row, index) {
                        return $.table.selectDictLabel(processMethodDatas, value);
                    }
--- a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/taskBmzgVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/taskBmzgVerify.html
@ -133,7 +133,7 @@
                        return $.table.selectDictLabel(sysUnitClassDatas, value);
                    }
                },
-                {title: '半成品类型',field: 'processMethod',align: 'center',
+                {title: '加工方式',field: 'processMethod',align: 'center',
                    formatter: function(value, row, index) {
                        return $.table.selectDictLabel(processMethodDatas, value);
                    }
--- a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/taskFzjlVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/taskFzjlVerify.html
@ -132,7 +132,7 @@
                        return $.table.selectDictLabel(sysUnitClassDatas, value);
                    }
                },
-                {title: '半成品类型',field: 'processMethod',align: 'center',
+                {title: '加工方式',field: 'processMethod',align: 'center',
                    formatter: function(value, row, index) {
                        return $.table.selectDictLabel(processMethodDatas, value);
                    }
--- a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/taskYfzjVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/taskYfzjVerify.html
@ -132,7 +132,7 @@
                        return $.table.selectDictLabel(sysUnitClassDatas, value);
                    }
                },
-                {title: '半成品类型',field: 'processMethod',align: 'center',
+                {title: '加工方式',field: 'processMethod',align: 'center',
                    formatter: function(value, row, index) {
                        return $.table.selectDictLabel(processMethodDatas, value);
                    }
--- a/ruoyi-admin/src/main/resources/templates/system/makeorder/addOutsourcePlan.html
+++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/addOutsourcePlan.html
@ -133,7 +133,7 @@
                {
                    field: 'processMethod',
                    align: 'center',
-                    title: '半成品类型',
+                    title: '加工方式',
                    formatter: function(value, row, index) {
                        return $.table.selectDictLabel(processMethodDatas, value);
                    }
--- a/ruoyi-admin/src/main/resources/templates/system/makeorder/addProcessInbound.html
+++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/addProcessInbound.html
@ -93,7 +93,7 @@
                },
                {field: 'brand',align: 'center',title: '品牌'},
                {field: 'describe',align: 'center',title: '描述'},
-                {field: 'processMethod',align: 'center',title: '半成品类型',
+                {field: 'processMethod',align: 'center',title: '加工方式',
                    formatter: function(value, row, index) {
                        return $.table.selectDictLabel(processMethodDatas, value);
                    }
@ -153,7 +153,7 @@
                    {field: 'describe',title: '描述',},
                    {field: 'brand', title: '品牌',},
                    {field: 'unit',title: '单位',},
-                    {field: 'processMethod',title: '半成品类型',
+                    {field: 'processMethod',title: '加工方式',
                        formatter: function(value, row, index) {
                            return $.table.selectDictLabel(processMethodDatas, value);
                        }
--- a/ruoyi-admin/src/main/resources/templates/system/makeorder/addpick.html
+++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/addpick.html
@ -149,7 +149,7 @@
                {
                    field: 'processMethod',
                    align: 'center',
-                    title: '半成品类型',
+                    title: '加工方式',
                    formatter: function(value, row, index) {
                        return $.table.selectDictLabel(processMethodDatas, value);
                    }
--- a/ruoyi-admin/src/main/resources/templates/system/makeorder/bmps.html
+++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/bmps.html
@ -145,7 +145,7 @@
                {
                    field: 'processMethod',
                    align: 'center',
-                    title: '半成品类型',
+                    title: '加工方式',
                    formatter: function(value, row, index) {
                        return $.table.selectDictLabel(processMethodDatas, value);
                    }
@ -277,7 +277,7 @@
            //
            //     {
            //         field: 'processMethod',
-            //         title: '半成品类型',
+            //         title: '加工方式',
            //         formatter: function(value, row, index) {
            //             return $.table.selectDictLabel(processMethodDatas, value);
            //         }
--- a/ruoyi-admin/src/main/resources/templates/system/makeorder/bmzgqr.html
+++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/bmzgqr.html
@ -140,7 +140,7 @@
                {
                    field: 'processMethod',
                    align: 'center',
-                    title: '半成品类型',
+                    title: '加工方式',
                    formatter: function(value, row, index) {
                        return $.table.selectDictLabel(processMethodDatas, value);
                    }
@ -272,7 +272,7 @@
            //
            //     {
            //         field: 'processMethod',
-            //         title: '半成品类型',
+            //         title: '加工方式',
            //         formatter: function(value, row, index) {
            //             return $.table.selectDictLabel(processMethodDatas, value);
            //         }
--- a/ruoyi-admin/src/main/resources/templates/system/makeorder/cgsh.html
+++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/cgsh.html
@ -140,7 +140,7 @@
                {
                    field: 'processMethod',
                    align: 'center',
-                    title: '半成品类型',
+                    title: '加工方式',
                    formatter:function (value, row, index) {
                        return processMethodFormatter(value,row,index);
                    }
--- a/ruoyi-admin/src/main/resources/templates/system/makeorder/detail.html
+++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/detail.html
@ -138,7 +138,7 @@
                {
                    field: 'processMethod',
                    align: 'center',
-                    title: '半成品类型',
+                    title: '加工方式',
                    formatter: function(value, row, index) {
                        return $.table.selectDictLabel(processMethodDatas, value);
                    }
@ -286,7 +286,7 @@
                {
                    field: 'processMethod',
                    align: 'center',
-                    title: '半成品类型',
+                    title: '加工方式',
                    formatter: function(value, row, index) {
                        return $.table.selectDictLabel(processMethodDatas, value);
                    }
--- a/ruoyi-admin/src/main/resources/templates/system/makeorder/editMakeOrderBom.html
+++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/editMakeOrderBom.html
@ -39,7 +39,7 @@
        </div>
        <div class="form-group">
-            <label class="col-sm-3 control-label is-required">半成品类型：</label>
+            <label class="col-sm-3 control-label is-required">加工方式：</label>
            <div class="col-sm-8">
                <select id="selectProcessMethod" name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}" required disabled>
                    <option value=""></option>
--- a/ruoyi-admin/src/main/resources/templates/system/makeorder/selectMakeorderDetail.html
+++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/selectMakeorderDetail.html
@ -112,7 +112,7 @@
                {
                    field: 'processMethod',
                    align: 'center',
-                    title: '半成品类型',
+                    title: '加工方式',
                    formatter: function(value, row, index) {
                        return $.table.selectDictLabel(processMethodDatas, value);
                    }
--- a/ruoyi-admin/src/main/resources/templates/system/makeorderpick/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/makeorderpick/edit.html
@ -107,7 +107,7 @@
                    },
                    {field: 'brand',align: 'center',title: '品牌'},
                    {field: 'describe',align: 'center',title: '描述'},
-                    {field: 'processMethod',align: 'center',title: '半成品类型',
+                    {field: 'processMethod',align: 'center',title: '加工方式',
                        formatter: function(value, row, index) {
                            return $.table.selectDictLabel(processMethodDatas, value);
                        }
@ -229,7 +229,7 @@
                    {
                        field: 'processMethod',
-                        title: '半成品类型',
+                        title: '加工方式',
                        formatter: function(value, row, index) {
                            return $.table.selectDictLabel(processMethodDatas, value);
                        }
--- a/ruoyi-admin/src/main/resources/templates/system/makeorderpick/taskModifyApply.html
+++ b/ruoyi-admin/src/main/resources/templates/system/makeorderpick/taskModifyApply.html
@ -165,7 +165,7 @@
                {
                    field: 'processMethod',
                    align: 'center',
-                    title: '半成品类型',
+                    title: '加工方式',
                    formatter: function(value, row, index) {
                        return $.table.selectDictLabel(processMethodDatas, value);
                    }
@ -295,7 +295,7 @@
                {
                    field: 'processMethod',
-                    title: '半成品类型',
+                    title: '加工方式',
                    formatter: function(value, row, index) {
                        return $.table.selectDictLabel(processMethodDatas, value);
                    }
--- a/ruoyi-admin/src/main/resources/templates/system/makeorderpick/taskScjlVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/makeorderpick/taskScjlVerify.html
@ -174,7 +174,7 @@
                {
                    field: 'processMethod',
                    align: 'center',
-                    title: '半成品类型',
+                    title: '加工方式',
                    formatter: function(value, row, index) {
                        return $.table.selectDictLabel(processMethodDatas, value);
                    }
@ -303,7 +303,7 @@
                {
                    field: 'processMethod',
-                    title: '半成品类型',
+                    title: '加工方式',
                    formatter: function(value, row, index) {
                        return $.table.selectDictLabel(processMethodDatas, value);
                    }
--- a/ruoyi-admin/src/main/resources/templates/system/makeorderpick/taskSczgVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/makeorderpick/taskSczgVerify.html
@ -173,7 +173,7 @@
                {
                    field: 'processMethod',
                    align: 'center',
-                    title: '半成品类型',
+                    title: '加工方式',
                    formatter: function(value, row, index) {
                        return $.table.selectDictLabel(processMethodDatas, value);
                    }
@ -302,7 +302,7 @@
                {
                    field: 'processMethod',
-                    title: '半成品类型',
+                    title: '加工方式',
                    formatter: function(value, row, index) {
                        return $.table.selectDictLabel(processMethodDatas, value);
                    }
--- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html
@ -355,7 +355,7 @@
                {title: '型号',field: 'materialModel',align: 'center'},
                {title: '品牌',field: 'brand',align: 'center'},
                { title: '单位',field: 'unit',align: 'center', formatter: function(value, row, index) {return $.table.selectDictLabel(sysUnitClassDatas, value);}},
-                {title: '半成品类型',field: 'processMethod',align: 'center',formatter: function(value, row, index) {return $.table.selectDictLabel(processMethodDatas, value);}},
+                {title: '加工方式',field: 'processMethod',align: 'center',formatter: function(value, row, index) {return $.table.selectDictLabel(processMethodDatas, value);}},
                { title: '对外售价',field: 'materialSole'},
                { title: '最新报价(RMB)',field: 'recentQuotationRMB',align: 'center',},
                { title: '最新报价(美元)',field: 'recentQuotationUSD',align: 'center',},
--- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html
@ -380,7 +380,7 @@
                        return $.table.selectDictLabel(sysUnitClassDatas, value);
                    }
                },
-                {title: '半成品类型',field: 'processMethod',align: 'center',
+                {title: '加工方式',field: 'processMethod',align: 'center',
                    formatter: function(value, row, index) {
                        return $.table.selectDictLabel(processMethodDatas, value);
                    }
--- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/startAftersalesMaterialSelect.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/startAftersalesMaterialSelect.html
@ -61,7 +61,7 @@
                    field: 'materialUnit',
                },
                {
-                    title: '半成品类型',
+                    title: '加工方式',
                    field: 'materialProcessMethod',
                },
                {