From ad44e84b322f4dd1fb03670a9eea270bb5155608 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Fri, 29 Nov 2024 17:46:58 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E6=8C=89=E7=85=A7=E4=B8=87=E6=9D=90?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?58=E4=B8=AA=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=8D=8A=E6=88=90?=
 =?UTF-8?q?=E5=93=81=E7=B1=BB=E5=9E=8B=20->=20=E5=8A=A0=E5=B7=A5=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpBom.java  | 2 +-
 .../aftersales/complaintNotice/materialSelect.html          | 2 +-
 ruoyi-admin/src/main/resources/templates/erp/bom/add.html   | 4 ++--
 ruoyi-admin/src/main/resources/templates/erp/bom/bom.html   | 6 +++---
 .../src/main/resources/templates/erp/bom/detail.html        | 4 ++--
 ruoyi-admin/src/main/resources/templates/erp/bom/edit.html  | 2 +-
 .../main/resources/templates/erp/bom/taskGcjlVerify.html    | 4 ++--
 .../main/resources/templates/erp/bom/taskGczgVerify.html    | 4 ++--
 .../main/resources/templates/erp/bom/taskModifyApply.html   | 2 +-
 .../main/resources/templates/erp/bom/taskYfzjVerify.html    | 4 ++--
 .../resources/templates/erp/developModifyOrder/confirm.html | 4 ++--
 .../src/main/resources/templates/erp/inboundOrder/add.html  | 4 ++--
 .../templates/erp/inboundOrder/equipmentResumeDetail.html   | 2 +-
 .../templates/erp/inboundOrder/processInboundDetail.html    | 4 ++--
 .../templates/erp/inboundOrder/produceInboundDetail.html    | 4 ++--
 .../templates/erp/materialReturnInspection/add.html         | 2 +-
 .../templates/erp/materialReturnInspection/detail.html      | 2 +-
 .../templates/erp/materialReturnInspection/edit.html        | 2 +-
 .../templates/erp/materialReturnInspectionDetail/add.html   | 2 +-
 .../templates/erp/materialReturnInspectionDetail/edit.html  | 2 +-
 .../materialReturnInspectionDetail.html                     | 4 ++--
 .../main/resources/templates/purchase/purchasePlan/add.html | 2 +-
 .../resources/templates/purchase/purchaseQuote/add.html     | 2 +-
 .../resources/templates/purchase/purchaseQuote/detail.html  | 2 +-
 .../resources/templates/purchase/purchaseQuote/edit.html    | 2 +-
 .../templates/purchase/purchaseQuote/taskCgjlVerify.html    | 2 +-
 .../templates/purchase/purchaseQuote/taskFzjlVerify.html    | 2 +-
 .../templates/purchase/purchaseQuote/taskModifyApply.html   | 2 +-
 .../templates/purchase/purchaseQuoteChild/add.html          | 2 +-
 .../purchase/purchaseQuoteChild/purchaseQuoteChild.html     | 2 +-
 .../quality/complaintNotice/returnInspectionProcessing.html | 2 +-
 .../quality/manufacturingCheckout/materialSelect.html       | 2 +-
 .../templates/quality/returnInspection/detail.html          | 2 +-
 .../resources/templates/quality/returnInspection/edit.html  | 2 +-
 .../returnInspection/returnInspectionProcessing.html        | 2 +-
 .../resources/templates/system/empRequisiteOrder/add.html   | 2 +-
 .../templates/system/empRequisiteOrder/detail.html          | 2 +-
 .../resources/templates/system/empRequisiteOrder/edit.html  | 2 +-
 .../templates/system/empRequisiteOrder/taskBmjlVerify.html  | 2 +-
 .../templates/system/empRequisiteOrder/taskBmzgVerify.html  | 2 +-
 .../templates/system/empRequisiteOrder/taskFzjlVerify.html  | 2 +-
 .../templates/system/empRequisiteOrder/taskYfzjVerify.html  | 2 +-
 .../templates/system/makeorder/addOutsourcePlan.html        | 2 +-
 .../templates/system/makeorder/addProcessInbound.html       | 4 ++--
 .../main/resources/templates/system/makeorder/addpick.html  | 2 +-
 .../src/main/resources/templates/system/makeorder/bmps.html | 4 ++--
 .../main/resources/templates/system/makeorder/bmzgqr.html   | 4 ++--
 .../src/main/resources/templates/system/makeorder/cgsh.html | 2 +-
 .../main/resources/templates/system/makeorder/detail.html   | 4 ++--
 .../templates/system/makeorder/editMakeOrderBom.html        | 2 +-
 .../templates/system/makeorder/selectMakeorderDetail.html   | 2 +-
 .../main/resources/templates/system/makeorderpick/edit.html | 4 ++--
 .../templates/system/makeorderpick/taskModifyApply.html     | 4 ++--
 .../templates/system/makeorderpick/taskScjlVerify.html      | 4 ++--
 .../templates/system/makeorderpick/taskSczgVerify.html      | 4 ++--
 .../main/resources/templates/system/salesOrder/detail.html  | 2 +-
 .../main/resources/templates/system/salesOrder/edit.html    | 2 +-
 .../system/salesOrder/startAftersalesMaterialSelect.html    | 2 +-
 58 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpBom.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpBom.java
