From 3c34900441df340fa6f1ca185ee9f69603705592 Mon Sep 17 00:00:00 2001
From: zhangzhiqiang <zhangzhiqiang@yoycol.com>
Date: Sat, 3 Jun 2023 17:14:04 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E4=BF=AE=E6=94=B9bug=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EmptyVehicleServiceImpl.java | 10 +++++--
 .../pf/service/impl/FlourworkServiceImpl.java |  2 +-
 .../master/bagrecord/insertAndPrintDialog.vue | 26 +++++++++----------
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/vehicle/service/impl/EmptyVehicleServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/vehicle/service/impl/EmptyVehicleServiceImpl.java
index 7f6a7e5d..74157b6b 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/vehicle/service/impl/EmptyVehicleServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/vehicle/service/impl/EmptyVehicleServiceImpl.java
@@ -523,8 +523,14 @@ public class EmptyVehicleServiceImpl implements EmptyVehicleService {
         JSONObject obj = jo.getJSONObject("obj");
 
         String vehicle_code = (String) jsonObject.get("vehicle_code");
-        JSONArray has = line_wql.query("storagevehicle_code = '" + vehicle_code + "' and workorder_id = '" + obj.getString("workorder_id") + "'").getResultJSONArray(0);
-
+        JSONArray has = null;
+        if (ObjectUtil.isNotEmpty(obj)){
+            try {
+                has = line_wql.query("storagevehicle_code = '" + vehicle_code + "' and workorder_id = '" + obj.getString("workorder_id") + "'").getResultJSONArray(0);
+            }catch (Exception ex){
+                log.error("组盘异常："+ex.getMessage());
+            }
+        }
         JSONObject vehicle = vehicle_wql.query("storagevehicle_code = '" + vehicle_code + "'").uniqueResult(0);
         if (ObjectUtil.isEmpty(vehicle)){
             throw new PdaRequestException("输入的载具号有误！");
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java
index c2465355..f9c3d112 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java
@@ -263,7 +263,7 @@ public class FlourworkServiceImpl implements FlourworkService {
                         // 5.生成移库单
                         //校验点位是否有执行中任务：
                         ;
-                        JSONArray runingtask = WQLObject.getWQLObject("SCH_BASE_Task").query("next_point_code = '" + moveInIvt.getString("point_code") + "' and task_status <> '99'").getResultJSONArray(0);
+                        JSONArray runingtask = WQLObject.getWQLObject("SCH_BASE_Task").query("next_point_code = '" + moveInIvt.getString("point_code") + "' and task_status <> '99' and is_delete = '0'").getResultJSONArray(0);
                         if (runingtask.size()>0){
                             throw new BadRequestException("分配点位存在未完成任务:"+moveInIvt.getString("point_code"));
                         }
diff --git a/mes/qd/src/views/wms/basedata/master/bagrecord/insertAndPrintDialog.vue b/mes/qd/src/views/wms/basedata/master/bagrecord/insertAndPrintDialog.vue
index 677e4c26..0eb4f241 100644
--- a/mes/qd/src/views/wms/basedata/master/bagrecord/insertAndPrintDialog.vue
+++ b/mes/qd/src/views/wms/basedata/master/bagrecord/insertAndPrintDialog.vue
@@ -25,9 +25,9 @@
         >
           <el-option
             v-for="item in materialList"
-            :key="item.BATCH_SEQ"
-            :label="item.ITEM_CODE"
-            :value="item.ITEM_CODE"
+            :key="item.batch_seq"
+            :label="item.item_code"
+            :value="item.item_code"
           />
         </el-select>
       </el-form-item>
@@ -102,13 +102,6 @@ export default {
       default: null
     }
   },
-  watch: {
-    dialogShow: {
-      handler(newValue, oldValue) {
-        this.dialogVisible = newValue
-      }
-    }
-  },
   data() {
     return {
       materialList: [],
@@ -119,6 +112,13 @@ export default {
       }
     }
   },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
   methods: {
     handleClose(done) {
       this.$confirm('确认关闭？')
@@ -140,15 +140,15 @@ export default {
     },
     changePcsn(val) {
       this.materialList.forEach(item => {
-        if (item.ITEM_CODE === val) {
-          this.form1.pcsn = item.BATCH_SEQ
+        if (item.item_code === val) {
+          this.form1.pcsn = item.batch_seq
         }
       })
     },
     blurPerson(val) {
       // 调用接口查询对应的人员信息
       crudBagrecord.blurPerson({ 'return_code': val }).then(res => {
-        this.form1.return_person = res.EMPEE_NAME
+        this.form1.return_person = res.empee_name
       })
     },
     groupBag() {