From 2387a2e177c3dc867d37bd9c1c4a014b9a71c3bb Mon Sep 17 00:00:00 2001
From: zds <2388969634@qq.com>
Date: Mon, 5 Dec 2022 10:49:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../st/in/service/impl/HandNewMaterialServiceImpl.java | 10 ++++++++++
 mes/qd/src/views/wms/basedata/em/bjsafeivt/index.vue   |  1 +
 mes/qd/src/views/wms/basedata/st/safeIvt/index.vue     |  1 +
 3 files changed, 12 insertions(+)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/impl/HandNewMaterialServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/impl/HandNewMaterialServiceImpl.java
index 1dee7d47..64a99f55 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/impl/HandNewMaterialServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/impl/HandNewMaterialServiceImpl.java
@@ -44,6 +44,7 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService {
     private final MaterialbaseService materialbaseService;
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Map<String, Object> checkVehicle(Map jsonObject) {
         WQLObject vehicle_wql = WQLObject.getWQLObject("MD_PB_StorageVehicleInfo");
         WQLObject bucket_wql = WQLObject.getWQLObject("MD_PB_BucketRecord");
@@ -119,6 +120,7 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Map<String, Object> checkBucket(Map jsonObject) {
         WQLObject bucket_wql = WQLObject.getWQLObject("MD_PB_BucketRecord");
         WQLObject mater_wql = WQLObject.getWQLObject("md_me_materialbase");
@@ -677,6 +679,7 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Map<String, Object> getBillDtl(Map<String, String> jsonObject, HttpContext ctx) {
         HashMap<String, String> map = new HashMap<>();
         map.put("flag", "2");
@@ -690,6 +693,7 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Map<String, Object> getRecBillDtl(Map<String, String> jsonObject, HttpContext ctx) {
         String class_idStr = MaterOptTypeEnum.RF.getClass_idStr();
 
@@ -714,6 +718,7 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Map<String, Object> findVehicle(Map<String, String> jsonObject, HttpContext ctx) {
         String bucket_code = jsonObject.get("bucket_code");
         if (StrUtil.isEmpty(bucket_code)) {
@@ -749,6 +754,7 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Map<String, Object> queryPoint(Map jsonObject) {
         WQLObject point_wql = WQLObject.getWQLObject("SCH_BASE_Point");
         WQLObject vehicle_wql = WQLObject.getWQLObject("MD_PB_StorageVehicleInfo");
@@ -842,6 +848,7 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Map<String, Object> queryLKvehicle(Map jsonObject) {
         if (ObjectUtil.isEmpty(jsonObject.get("lk_vehicle"))) {
             throw new BadRequestException("立库载具码不能为空！");
@@ -857,6 +864,7 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Map<String, Object> queryOutPoint(Map jsonObject) {
         JSONArray point_rows = WQLObject.getWQLObject("sch_base_point").query("area_type = '21' AND is_used = '1' AND is_delete = '0'").getResultJSONArray(0);
         JSONObject returnjo = new JSONObject();
@@ -867,6 +875,7 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Map<String, Object> askVehicle(Map jsonObject) {
         if (ObjectUtil.isEmpty(jsonObject.get("point"))) {
             throw new BadRequestException("点位不能为空！");
@@ -951,6 +960,7 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService {
         return returnjo;
     }
 
+    @Transactional(rollbackFor = Exception.class)
     public void insertBucket(HashMap row) {
         WQLObject bucket_wql = WQLObject.getWQLObject("MD_PB_BucketRecord");
         WQLObject change = WQLObject.getWQLObject("MD_PB_BucketChangeFlow");
diff --git a/mes/qd/src/views/wms/basedata/em/bjsafeivt/index.vue b/mes/qd/src/views/wms/basedata/em/bjsafeivt/index.vue
index 7698e673..92313f6f 100644
--- a/mes/qd/src/views/wms/basedata/em/bjsafeivt/index.vue
+++ b/mes/qd/src/views/wms/basedata/em/bjsafeivt/index.vue
@@ -146,6 +146,7 @@ export default {
       url: 'api/materialsafeivt/bjsafeivt',
       idField: 'material_id',
       sort: 'material_id,desc',
+      query: { stor_id: '1473162033548627968' },
       crudMethod: { ...crudMaterialsafeivt }
     })
   },
diff --git a/mes/qd/src/views/wms/basedata/st/safeIvt/index.vue b/mes/qd/src/views/wms/basedata/st/safeIvt/index.vue
index e3665420..4ce3fc71 100644
--- a/mes/qd/src/views/wms/basedata/st/safeIvt/index.vue
+++ b/mes/qd/src/views/wms/basedata/st/safeIvt/index.vue
@@ -116,6 +116,7 @@ export default {
         size: 20
       },
       sort: 'material_id,desc',
+      query: { stor_id: '1473161852946092032' },
       crudMethod: { ...crudMaterialsafeivt }
     })
   },