From 778935ca8b04a1de989ad1f308227845f7cd88b1 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Mon, 22 Aug 2022 14:54:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pf/service/impl/FormulaServiceImpl.java   |  3 +-
 .../service/impl/PhysicalMstServiceImpl.java  |  5 +--
 .../src/views/wms/ql/physicalMst/Dialog1.vue  | 31 ++++++++++++++++++
 .../wms/ql/physicalMstConfirm/Dialog1.vue     | 32 ++++++++++++++++++-
 4 files changed, 67 insertions(+), 4 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java
index d7737966..0ed4d541 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FormulaServiceImpl.java
@@ -714,7 +714,8 @@ public class FormulaServiceImpl implements FormulaService {
 
         HashMap<String, Object> oneMap = new HashMap<>();
         // 工令相关
-        oneMap.put("workorder_code", jsonWork.getString("workorder_code"));
+        String workorder_code = jsonWork.getString("workorder_code");
+        oneMap.put("workorder_code", workorder_code.substring(workorder_code.length() - 7));
         oneMap.put("material_code", jsonMater.getString("material_code"));
         if (ObjectUtil.isNotEmpty(jsonDept)) oneMap.put("dept_name", jsonDept.getString("name"));
         if (ObjectUtil.isNotEmpty(jsonMaterExt)) oneMap.put("old_mark", jsonMaterExt.getString("old_mark"));
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/PhysicalMstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/PhysicalMstServiceImpl.java
index 341cd566..01d8b271 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/PhysicalMstServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/PhysicalMstServiceImpl.java
@@ -296,8 +296,9 @@ public class PhysicalMstServiceImpl implements PhysicalMstService {
                 json.put("remark", jsonDtl.getString("remark"));
                 json.put("is_ok", jsonDtl.getString("is_ok"));
             } else {
-                String down_limit = json.getString("down_limit");
-                if (ObjectUtil.isNotEmpty(down_limit)) json.put("value",down_limit);
+                // 获取默认检测值 默认为下限检测值
+//                String down_limit = json.getString("down_limit");
+//                if (ObjectUtil.isNotEmpty(down_limit)) json.put("value",down_limit);
             }
         }
         form.put("tableData", arr);
diff --git a/mes/qd/src/views/wms/ql/physicalMst/Dialog1.vue b/mes/qd/src/views/wms/ql/physicalMst/Dialog1.vue
index b97208c3..1dcfcc4f 100644
--- a/mes/qd/src/views/wms/ql/physicalMst/Dialog1.vue
+++ b/mes/qd/src/views/wms/ql/physicalMst/Dialog1.vue
@@ -470,6 +470,37 @@ export default {
     },
 
     onSubmit() {
+      const msg = '是否继续！'
+
+      const data = this.form1.tableData
+      var flag = 0
+      for (var row of data) {
+        if (!row.value) {
+          flag = flag + 1
+        }
+      }
+      // 如果检测值一项都没填则提示是否继续
+      if (flag === data.length) {
+        this.$confirm(msg, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          crudPhysicalMst.saveResult(this.form1).then(res => {
+            this.close()
+            this.crud.toQuery()
+            this.notify('操作成功', 'success')
+          })
+        })
+      } else {
+        crudPhysicalMst.saveResult(this.form1).then(res => {
+          this.close()
+          this.crud.toQuery()
+          this.notify('操作成功', 'success')
+        })
+      }
+    },
+    onSubmit2() {
       const data = this.form1.tableData
       var flag = 0
       for (var row of data) {
diff --git a/mes/qd/src/views/wms/ql/physicalMstConfirm/Dialog1.vue b/mes/qd/src/views/wms/ql/physicalMstConfirm/Dialog1.vue
index 452d69b1..68feb569 100644
--- a/mes/qd/src/views/wms/ql/physicalMstConfirm/Dialog1.vue
+++ b/mes/qd/src/views/wms/ql/physicalMstConfirm/Dialog1.vue
@@ -475,8 +475,38 @@ export default {
     format_inspection_item_type(row, column) {
       return this.dict.label.QL_TEST_POINTTYPE[row.inspection_item_type]
     },
-
     onSubmit() {
+      const msg = '是否继续！'
+
+      const data = this.form1.tableData
+      var flag = 0
+      for (var row of data) {
+        if (!row.value) {
+          flag = flag + 1
+        }
+      }
+      // 如果检测值一项都没填则提示是否继续
+      if (flag === data.length) {
+        this.$confirm(msg, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          crudPhysicalMst.saveResult(this.form1).then(res => {
+            this.close()
+            this.crud.toQuery()
+            this.notify('操作成功', 'success')
+          })
+        })
+      } else {
+        crudPhysicalMst.saveResult(this.form1).then(res => {
+          this.close()
+          this.crud.toQuery()
+          this.notify('操作成功', 'success')
+        })
+      }
+    },
+    onSubmit2() {
       const data = this.form1.tableData
       var flag = 0
       for (var row of data) {