index 43e0dba0..9af1ff44 100644
--- 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;
 
     /** 单位 */
diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/complaintNotice/materialSelect.html b/ruoyi-admin/src/main/resources/templates/aftersales/complaintNotice/materialSelect.html
index 9be7be03..c7ec029c 100644
--- 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',
                 },
 
diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/add.html b/ruoyi-admin/src/main/resources/templates/erp/bom/add.html
index 356d11f3..002f4850 100644
--- 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);
                     }
diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/bom.html b/ruoyi-admin/src/main/resources/templates/erp/bom/bom.html
index b82885d0..ec138655 100644
--- 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);
                     }
diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/detail.html b/ruoyi-admin/src/main/resources/templates/erp/bom/detail.html
index 37f937ee..37265f12 100644
--- 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);
                         }
diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/edit.html b/ruoyi-admin/src/main/resources/templates/erp/bom/edit.html
index 84d1c0e5..c6dfb296 100644
--- 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>
diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/taskGcjlVerify.html b/ruoyi-admin/src/main/resources/templates/erp/bom/taskGcjlVerify.html
index 9984288e..0514fcd3 100644
--- 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);
                     }
diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/taskGczgVerify.html b/ruoyi-admin/src/main/resources/templates/erp/bom/taskGczgVerify.html
index 825d6115..19dd7c48 100644
--- 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);
                     }
diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/taskModifyApply.html b/ruoyi-admin/src/main/resources/templates/erp/bom/taskModifyApply.html
index fdebb47b..e079b26e 100644
--- 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>
diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/taskYfzjVerify.html b/ruoyi-admin/src/main/resources/templates/erp/bom/taskYfzjVerify.html
index 4062b13c..07ff6852 100644
--- 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);
                     }
diff --git a/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/confirm.html b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/confirm.html
index 0812a3f2..6022429a 100644
--- 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'},
diff --git a/ruoyi-admin/src/main/resources/templates/erp/inboundOrder/add.html b/ruoyi-admin/src/main/resources/templates/erp/inboundOrder/add.html
index 24d8f42c..5773ae6a 100644
--- 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);
                         }
diff --git a/ruoyi-admin/src/main/resources/templates/erp/inboundOrder/equipmentResumeDetail.html b/ruoyi-admin/src/main/resources/templates/erp/inboundOrder/equipmentResumeDetail.html
index 5b5c38c6..e2b53633 100644
--- 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>
diff --git a/ruoyi-admin/src/main/resources/templates/erp/inboundOrder/processInboundDetail.html b/ruoyi-admin/src/main/resources/templates/erp/inboundOrder/processInboundDetail.html
index afcf4ad5..9b15646a 100644
--- 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);
                     }
diff --git a/ruoyi-admin/src/main/resources/templates/erp/inboundOrder/produceInboundDetail.html b/ruoyi-admin/src/main/resources/templates/erp/inboundOrder/produceInboundDetail.html
index 2de8ceb4..16cbee3e 100644
--- 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);
                     }
diff --git a/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspection/add.html b/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspection/add.html
index 585db5c2..5eee0c3a 100644
--- 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);
diff --git a/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspection/detail.html b/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspection/detail.html
index f6a0c10e..c5e7b0c5 100644
--- 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);
                     }
diff --git a/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspection/edit.html b/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspection/edit.html
index d0ab6a9d..9cb0a348 100644
--- 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);
diff --git a/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspectionDetail/add.html b/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspectionDetail/add.html
index d966f0db..be049760 100644
--- 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>
diff --git a/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspectionDetail/edit.html b/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspectionDetail/edit.html
index f4715d74..1c14f245 100644
--- 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>
diff --git a/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspectionDetail/materialReturnInspectionDetail.html b/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspectionDetail/materialReturnInspectionDetail.html
index 46309ac3..3a8512b7 100644
--- 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',
                 },
                 {
diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/add.html b/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/add.html
index 526da708..fc42524e 100644
--- 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: '单位',
diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/add.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/add.html
index 76e67e96..ca20d3ee 100644
--- 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);
                         }
diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/detail.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/detail.html
index 85ce9568..5869e0e6 100644
--- 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);
                         }
diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/edit.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/edit.html
index cd658d06..91435206 100644
--- 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);
                         }
diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskCgjlVerify.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskCgjlVerify.html
index b8e0c88d..ec98dd45 100644
--- 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);
                         }
diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskFzjlVerify.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskFzjlVerify.html
index 70a39820..ea5db1bb 100644
--- 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);
                         }
diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskModifyApply.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskModifyApply.html
index 298829ef..56ef0032 100644
--- 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);
                         }
diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuoteChild/add.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuoteChild/add.html
index ea9fb8fd..aab577b3 100644
--- 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>
diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuoteChild/purchaseQuoteChild.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuoteChild/purchaseQuoteChild.html
index 889f68a1..89718f4f 100644
--- 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>
diff --git a/ruoyi-admin/src/main/resources/templates/quality/complaintNotice/returnInspectionProcessing.html b/ruoyi-admin/src/main/resources/templates/quality/complaintNotice/returnInspectionProcessing.html
index 359970b8..78192768 100644
--- 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',
                 },
                 {
diff --git a/ruoyi-admin/src/main/resources/templates/quality/manufacturingCheckout/materialSelect.html b/ruoyi-admin/src/main/resources/templates/quality/manufacturingCheckout/materialSelect.html
index 01ce16e9..fcbf203e 100644
--- 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);
diff --git a/ruoyi-admin/src/main/resources/templates/quality/returnInspection/detail.html b/ruoyi-admin/src/main/resources/templates/quality/returnInspection/detail.html
index 2981339d..5882ad7a 100644
--- 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);
                     }
diff --git a/ruoyi-admin/src/main/resources/templates/quality/returnInspection/edit.html b/ruoyi-admin/src/main/resources/templates/quality/returnInspection/edit.html
index d0ab6a9d..9cb0a348 100644
--- 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);
diff --git a/ruoyi-admin/src/main/resources/templates/quality/returnInspection/returnInspectionProcessing.html b/ruoyi-admin/src/main/resources/templates/quality/returnInspection/returnInspectionProcessing.html
index 5d6c3d2e..ffc027ca 100644
--- 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);
diff --git a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/add.html b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/add.html
index 71570720..b093131d 100644
--- 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);
                         }
diff --git a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/detail.html b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/detail.html
index eb308109..09f40c25 100644
--- 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);
                         }
diff --git a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/edit.html b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/edit.html
index 85cfc2c9..a247c7ff 100644
--- 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);
                         }
diff --git a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/taskBmjlVerify.html b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/taskBmjlVerify.html
index a6df97a8..8d62ca6e 100644
--- 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);
                     }
diff --git a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/taskBmzgVerify.html b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/taskBmzgVerify.html
index a11de6fd..6843236c 100644
--- 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);
                     }
diff --git a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/taskFzjlVerify.html b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/taskFzjlVerify.html
index cc01bdce..79ef4478 100644
--- 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);
                     }
diff --git a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/taskYfzjVerify.html b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/taskYfzjVerify.html
index 3e5e002a..5091bf2f 100644
--- 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);
                     }
diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/addOutsourcePlan.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/addOutsourcePlan.html
index fe0cc1a4..46f0ae01 100644
--- 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);
                     }
diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/addProcessInbound.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/addProcessInbound.html
index 50ddce86..14e8d1ec 100644
--- 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);
                         }
diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/addpick.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/addpick.html
index cfd45f8c..04530ef3 100644
--- 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);
                     }
diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/bmps.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/bmps.html
index bad2c977..b0b83d10 100644
--- 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);
             //         }
diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/bmzgqr.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/bmzgqr.html
index ead4e5c6..cf8df0aa 100644
--- 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);
             //         }
diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/cgsh.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/cgsh.html
index 828b4e46..7d37c0aa 100644
--- 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);
                     }
diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/detail.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/detail.html
index 17232d72..c159622d 100644
--- 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);
                     }
diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/editMakeOrderBom.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/editMakeOrderBom.html
index 86642b4b..77f767f3 100644
--- 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>
diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/selectMakeorderDetail.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/selectMakeorderDetail.html
index 5157c4d3..47e1d5ad 100644
--- 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);
                     }
diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorderpick/edit.html b/ruoyi-admin/src/main/resources/templates/system/makeorderpick/edit.html
index 2af3bfa4..4784bb76 100644
--- 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);
                         }
diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorderpick/taskModifyApply.html b/ruoyi-admin/src/main/resources/templates/system/makeorderpick/taskModifyApply.html
index 02077512..5bbfddb6 100644
--- 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);
                     }
diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorderpick/taskScjlVerify.html b/ruoyi-admin/src/main/resources/templates/system/makeorderpick/taskScjlVerify.html
index 1db0ed26..ce2737c0 100644
--- 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);
                     }
diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorderpick/taskSczgVerify.html b/ruoyi-admin/src/main/resources/templates/system/makeorderpick/taskSczgVerify.html
index 89b643a0..9c67b1cf 100644
--- 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);
                     }
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html
index feef0248..2724ced9 100644
--- 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',},
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html
index 5bbf6d81..cc6c4a25 100644
--- 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);
                     }
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/startAftersalesMaterialSelect.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/startAftersalesMaterialSelect.html
index d1f04c36..f0f51e60 100644
--- 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',
                 },
                 {