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 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 insideInConfirm(JSONObject whereJson); + + /** + * 获取库存等级 + * @return Map 字典内容 + */ + Map 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" >