From 7457030e38a1e9539a016bfa74097057b6c57f20 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Fri, 17 Mar 2023 13:40:20 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=85=A5=E8=B4=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue
index e7a417ff17..0561d493a8 100644
--- a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue
@@ -730,6 +730,12 @@ export default {
         this.$message({ showClose: true, type: 'error', message: '因一次运费不能为零，请完善一次运费' })
         return
       }
+      for (var i = 0; i < this.formobj.vehicleList.length; i++) {
+        if (this.formobj.vehicleList[i].vinNo !== '' && this.formobj.vehicleList[i].engineNo === '') {
+          this.$message({ showClose: true, type: 'error', message: '车架号:' + this.formobj.vehicleList[i].vinNo + '的发动机号不能为空' })
+          return
+        }
+      }
       if (this.freightChecked) {
         this.formobj.deductionFreight = 0
       } else {
@@ -804,6 +810,12 @@ export default {
         this.$message({ showClose: true, type: 'error', message: '物流发车日期不能为空' })
         return
       }
+      for (var k = 0; k < this.formobj.vehicleList.length; k++) {
+        if (this.formobj.vehicleList[k].vinNo !== '' && this.formobj.vehicleList[k].engineNo === '') {
+          this.$message({ showClose: true, type: 'error', message: '车架号:' + this.formobj.vehicleList[k].vinNo + '的发动机号不能为空' })
+          return
+        }
+      }
       if (this.freightChecked) {
         this.formobj.deductionFreight = 0
       } else {

From 6e94dc8c622e7a98abae64e50d2ca225d2934de4 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Fri, 17 Mar 2023 14:06:34 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
index 84fc3ab5ea..aff54dd116 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
@@ -1050,6 +1050,7 @@
                         or bv.vehicleStateValue = '在途'
                         or bv.vehicleStateValue = '调入'
                 )
+        and bv.isDelete = 0
         order by isFictitious, bv.locationName, bv.vinNo desc
     </select>
 
@@ -1069,6 +1070,7 @@
         or bv.vehicleStateValue = '在途'
         or bv.vehicleStateValue = '调入'
         )
+        and bv.isDelete = 0
         <if test="list != null and list.size() != 0">
             and bv.sid in
             <foreach collection="list" item="item" index="index" open="(" separator="," close=")">

From 2d18ce4c37445d4e6d3b6e3bb29d6ecc0b9cf310 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Fri, 17 Mar 2023 14:51:27 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=85=A5=E8=B4=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue  | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue
index 6935527f73..7462711d39 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue
@@ -747,6 +747,12 @@ export default {
         this.$message({ showClose: true, type: 'error', message: '公司入库日期不能为空' })
         return
       }
+      for (var k = 0; k < this.formobj.vehicleList.length; k++) {
+        if (this.formobj.vehicleList[k].vinNo !== '' && this.formobj.vehicleList[k].engineNo === '') {
+          this.$message({ showClose: true, type: 'error', message: '车架号:' + this.formobj.vehicleList[k].vinNo + '的发动机号不能为空' })
+          return
+        }
+      }
       if (this.freightChecked) {
         this.formobj.deductionFreight = 0
       } else {
@@ -827,6 +833,12 @@ export default {
         this.$message({ showClose: true, type: 'error', message: '物流发车日期不能为空' })
         return
       }
+      for (var k = 0; k < this.formobj.vehicleList.length; k++) {
+        if (this.formobj.vehicleList[k].vinNo !== '' && this.formobj.vehicleList[k].engineNo === '') {
+          this.$message({ showClose: true, type: 'error', message: '车架号:' + this.formobj.vehicleList[k].vinNo + '的发动机号不能为空' })
+          return
+        }
+      }
       if (this.freightChecked) {
         this.formobj.deductionFreight = 0
       } else {