diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysTechnicalTeamServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysTechnicalTeamServiceImpl.java
index 1b345fe1..44e62316 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysTechnicalTeamServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysTechnicalTeamServiceImpl.java
@@ -136,6 +136,10 @@ public class SysTechnicalTeamServiceImpl implements ISysTechnicalTeamService
         return sysTechnicalTeamMapper.selectSysTechnicalTeamList(sysTechnicalTeam);
     }
 
+    public List<SysTechnicalTeam> selectSysProductItemLists() {
+        SysTechnicalTeam sysTechnicalTeam = new SysTechnicalTeam();
+        return sysTechnicalTeamMapper.selectSysTechnicalTeamList(sysTechnicalTeam);
+    }
     @Override
     public Object getId() {
         return redisCache.generateNo("JSTEAM");
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 c7ec029c..9be7be03 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 247e8d79..98ebac06 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/bom/add.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/bom/add.html
@@ -42,7 +42,7 @@
                 <input type="text" id="materialType" name="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 disabled id="selectProcessMethod" name="processMethod"  class="form-control m-b"  th:with="type=${@dict.getType('processMethod')}" required>
                         <option value="" ></option>
@@ -307,7 +307,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 22bbfdbe..222cfbf1 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/bom/bom.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/bom/bom.html
@@ -232,7 +232,7 @@
                 },
                 {
                     field: 'processMethod',
-                    title: '加工方式',
+                    title: '半成品类型',
                     formatter: function(value, row, index) {
                         return $.table.selectDictLabel(processMethodDatas, value);
                     }
@@ -438,7 +438,7 @@
                 },
                 {
                     field: 'processMethod',
-                    title: '加工方式',
+                    title: '半成品类型',
                     formatter: function(value, row, index) {
                         return $.table.selectDictLabel(processMethodDatas, value);
                     }
@@ -580,7 +580,7 @@
                 },
                 {
                     field: 'processMethod',
-                    title: '加工方式',
+                    title: '半成品类型',
                     formatter: function(value, row, index) {
                         return $.table.selectDictLabel(processMethodDatas, value);
                     }
@@ -738,7 +738,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 bb0bf1ad..6a29c003 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>
@@ -241,7 +241,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 a1bae484..2f89e32a 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/bom/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/bom/edit.html
@@ -35,7 +35,7 @@
 
             </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>
@@ -260,7 +260,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/taskYfzjVerify.html b/ruoyi-admin/src/main/resources/templates/erp/bom/taskYfzjVerify.html
index b75cda3f..a8417ffa 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/bom/taskYfzjVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/bom/taskYfzjVerify.html
@@ -62,7 +62,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">加工方式：</label>
+            <label class="col-sm-3 control-label">半成品类型：</label>
             <div class="col-sm-8">
                 <select name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}" disabled>
                     <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/developModifyOrder/add.html b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/add.html
index 8749cee5..7fe5f4b4 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/add.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/add.html
@@ -103,7 +103,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="materialProcessMode" class="form-control" type="text">
                 </div>
diff --git a/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/detail.html b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/detail.html
index b5aae343..95a6e59b 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/detail.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/detail.html
@@ -104,7 +104,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="materialProcessMode" th:field="*{materialProcessMode}" class="form-control" type="text">
             </div>
diff --git a/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html
index deee2227..e50747f1 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html
@@ -181,7 +181,7 @@
                         field: 'materialDescribe',
                     },
                     {
-                        title: '加工方式',
+                        title: '半成品类型',
                         field: 'materialProcessMode',
                     },
 
diff --git a/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/edit.html b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/edit.html
index d8e35626..6db90651 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/edit.html
@@ -104,7 +104,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="materialProcessMode" th:field="*{materialProcessMode}" class="form-control" type="text">
                 </div>
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 e2b53633..5b5c38c6 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 b5794016..622e488f 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 b010172c..79461419 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/material/add.html b/ruoyi-admin/src/main/resources/templates/erp/material/add.html
index bbf92807..8bf4808b 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/material/add.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/material/add.html
@@ -35,7 +35,7 @@
                 <input type="text" id="materialType" name="materialType" 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')}" required>
                         <option value=""></option>
diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/detail.html b/ruoyi-admin/src/main/resources/templates/erp/material/detail.html
index cc7e7c38..ef845d50 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/material/detail.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/material/detail.html
@@ -36,7 +36,7 @@
                 <input type="text" readonly id="materialType" name="materialType" th:field="*{materialType}" hidden />
             </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 readonly name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}">
                         <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/material/edit.html b/ruoyi-admin/src/main/resources/templates/erp/material/edit.html
index 90504a87..64899522 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/material/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/material/edit.html
@@ -36,7 +36,7 @@
                 <input type="text" id="materialType" name="materialType" th:field="*{materialType}" 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:field="*{processMethod}" th:with="type=${@dict.getType('processMethod')}" required>
                         <option value=""></option>
diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/taskGczgVerify.html b/ruoyi-admin/src/main/resources/templates/erp/material/taskGczgVerify.html
index 603cd902..625e56c6 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/material/taskGczgVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/material/taskGczgVerify.html
@@ -60,7 +60,7 @@
             <div class="col-sm-8">
                 <select name="productItem" class="form-control m-b" th:with="productList=${@productItems.selectSysProductItemLists()}" disabled>
                     <option value="">请选择</option>
-                    <option th:each="product:${productList}" th:value="${product.id}" th:text="${product.id}"></option>
+                    <option th:each="product:${productList}" th:value="${product.technicalTeamId}" th:text="${product.technicalTeamId}"></option>
                 </select>
             </div>
         </div>
@@ -69,7 +69,7 @@
             <div class="col-sm-8">
                 <select name="itemName" class="form-control m-b" th:with="productList=${@productItems.selectSysProductItemLists()}" disabled>
                     <option value="">请选择</option>
-                    <option th:each="product:${productList}" th:value="${product.productItem}" th:text="${product.productItem}"></option>
+                    <option th:each="product:${productList}" th:value="${product.technicalTeamName}" th:text="${product.technicalTeamName}"></option>
                 </select>
             </div>
         </div>
diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/taskModifyApply.html b/ruoyi-admin/src/main/resources/templates/erp/material/taskModifyApply.html
index 3c2ac072..2ef0054a 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/material/taskModifyApply.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/material/taskModifyApply.html
@@ -61,7 +61,7 @@
             <div class="col-sm-8">
                 <select name="productItem" class="form-control m-b" th:with="productList=${@productItems.selectSysProductItemLists()}" >
                     <option value="">请选择</option>
-                    <option th:each="product:${productList}" th:value="${product.id}" th:text="${product.id}"></option>
+                    <option th:each="product:${productList}" th:value="${product.technicalTeamId}" th:text="${product.technicalTeamIdid}"></option>
                 </select>
             </div>
         </div>
@@ -70,7 +70,7 @@
             <div class="col-sm-8">
                 <select name="itemName" class="form-control m-b" th:with="productList=${@productItems.selectSysProductItemLists()}" >
                     <option value="">请选择</option>
-                    <option th:each="product:${productList}" th:value="${product.productItem}" th:text="${product.productItem}"></option>
+                    <option th:each="product:${productList}" th:value="${product.technicalTeamName}" th:text="${product.technicalTeamName}"></option>
                 </select>
             </div>
         </div>
diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/taskYfzjVerify.html b/ruoyi-admin/src/main/resources/templates/erp/material/taskYfzjVerify.html
index 0741b666..7765c6cd 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/material/taskYfzjVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/material/taskYfzjVerify.html
@@ -60,7 +60,7 @@
             <div class="col-sm-8">
                 <select name="productItem" class="form-control m-b" th:with="productList=${@productItems.selectSysProductItemLists()}" disabled>
                     <option value="">请选择</option>
