From d14d19e172c63dacf9a9629119d1f3958ef0b970 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Sun, 8 Jan 2023 17:34:23 +0800 Subject: [PATCH] =?UTF-8?q?mdf=EF=BC=9A=E6=89=8B=E6=8C=81=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E6=8E=A5=E5=8F=A3=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/pda/st/out/rest/HandXCOutIvtController.java | 3 ++- .../org/nl/pda/st/out/service/HandXCOutIvtService.java | 3 ++- .../st/out/service/impl/HandXCOutIvtServiceImpl.java | 10 +++++----- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/rest/HandXCOutIvtController.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/rest/HandXCOutIvtController.java index 7b0a6848..f58126bf 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/rest/HandXCOutIvtController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/rest/HandXCOutIvtController.java @@ -2,6 +2,7 @@ package org.nl.pda.st.out.rest; +import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -44,7 +45,7 @@ public class HandXCOutIvtController { @PostMapping("/confirmoutstore") @Log("出库确认") @ApiOperation("出库确认") - public ResponseEntity confirmOutStore(@RequestBody Map whereJson) { + public ResponseEntity confirmOutStore(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(handXCOutIvtService.confirmOutStore(whereJson), HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/HandXCOutIvtService.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/HandXCOutIvtService.java index e18070fa..0170bca5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/HandXCOutIvtService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/HandXCOutIvtService.java @@ -1,5 +1,6 @@ package org.nl.pda.st.out.service; +import com.alibaba.fastjson.JSONObject; import org.nl.wql.core.content.HttpContext; import java.util.Map; @@ -25,7 +26,7 @@ public interface HandXCOutIvtService { * @param jsonObject 条件 * @return Map */ - Map confirmOutStore(Map jsonObject); + Map confirmOutStore(JSONObject jsonObject); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandXCOutIvtServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandXCOutIvtServiceImpl.java index 9746abfc..68f0590a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandXCOutIvtServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandXCOutIvtServiceImpl.java @@ -91,12 +91,12 @@ public class HandXCOutIvtServiceImpl implements HandXCOutIvtService { @Transactional(rollbackFor = Exception.class) @Override - public Map confirmOutStore(Map jsonObject) { + public Map confirmOutStore(JSONObject jsonObject) { Long currentUserId = SecurityUtils.getCurrentUserId(); UserDto userDto = userService.findById(currentUserId); - - String storagevehicle_code = (String) jsonObject.get("storagevehicle_code"); - String workorder_code = (String) jsonObject.get("workorder_code"); + JSONObject mst = jsonObject.getJSONObject("mst"); + String storagevehicle_code = mst.getString("vehicle_cod"); + String workorder_code = mst.getString("workorder_code"); if (StrUtil.isEmpty(storagevehicle_code)) { throw new PdaRequestException("载具不能为空!"); @@ -123,7 +123,7 @@ public class HandXCOutIvtServiceImpl implements HandXCOutIvtService { if(!workorder_code2.equals(workorder_code)){ throw new PdaRequestException("该载具"+storagevehicle_code+"组盘工令与所选工令不一致!"); } - JSONArray dtls = (JSONArray) jsonObject.get("dtl"); + JSONArray dtls = jsonObject.getJSONArray("dtl"); Set set = new HashSet(); for(int i=0;i