From 0e37af66a392fd57195a726cff0e6f7c1d4c6d11 Mon Sep 17 00:00:00 2001 From: liuxy Date: Wed, 12 Jul 2023 14:20:11 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E8=BD=AF=E5=BA=9F=E7=AD=89?= =?UTF-8?q?=E7=BA=A7=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/HandNewMaterialServiceImpl.java | 12 ++++++++++++ .../pda/st/set/rest/PdaBucketController.java | 7 +++++++ .../pda/st/set/service/PdaBucketService.java | 5 +++++ .../service/impl/PdaBucketServiceImpl.java | 19 ++++++++++++++++--- .../nl/pda/st/set/wql/QPADSTSETSERVICE.wql | 12 ++++++++++++ 5 files changed, 52 insertions(+), 3 deletions(-) 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 377b2aa1..feb9d64a 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 @@ -643,6 +643,18 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService { total_qty = total_qty + bucket_now.getDoubleValue("storage_qty"); } + // 判断等级是否一致 + JSONArray jsonDtlArr = io_dtl.query("iostorinv_id = '" + iostorinv_id + "'").getResultJSONArray(0); + String ivt_level = jsonDtlArr.getJSONObject(0).getString("ivt_level"); + + boolean is_level = jsonDtlArr.stream() + .map(row -> (JSONObject) row) + .allMatch(row -> row.getString("ivt_level").equals(ivt_level)); + + if (!is_level) { + throw new PdaRequestException("库存等级不一致，请检查!"); + } + HashMap mst_map = new HashMap<>(); mst_map.put("total_qty", total_qty + ""); mst_map.put("detail_count", detail_count + ""); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/rest/PdaBucketController.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/rest/PdaBucketController.java index e33b9d1e..b5d257f4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/rest/PdaBucketController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/rest/PdaBucketController.java @@ -83,4 +83,11 @@ public class PdaBucketController { public ResponseEntity delete(@RequestBody Map whereJson) { return new ResponseEntity<>(bucketService.delete(whereJson), HttpStatus.OK); } + + @PostMapping("/getLevel") + @Log("获取等级下拉框") + @ApiOperation("获取等级下拉框") + public ResponseEntity delete() { + return new ResponseEntity<>(bucketService.getLevel(), HttpStatus.OK); + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/service/PdaBucketService.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/service/PdaBucketService.java index 2e9e218e..da48f624 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/service/PdaBucketService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/service/PdaBucketService.java @@ -53,4 +53,9 @@ public interface PdaBucketService { */ Map delete(Map jsonObject); + /** + * 获取等级下拉框 + * @return / + */ + JSONObject getLevel(); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/service/impl/PdaBucketServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/service/impl/PdaBucketServiceImpl.java index 6d3bddd1..e9b64c67 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/service/impl/PdaBucketServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/service/impl/PdaBucketServiceImpl.java @@ -149,6 +149,7 @@ public class PdaBucketServiceImpl implements PdaBucketService { UserDto userDto = userService.findById(currentUserId); String input_optname = mst.getString("user"); String pcsn = mst.getString("pcsn"); + String ivt_level = mst.getString("ivt_level"); if (StrUtil.isEmpty(material_id)) { throw new PdaRequestException("物料标识不能为空！"); @@ -177,7 +178,7 @@ public class PdaBucketServiceImpl implements PdaBucketService { bucketJo.put("pcsn", pcsn); bucketJo.put("qty_unit_id", materDto.getBase_unit_id()); bucketJo.put("qty_unit_name", materDto.getBase_unit_name()); - bucketJo.put("ivt_level", "01"); + bucketJo.put("ivt_level", ivt_level); bucketJo.put("quality_scode", "02"); bucketJo.put("storage_qty", mst.getString("storage_qty")); bucketJo.put("is_active", is_active); @@ -199,7 +200,7 @@ public class PdaBucketServiceImpl implements PdaBucketService { bucketJo.put("pcsn", pcsn); bucketJo.put("qty_unit_id", materDto.getBase_unit_id()); bucketJo.put("qty_unit_name",materDto.getBase_unit_name()); - bucketJo.put("ivt_level", "01"); + bucketJo.put("ivt_level", ivt_level); bucketJo.put("quality_scode", "02"); bucketJo.put("storage_qty", mst.getString("storage_qty")); bucketJo.put("is_active", is_active); @@ -245,7 +246,7 @@ public class PdaBucketServiceImpl implements PdaBucketService { changeObj.put("bucket_code", bucketunique); changeObj.put("material_id", material_id); changeObj.put("pcsn", pcsn); - changeObj.put("ivt_level", "01"); + changeObj.put("ivt_level", ivt_level); changeObj.put("is_active", is_active); changeObj.put("quality_scode", "02"); String change_type_scode = ""; @@ -370,5 +371,17 @@ public class PdaBucketServiceImpl implements PdaBucketService { } + @Override + public JSONObject getLevel() { + + JSONArray resultJSONArray = WQL.getWO("QPADSTSETSERVICE").addParam("flag", "17").process().getResultJSONArray(0); + + JSONObject returnjo = new JSONObject(); + returnjo.put("code", "1"); + returnjo.put("desc", "查询成功！"); + returnjo.put("result", resultJSONArray); + return returnjo; + } + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/wql/QPADSTSETSERVICE.wql b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/wql/QPADSTSETSERVICE.wql index 6a6de55a..0629bb8e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/wql/QPADSTSETSERVICE.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/wql/QPADSTSETSERVICE.wql @@ -495,3 +495,15 @@ ENDSELECT ENDQUERY ENDIF + + IF 输入.flag = "17" + QUERY + SELECT + * + FROM + sys_dict_detail + WHERE + name = 'ST_IVT_LEVEL' + ENDSELECT + ENDQUERY + ENDIF