-                    <option th:each="product:${productList}" th:value="${product.id}" th:text="${product.id}"></option>
+                    <option th:each="product:${productList}" th:value="${product.technicalTeamId}" th:text="${product.technicalTeamId}"></option>
                 </select>
             </div>
         </div>
@@ -69,7 +69,7 @@
             <div class="col-sm-8">
                 <select name="itemName" class="form-control m-b" th:with="productList=${@productItems.selectSysProductItemLists()}" disabled>
                     <option value="">请选择</option>
-                    <option th:each="product:${productList}" th:value="${product.productItem}" th:text="${product.productItem}"></option>
+                    <option th:each="product:${productList}" th:value="${product.technicalTeamName}" th:text="${product.technicalTeamName}"></option>
                 </select>
             </div>
         </div>
@@ -88,7 +88,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">加工方式：</label>
+            <label class="col-sm-3 control-label">半成品类型：</label>
             <div class="col-sm-8">
                 <select name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}" disabled>
                     <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/materialReturnInspection/add.html b/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspection/add.html
index 5eee0c3a..585db5c2 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/edit.html b/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspection/edit.html
index 9cb0a348..d0ab6a9d 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 be049760..d966f0db 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 1c14f245..f4715d74 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 3a8512b7..46309ac3 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/purchasePlan.html b/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/purchasePlan.html
index 2d688795..fe00df57 100644
--- a/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/purchasePlan.html
+++ b/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/purchasePlan.html
@@ -147,7 +147,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 e4d8bda2..d050020e 100644
--- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/add.html
+++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/add.html
@@ -202,7 +202,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 64db2cca..08ef3cab 100644
--- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/edit.html
@@ -196,7 +196,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/quality/complaintNotice/returnInspectionProcessing.html b/ruoyi-admin/src/main/resources/templates/quality/complaintNotice/returnInspectionProcessing.html
index 78192768..359970b8 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 67918d0d..a8fe76db 100644
--- a/ruoyi-admin/src/main/resources/templates/quality/manufacturingCheckout/materialSelect.html
+++ b/ruoyi-admin/src/main/resources/templates/quality/manufacturingCheckout/materialSelect.html
@@ -61,7 +61,7 @@
                     field: 'materialUnit',
                 },
                 {
-                    title: '加工方式',
+                    title: '半成品类型',
                     field: 'materialProcessMethod',
                 },
                 {
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 8f9310d2..11c225be 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 9cb0a348..d0ab6a9d 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 a33ae8ee..684df5fa 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/customerQuote/add.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html
index 31fae57d..4ba67a3a 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html
@@ -65,7 +65,10 @@
             <div class="form-group">
                 <label class="col-sm-4 control-label">国内税率：</label>
                 <div class="col-sm-8">
-                    <input name="rmbTax" id="rmbTax_add" class="form-control" type="number" placeholder="13" tloop="%"/>
+                    <div class="input-group">
+                        <input name="rmbTax" id="rmbTax_add" class="form-control" type="number" placeholder="13" />
+                        <span class="input-group-addon">%</span>
+                    </div>
                 </div>
             </div>
             <div class="form-group">
@@ -239,7 +242,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/customerQuote/detail.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/detail.html
index 28d827e8..90438237 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/detail.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/detail.html
@@ -209,7 +209,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/customerQuote/edit.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html
index 7c18958b..af1af7b4 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html
@@ -227,7 +227,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/customerQuote/taskModifyApply.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskModifyApply.html
index 865ae2d8..3621589f 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskModifyApply.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskModifyApply.html
@@ -263,7 +263,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/customerQuote/taskYwgzVerify.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwgzVerify.html
index 1fe0386a..f33f67e0 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwgzVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwgzVerify.html
@@ -266,7 +266,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/customerQuote/taskYwjlVerify.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwjlVerify.html
index 37ccab67..77660899 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwjlVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwjlVerify.html
@@ -263,7 +263,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/customerQuote/taskZozjVerify.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskZozjVerify.html
index c5428c75..e95fed89 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskZozjVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskZozjVerify.html
@@ -262,7 +262,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/add.html b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/add.html
index d8350c83..e56462d9 100644
--- a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/add.html
@@ -90,7 +90,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/empRequisiteOrder.html b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/empRequisiteOrder.html
index 10d756f5..b8f668b9 100644
--- a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/empRequisiteOrder.html
+++ b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/empRequisiteOrder.html
@@ -99,7 +99,7 @@
                         formatter: function(value, row, index) {
                             var actions = [];
                             actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.requisiteId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                            actions.push('<a class="btn btn-danger btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.requisiteId + '\')"><i class="fa fa-remove"></i>详情</a> ');
+                            actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.requisiteId + '\')"><i class="fa fa-deatil"></i>详情</a> ');
                             if(row.delFlag == '0'){
                                 actions.push('<a class="btn btn-danger btn-xs ' + cancelFlag + '" href="javascript:void(0)" onclick="$.operate.cancel(\'' + row.id + '\')"><i class="fa fa-remove"></i>作废</a> ');
                             }else{
diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/addEquipmentResume.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/addEquipmentResume.html
index cc7ce03e..49304149 100644
--- a/ruoyi-admin/src/main/resources/templates/system/makeorder/addEquipmentResume.html
+++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/addEquipmentResume.html
@@ -62,7 +62,7 @@
                 </div>
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label is-required">加工方式：</label>
+                        <label class="col-sm-4 control-label is-required">半成品类型：</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/system/makeorder/addProcessInbound.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/addProcessInbound.html
index 88e8e780..03538561 100644
--- a/ruoyi-admin/src/main/resources/templates/system/makeorder/addProcessInbound.html
+++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/addProcessInbound.html
@@ -138,7 +138,7 @@
                 {
                     field: 'processMethod',
                     align: 'center',
-                    title: '加工方式',
+                    title: '半成品类型',
                     formatter: function(value, row, index) {
                         return $.table.selectDictLabel(processMethodDatas, value);
                     }
@@ -270,7 +270,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/addProduceInbound.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/addProduceInbound.html
index 506a85ee..ffac4dbb 100644
--- a/ruoyi-admin/src/main/resources/templates/system/makeorder/addProduceInbound.html
+++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/addProduceInbound.html
@@ -142,7 +142,7 @@
                 {
                     field: 'processMethod',
                     align: 'center',
-                    title: '加工方式',
+                    title: '半成品类型',
                     formatter: function(value, row, index) {
                         return $.table.selectDictLabel(processMethodDatas, value);
                     }
@@ -300,7 +300,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/addpick.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/addpick.html
index 9ae10450..92b999d1 100644
--- a/ruoyi-admin/src/main/resources/templates/system/makeorder/addpick.html
+++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/addpick.html
@@ -137,7 +137,7 @@
                 {
                     field: 'processMethod',
                     align: 'center',
-                    title: '加工方式',
+                    title: '半成品类型',
                     formatter: function(value, row, index) {
                         return $.table.selectDictLabel(processMethodDatas, value);
                     }
@@ -268,7 +268,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/bmps.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/bmps.html
index 1b0a584e..90e22631 100644
--- a/ruoyi-admin/src/main/resources/templates/system/makeorder/bmps.html
+++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/bmps.html
@@ -134,7 +134,7 @@
                 {
                     field: 'processMethod',
                     align: 'center',
-                    title: '加工方式',
+                    title: '半成品类型',
                     formatter: function(value, row, index) {
                         return $.table.selectDictLabel(processMethodDatas, value);
                     }
@@ -266,7 +266,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 6d041f35..59dbcfe1 100644
--- a/ruoyi-admin/src/main/resources/templates/system/makeorder/bmzgqr.html
+++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/bmzgqr.html
@@ -138,7 +138,7 @@
                 {
                     field: 'processMethod',
                     align: 'center',
-                    title: '加工方式',
+                    title: '半成品类型',
                     formatter: function(value, row, index) {
                         return $.table.selectDictLabel(processMethodDatas, value);
                     }
@@ -270,7 +270,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/gcsh.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/gcsh.html
index e5c2fa72..ea5afe12 100644
--- a/ruoyi-admin/src/main/resources/templates/system/makeorder/gcsh.html
+++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/gcsh.html
@@ -138,7 +138,7 @@
                 {
                     field: 'processMethod',
                     align: 'center',
-                    title: '加工方式',
+                    title: '半成品类型',
                     formatter: function(value, row, index) {
                         return $.table.selectDictLabel(processMethodDatas, value);
                     }
@@ -270,7 +270,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/selectMakeorderDetail.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/selectMakeorderDetail.html
index 47e1d5ad..5157c4d3 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/detail.html b/ruoyi-admin/src/main/resources/templates/system/makeorderpick/detail.html
index e2af443f..7e4dcce1 100644
--- a/ruoyi-admin/src/main/resources/templates/system/makeorderpick/detail.html
+++ b/ruoyi-admin/src/main/resources/templates/system/makeorderpick/detail.html
@@ -130,7 +130,7 @@
                     {
                         field: 'processMethod',
                         align: 'center',
-                        title: '加工方式',
+                        title: '半成品类型',
                         formatter: function(value, row, index) {
                             return $.table.selectDictLabel(processMethodDatas, value);
                         }
@@ -259,7 +259,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 215f8fa6..d7ed37ae 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 4154c180..6cb940f1 100644
--- a/ruoyi-admin/src/main/resources/templates/system/makeorderpick/taskScjlVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/makeorderpick/taskScjlVerify.html
@@ -170,7 +170,7 @@
                 {
                     field: 'processMethod',
                     align: 'center',
-                    title: '加工方式',
+                    title: '半成品类型',
                     formatter: function(value, row, index) {
                         return $.table.selectDictLabel(processMethodDatas, value);
                     }
@@ -299,7 +299,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 e7ce44bf..54bdb2db 100644
--- a/ruoyi-admin/src/main/resources/templates/system/makeorderpick/taskSczgVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/makeorderpick/taskSczgVerify.html
@@ -170,7 +170,7 @@
                 {
                     field: 'processMethod',
                     align: 'center',
-                    title: '加工方式',
+                    title: '半成品类型',
                     formatter: function(value, row, index) {
                         return $.table.selectDictLabel(processMethodDatas, value);
                     }
@@ -299,7 +299,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/requesitioningChild/add.html b/ruoyi-admin/src/main/resources/templates/system/requesitioningChild/add.html
index a4a8500c..98ec1bf5 100644
--- a/ruoyi-admin/src/main/resources/templates/system/requesitioningChild/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/requesitioningChild/add.html
@@ -42,7 +42,6 @@
                     <select name="materialType" class="form-control m-b">
                         <option value="">所有</option>
                     </select>
-                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
                 </div>
             </div>
             <div class="form-group">    
diff --git a/ruoyi-admin/src/main/resources/templates/system/requisitioning/add.html b/ruoyi-admin/src/main/resources/templates/system/requisitioning/add.html
index 057a1e35..eb6188cf 100644
--- a/ruoyi-admin/src/main/resources/templates/system/requisitioning/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/requisitioning/add.html
@@ -97,7 +97,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);
                         }
@@ -216,7 +216,7 @@
         }
         function submitHandler() {
             if ($.validate.form()) {
-                var formData = $("#form-requisitionChild-add").serializeArray();
+                var formData = $("#form-requisitioning-add").serializeArray();
                 console.log("formData",formData);
                 var tableData = $("#bootstrap-sub-table-requisitionChild").bootstrapTable('getData');
                 let rows = tableData.length;
@@ -235,7 +235,6 @@
                 type: "get",
                 dataType: "json",
                 success: function (data) {
-                    console.log(data);
                     $("select[name='deptName']").append($('<option></option>').val(data.deptName).html(data.deptName));
                     $("select[name='userName']").append($('<option></option>').val(data.userName).html(data.userName));
                     $("select[name='postName']").append($('<option></option>').val(data.postName).html(data.postName));
diff --git a/ruoyi-admin/src/main/resources/templates/system/requisitioning/edit.html b/ruoyi-admin/src/main/resources/templates/system/requisitioning/edit.html
index cb1ef2e1..23ecb1a9 100644
--- a/ruoyi-admin/src/main/resources/templates/system/requisitioning/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/requisitioning/edit.html
@@ -18,19 +18,19 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label">部门：</label>
                 <div class="col-sm-8">
-                    <select name="dept" class="form-control"></select>
+                    <select name="deptName" class="form-control"></select>
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">岗位：</label>
                 <div class="col-sm-8">
-                    <select name="post" class="form-control"></select>
+                    <select name="postName" class="form-control"></select>
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">姓名：</label>
                 <div class="col-sm-8">
-                    <select name="username" class="form-control"></select>
+                    <select name="userName" class="form-control"></select>
                 </div>
             </div>
             <div class="form-group">
@@ -68,6 +68,7 @@
         var prefix = ctx + "system/requisitioning";
         $("#form-requisitioning-edit").validate({focusCleanup: true});
         $(function() {
+            getSelections();
             var options = {
                 id:'bootstrap-sub-table-requisitionChild',
                 url: ctx + "system/requesitioningChild/list",
@@ -108,7 +109,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);
                         }
@@ -183,9 +184,31 @@
         }
         function submitHandler() {
             if ($.validate.form()) {
-                $.operate.save(prefix + "/edit", $('#form-requisitioning-edit').serialize());
+                var formData = $("#form-requisitioning-edit").serializeArray();
+                console.log("formData",formData);
+                var tableData = $("#bootstrap-sub-table-requisitionChild").bootstrapTable('getData');
+                let rows = tableData.length;
+                if(rows==0){
+                    $.modal.msgError("子表数据不能为空！");
+                }else{
+                    formData.push({"name": "baseRequisitioningOrderChildList", "value": tableData});
+                    var jsonData = $.common.formDataToJson(formData);
+                    $.operate.saveJson(prefix + "/edit", jsonData);
+                }
             }
         }
+        function getSelections(){
+            $.ajax({
+                url: ctx + "system/requisitioning/getEmpUserName",
+                type: "get",
+                dataType: "json",
+                success: function (data) {
+                    $("select[name='deptName']").append($('<option></option>').val(data.deptName).html(data.deptName));
+                    $("select[name='userName']").append($('<option></option>').val(data.userName).html(data.userName));
+                    $("select[name='postName']").append($('<option></option>').val(data.postName).html(data.postName));
+                }
+            });
+        }
     </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html
index c56222ff..4fd2ff5c 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html
@@ -194,7 +194,11 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">税率：</label>
                 <div class="col-sm-8">
-                    <input name="taxRate" id="taxRate_add" class="form-control" type="number" required>
+                    <div class="input-group">
+                        <input name="taxRate" id="taxRate_add" class="form-control" type="number" required>
+                        <span class="input-group-addon">%</span>
+                    </div>
+
                 </div>
             </div>
             <div class="form-group">
@@ -348,7 +352,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/detail.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html
index e642c9be..9648f1d3 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html
@@ -366,7 +366,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/edit.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html
index eefdefa5..68c7e5a7 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html
@@ -362,7 +362,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/taskModifyApply.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskModifyApply.html
index a34fbce5..2670daba 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskModifyApply.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskModifyApply.html
@@ -374,7 +374,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/taskYwjlVerify.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html
index 35910e50..5b35da12 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html
@@ -361,7 +361,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/taskYwzgVerify.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwzgVerify.html
index 03988543..9bfb9c1b 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwzgVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwzgVerify.html
@@ -378,7 +378,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/taskZozjVerify.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html
index a28217e7..7cca1c58 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html
@@ -361,7 +361,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);
                     }