diff --git a/log.path_IS_UNDEFINED/sys-user.log b/log.path_IS_UNDEFINED/sys-user.log
index f6341a47..8856af41 100644
--- a/log.path_IS_UNDEFINED/sys-user.log
+++ b/log.path_IS_UNDEFINED/sys-user.log
@@ -1,94 +1 @@
-02:45:48.343 [Thread-50] INFO  sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
-02:45:48.345 [Thread-50] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-02:45:48.345 [Thread-50] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
-02:46:13.209 [Thread-63] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-02:46:13.210 [Thread-63] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
-02:56:50.770 [Thread-76] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-02:56:50.771 [Thread-76] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
-02:58:05.003 [Thread-89] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-02:58:05.004 [Thread-89] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
-02:59:22.821 [Thread-102] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-02:59:22.822 [Thread-102] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
-03:00:33.014 [Thread-115] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-03:00:33.014 [Thread-115] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
-03:01:35.920 [schedule-pool-2] INFO  sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
-03:12:25.938 [SpringContextShutdownHook] INFO  sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
-03:12:25.939 [SpringContextShutdownHook] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-03:12:25.939 [SpringContextShutdownHook] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
-03:13:11.692 [schedule-pool-2] INFO  sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
-03:25:43.689 [Thread-52] INFO  sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
-03:25:43.691 [Thread-52] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-03:25:43.691 [Thread-52] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
-03:26:10.292 [schedule-pool-2] INFO  sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
-03:29:00.385 [SpringContextShutdownHook] INFO  sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
-03:29:00.386 [SpringContextShutdownHook] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-03:29:00.386 [SpringContextShutdownHook] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
-03:29:29.460 [schedule-pool-2] INFO  sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
-03:30:50.965 [SpringContextShutdownHook] INFO  sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
-03:30:50.966 [SpringContextShutdownHook] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-03:30:50.966 [SpringContextShutdownHook] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
-03:31:30.040 [SpringContextShutdownHook] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-03:31:30.040 [SpringContextShutdownHook] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
-03:32:01.221 [schedule-pool-2] INFO  sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
-03:38:04.722 [Thread-51] INFO  sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
-03:38:04.723 [Thread-51] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-03:38:04.723 [Thread-51] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
-03:38:24.901 [schedule-pool-2] INFO  sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
-03:38:44.027 [SpringContextShutdownHook] INFO  sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
-03:38:44.027 [SpringContextShutdownHook] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-03:38:44.028 [SpringContextShutdownHook] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
-03:39:14.527 [schedule-pool-2] INFO  sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
-03:40:16.399 [SpringContextShutdownHook] INFO  sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
-03:40:16.399 [SpringContextShutdownHook] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-03:40:16.399 [SpringContextShutdownHook] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
-03:40:43.506 [schedule-pool-2] INFO  sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
-03:46:32.686 [SpringContextShutdownHook] INFO  sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
-03:46:32.687 [SpringContextShutdownHook] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-03:46:32.687 [SpringContextShutdownHook] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
-03:47:14.778 [schedule-pool-2] INFO  sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
-03:53:30.687 [Thread-52] INFO  sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
-03:53:30.687 [Thread-52] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-03:53:30.687 [Thread-52] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
-03:54:04.703 [schedule-pool-2] INFO  sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
-04:04:44.447 [Thread-65] INFO  sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
-04:04:44.450 [Thread-65] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-04:04:44.450 [Thread-65] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
-04:05:02.344 [SpringContextShutdownHook] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-04:05:02.345 [SpringContextShutdownHook] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
-04:05:38.817 [schedule-pool-2] INFO  sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
-04:15:55.337 [Thread-53] INFO  sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
-04:15:55.338 [Thread-53] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-04:15:55.338 [Thread-53] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
-04:17:20.638 [Thread-66] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-04:17:20.638 [Thread-66] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
-04:22:55.116 [Thread-79] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-04:22:55.117 [Thread-79] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
-04:23:29.151 [SpringContextShutdownHook] INFO  sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
-04:23:29.151 [SpringContextShutdownHook] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-04:23:29.152 [SpringContextShutdownHook] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
-04:24:32.097 [schedule-pool-2] INFO  sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
-05:43:56.126 [SpringContextShutdownHook] INFO  sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
-05:43:56.129 [SpringContextShutdownHook] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-05:43:56.129 [SpringContextShutdownHook] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
-05:44:26.717 [schedule-pool-2] INFO  sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
-15:03:41.889 [Thread-46] INFO  sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
-15:03:41.889 [Thread-46] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-15:03:41.890 [Thread-46] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
-15:04:37.822 [Thread-58] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-15:04:37.823 [Thread-58] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
-15:06:44.047 [Thread-71] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-15:06:44.048 [Thread-71] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
-15:09:56.249 [SpringContextShutdownHook] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-15:09:56.250 [SpringContextShutdownHook] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
-16:22:07.587 [SpringContextShutdownHook] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-16:22:07.588 [SpringContextShutdownHook] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
-16:36:44.603 [Thread-44] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-16:36:44.605 [Thread-44] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
-16:37:42.929 [Thread-57] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-16:37:42.931 [Thread-57] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
-16:42:28.515 [SpringContextShutdownHook] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-16:42:28.516 [SpringContextShutdownHook] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
-16:47:48.237 [schedule-pool-2] INFO  sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
-16:49:13.428 [Thread-54] INFO  sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
-16:49:13.429 [Thread-54] INFO  sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
-16:49:13.429 [Thread-54] INFO  sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
+09:20:32.487 [schedule-pool-2] INFO  sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/controller/WorkOrderDetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/manufacture/controller/WorkOrderDetailController.java
index 37a4769c..85bfbf1b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/controller/WorkOrderDetailController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/manufacture/controller/WorkOrderDetailController.java
@@ -101,9 +101,7 @@ public class WorkOrderDetailController extends BaseController
         //        反序列化
         List<WorkOrderDetail> workOrderDetailList = JSONObject.parseArray(data, WorkOrderDetail.class);
 
-
         for (int i=0;i<workOrderDetailList.size();i++) {
-
             String id = String.valueOf(workOrderDetailService.selectWorkOrderDetailById(workOrderDetailList.get(i).getWorkOrderDetailId()));
             if (Objects.equals(id, "null")) {
                 workOrderDetailService.insertWorkOrderDetail(workOrderDetailList.get(i));
diff --git a/ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsDetail/deliveryGoodsDetail.html b/ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsDetail/deliveryGoodsDetail.html
index 54db4efa..6b864709 100644
--- a/ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsDetail/deliveryGoodsDetail.html
+++ b/ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsDetail/deliveryGoodsDetail.html
@@ -86,7 +86,8 @@
                 },
                 {
                     field: 'noticeOrderNumber',
-                    title: '通知单号'
+                    title: '通知单号',
+                    visible: false
                 },
                 {
                     field: 'salesOrderNumber',
@@ -94,11 +95,13 @@
                 },
                 {
                     field: 'enterpriseCode',
-                    title: '客户代码'
+                    title: '客户代码',
+                    visible: false
                 },
                 {
                     field: 'enterpriseName',
-                    title: '客户名称'
+                    title: '客户名称',
+                    visible: false
                 },
                 {
                     field: 'finishProductCode',
@@ -118,12 +121,17 @@
                 },
                 {
                     field: 'typeMachine',
-                    title: '机种'
+                    title: '机种',
+                    visible: false
                 },
                 {
                     field: 'inventoryUnit',
                     title: '单位'
                 },
+                {
+                    field: 'productQuantity',
+                    title: '数量'
+                },
                 {
                     field: 'commonCurrency',
                     title: '币别'
@@ -132,26 +140,22 @@
                     field: 'processPrice',
                     title: '单价'
                 },
-                {
-                    field: 'productQuantity',
-                    title: '数量'
-                },
                 {
                     field: 'amountMoney',
                     title: '金额'
                 },
+                {
+                    field: 'salesExplain',
+                    title: '说明'
+                },
                 {
                     field: 'line',
-                    title: 'Line#'
+                    title: '订单项次'
                 },
                 {
                     field: 'versionNumber',
                     title: '版本号'
                 },
-                {
-                    field: 'salesExplain',
-                    title: '说明'
-                },
                 {
                     title: '操作',
                     align: 'center',
diff --git a/ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsNotice/deliveryGoodsNotice.html b/ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsNotice/deliveryGoodsNotice.html
index 3dc31098..62b16bea 100644
--- a/ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsNotice/deliveryGoodsNotice.html
+++ b/ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsNotice/deliveryGoodsNotice.html
@@ -127,6 +127,7 @@
                 {
                     field: 'exportSales',
                     title: '内外销',
+                    visible: false,
                     formatter: function(value, row, index) {
                        return $.table.selectDictLabel(exportSalesDatas, value);
                     }
@@ -150,6 +151,7 @@
                 {
                     field: 'deliveryGoodsFlag',
                     title: '发货否',
+                    visible: false,
                     formatter: function(value, row, index) {
                        return $.table.selectDictLabel(deliveryGoodsFlagDatas, value);
                     }
diff --git a/ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsNotice/edit.html b/ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsNotice/edit.html
index 5e2c2470..e515cfc6 100644
--- a/ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsNotice/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/manufacture/deliveryGoodsNotice/edit.html
@@ -84,7 +84,7 @@
                     <input name="deliveryAddress" th:field="*{deliveryAddress}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group" style="display: none">
                 <label class="col-sm-3 control-label">内外销：</label>
                 <div class="col-sm-8">
                     <select name="exportSales" class="form-control m-b" th:with="type=${@dict.getType('sys_export_sales')}">
@@ -122,7 +122,7 @@
                     </select>
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group" style="display: none">
                 <label class="col-sm-3 control-label">发货否：</label>
                 <div class="col-sm-8">
                     <select name="deliveryGoodsFlag" class="form-control m-b" th:with="type=${@dict.getType('sys_whether')}">
diff --git a/ruoyi-admin/target/classes/templates/manufacture/deliveryGoodsDetail/deliveryGoodsDetail.html b/ruoyi-admin/target/classes/templates/manufacture/deliveryGoodsDetail/deliveryGoodsDetail.html
index 54db4efa..6b864709 100644
--- a/ruoyi-admin/target/classes/templates/manufacture/deliveryGoodsDetail/deliveryGoodsDetail.html
+++ b/ruoyi-admin/target/classes/templates/manufacture/deliveryGoodsDetail/deliveryGoodsDetail.html
@@ -86,7 +86,8 @@
                 },
                 {
                     field: 'noticeOrderNumber',
-                    title: '通知单号'
+                    title: '通知单号',
+                    visible: false
                 },
                 {
                     field: 'salesOrderNumber',
@@ -94,11 +95,13 @@
                 },
                 {
                     field: 'enterpriseCode',
-                    title: '客户代码'
+                    title: '客户代码',
+                    visible: false
                 },
                 {
                     field: 'enterpriseName',
-                    title: '客户名称'
+                    title: '客户名称',
+                    visible: false
                 },
                 {
                     field: 'finishProductCode',
@@ -118,12 +121,17 @@
                 },
                 {
                     field: 'typeMachine',
-                    title: '机种'
+                    title: '机种',
+                    visible: false
                 },
                 {
                     field: 'inventoryUnit',
                     title: '单位'
                 },
+                {
+                    field: 'productQuantity',
+                    title: '数量'
+                },
                 {
                     field: 'commonCurrency',
                     title: '币别'
@@ -132,26 +140,22 @@
                     field: 'processPrice',
                     title: '单价'
                 },
-                {
-                    field: 'productQuantity',
-                    title: '数量'
-                },
                 {
                     field: 'amountMoney',
                     title: '金额'
                 },
+                {
+                    field: 'salesExplain',
+                    title: '说明'
+                },
                 {
                     field: 'line',
-                    title: 'Line#'
+                    title: '订单项次'
                 },
                 {
                     field: 'versionNumber',
                     title: '版本号'
                 },
-                {
-                    field: 'salesExplain',
-                    title: '说明'
-                },
                 {
                     title: '操作',
                     align: 'center',
diff --git a/ruoyi-admin/target/classes/templates/manufacture/deliveryGoodsNotice/deliveryGoodsNotice.html b/ruoyi-admin/target/classes/templates/manufacture/deliveryGoodsNotice/deliveryGoodsNotice.html
index 3dc31098..62b16bea 100644
--- a/ruoyi-admin/target/classes/templates/manufacture/deliveryGoodsNotice/deliveryGoodsNotice.html
+++ b/ruoyi-admin/target/classes/templates/manufacture/deliveryGoodsNotice/deliveryGoodsNotice.html
@@ -127,6 +127,7 @@
                 {
                     field: 'exportSales',
                     title: '内外销',
+                    visible: false,
                     formatter: function(value, row, index) {
                        return $.table.selectDictLabel(exportSalesDatas, value);
                     }
@@ -150,6 +151,7 @@
                 {
                     field: 'deliveryGoodsFlag',
                     title: '发货否',
+                    visible: false,
                     formatter: function(value, row, index) {
                        return $.table.selectDictLabel(deliveryGoodsFlagDatas, value);
                     }
diff --git a/ruoyi-admin/target/classes/templates/manufacture/deliveryGoodsNotice/edit.html b/ruoyi-admin/target/classes/templates/manufacture/deliveryGoodsNotice/edit.html
index 5e2c2470..e515cfc6 100644
--- a/ruoyi-admin/target/classes/templates/manufacture/deliveryGoodsNotice/edit.html
+++ b/ruoyi-admin/target/classes/templates/manufacture/deliveryGoodsNotice/edit.html
@@ -84,7 +84,7 @@
                     <input name="deliveryAddress" th:field="*{deliveryAddress}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group" style="display: none">
                 <label class="col-sm-3 control-label">内外销：</label>
                 <div class="col-sm-8">
                     <select name="exportSales" class="form-control m-b" th:with="type=${@dict.getType('sys_export_sales')}">
@@ -122,7 +122,7 @@
                     </select>
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group" style="display: none">
                 <label class="col-sm-3 control-label">发货否：</label>
                 <div class="col-sm-8">
                     <select name="deliveryGoodsFlag" class="form-control m-b" th:with="type=${@dict.getType('sys_whether')}">