From 35790c46a6dcbc4665d513fc9e2d5bf3712b2602 Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 12 Dec 2023 08:57:59 +0800 Subject: [PATCH 1/2] =?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 --- .../service/impl/HandNewMaterialServiceImpl.java | 16 ++++++++++++++++ 1 file changed, 16 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 15c2aeb6..ae50d5e5 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 @@ -1,6 +1,7 @@ package org.nl.pda.st.in.service.impl; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; @@ -273,6 +274,8 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService { HashMap vehicle = (HashMap) jsonObject.get("vehicle"); HashMap source_bill = (HashMap) jsonObject.get("bill"); + String ivt_level1 = MapUtil.getStr(jsonObject, "ivt_level"); + if (ObjectUtil.isEmpty(vehicle)) { throw new PdaRequestException("载具不能为空,请点击查询载具是否可用！"); } @@ -435,6 +438,7 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService { row.put("create_id", currentUserId + ""); row.put("create_name", nickName); row.put("create_time", now); + row.put("ivt_level", ivt_level1); row.put("flag", flag); this.insertBucket(row); } @@ -463,6 +467,7 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService { bucket_map.put("makeup_optid", currentUserId + ""); bucket_map.put("makeup_optname", nickName); bucket_map.put("makeup_time", now); + bucket_map.put("ivt_level", ivt_level1); bucket_map.put("storagevehicle_id", vehicle.get("storagevehicle_id")); bucket_map.put("storagevehicle_code", vehicle.get("storagevehicle_code")); //如果是工序返工入库，修改桶品质类型为不良品 @@ -1040,6 +1045,17 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService { return returnjo; } + @Override + public Map getIvtLevel() { + JSONArray resultArr = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParam("flag", "14").process().getResultJSONArray(0); + + JSONObject returnjo = new JSONObject(); + returnjo.put("code", "1"); + returnjo.put("desc", "查询成功！"); + returnjo.put("ivtLevel", resultArr); + return returnjo; + } + @Transactional(rollbackFor = Exception.class) public void insertBucket(HashMap row) { WQLObject bucket_wql = WQLObject.getWQLObject("MD_PB_BucketRecord"); From 3318817a4a98d7e045f81e28b150bc605f36bf99 Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 12 Dec 2023 08:59:39 +0800 Subject: [PATCH 2/2] =?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 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" >