Merge remote-tracking branch 'origin/master'

# Conflicts: # log.path_IS_UNDEFINED/sys-user.log
2 years ago · d9bc6a7a43
7 changed files with 42 additions and 32 deletions
--- 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));
--- 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',
--- 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);
                    }
--- 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')}">
--- 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',
--- 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);
                    }
--- 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')}">