From 3318817a4a98d7e045f81e28b150bc605f36bf99 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Tue, 12 Dec 2023 08:59:39 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E7=AD=89=E7=BA=A7=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nl/pda/st/in/rest/HandNewMaterialController.java |  7 +++++++
 .../nl/pda/st/in/service/HandNewMaterialService.java |  6 ++++++
 .../nl/wms/st/core/wql/QST_IVT_RAWASSISTISTOR.wql    | 12 ++++++++++++
 .../views/wms/st/core/inbill/recycled/AddDialog.vue  |  6 ++----
 4 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/rest/HandNewMaterialController.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/rest/HandNewMaterialController.java
index 21fd0a9e..31c37d08 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/rest/HandNewMaterialController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/rest/HandNewMaterialController.java
@@ -42,6 +42,13 @@ public class HandNewMaterialController {
         return new ResponseEntity<>(handNewMaterialService.checkBucket(whereJson), HttpStatus.OK);
     }
 
+    @PostMapping("/getIvtLevel")
+    @Log("获取库存等级")
+    @ApiOperation("获取库存等级")
+    public ResponseEntity<Object> checkBucket() {
+        return new ResponseEntity<>(handNewMaterialService.getIvtLevel(), HttpStatus.OK);
+    }
+
     @PostMapping("/confirmVehicle")
     @Log("确认组盘")
     @ApiOperation("确认组盘")
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/HandNewMaterialService.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/HandNewMaterialService.java
index 0cf2f171..a79f0b16 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/HandNewMaterialService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/HandNewMaterialService.java
@@ -109,4 +109,10 @@ public interface HandNewMaterialService {
      * @return Map
      */
     Map<String, Object> insideInConfirm(JSONObject whereJson);
+
+    /**
+     * 获取库存等级
+     * @return Map<String, Object> 字典内容
+     */
+    Map<String, Object>  getIvtLevel();
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_RAWASSISTISTOR.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_RAWASSISTISTOR.wql
index 1ab6a8f2..d71dcb68 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_RAWASSISTISTOR.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_RAWASSISTISTOR.wql
@@ -490,6 +490,18 @@
                     ENDQUERY
                 ENDIF
 
+        IF 输入.flag = "14"
+                    QUERY
+                        SELECT
+                            *
+                        FROM
+                        	sys_dict_detail
+                        WHERE
+                             name = 'ST_IVT_LEVEL'
+                        ENDSELECT
+                    ENDQUERY
+                ENDIF
+
 
 
 
diff --git a/mes/qd/src/views/wms/st/core/inbill/recycled/AddDialog.vue b/mes/qd/src/views/wms/st/core/inbill/recycled/AddDialog.vue
index 96cbf79d..c3bd813d 100644
--- a/mes/qd/src/views/wms/st/core/inbill/recycled/AddDialog.vue
+++ b/mes/qd/src/views/wms/st/core/inbill/recycled/AddDialog.vue
@@ -189,7 +189,6 @@
             clearable
             class="filter-item"
             placeholder="无"
-            :disabled="mater_btn || scope.row.edit"
           >
             <el-option
               v-for="item in dict.ST_IVT_LEVEL"
@@ -447,8 +446,8 @@ export default {
     },
     handleEdit(index, row) {
       if (!row.edit) {
-        if (!row.material_id || !row.plan_qty || parseFloat(row.plan_qty) <= 0 || !row.pcsn) {
-          this.crud.notify('物料、数量、批次不可为空！', CRUD.NOTIFICATION_TYPE.INFO)
+        if (!row.material_id || !row.plan_qty || parseFloat(row.plan_qty) <= 0 || !row.pcsn || !row.ivt_level) {
+          this.crud.notify('物料、数量、批次、库存等级不可为空！', CRUD.NOTIFICATION_TYPE.INFO)
           return false
         }
       }
@@ -479,7 +478,6 @@ export default {
         if (same_mater) {
           item.edit = false
           item.quality_scode = '02'
-          item.ivt_level = '01'
           item.is_active = '1'
           item.plan_qty = item.need_qty
           this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty)