From 55d4c19879720a8df5338f7d59732481806347ed Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期六, 31 八月 2024 08:33:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 44 +++++++++++++++++++++++++++++++-------------
1 files changed, 31 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index acae7ef..62d7e0c 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -573,7 +573,6 @@
List<OpenOrderPakoutParam> list = new ArrayList<>();
-
for (Object o : jsonArray){
JSONObject jsonObject = (JSONObject)o;
String brand = jsonObject.get("brand").toString();
@@ -585,16 +584,18 @@
//褰撶敓浜у崟鍙蜂笉涓�鑷存椂锛岄渶瑕佹柊寤轰竴涓猵aram
if(list.size() == 0 || checkOrder(list,pla.getProOrderNo()) == null){
OpenOrderPakoutParam param = new OpenOrderPakoutParam();
- String type = Cools.isEmpty(pla.getProOrderNo()) ? "璋冩嫧鍏ュ簱鍗�" : "鐢熶骇鍏ュ簱鍗�";
- param.setcCode(pla.getProOrderNo());
- param.setcAccount(pla.getOwner());
- param.setdDate(Utils.getDateStr1(new Date()));
+ param.setcMaker(json.get("user").toString());
+ String type = Cools.isEmpty(pla.getProOrderNo()) ? "璋冩嫧鍏ュ簱鍗�" : "浜ф垚鍝佸叆搴�";
+ param.setcCode(Cools.isEmpty(pla.getProOrderNo()) ? (new Date().getTime()) + "" : pla.getProOrderNo());
+ param.setcAccount(pla.getWorkshop());
+ param.setdDate(Utils.getDateStr(new Date()));
param.setType(type);
List<OpenOrderPakoutParam.Body> bodyList = new ArrayList<>();
OpenOrderPakoutParam.Body body = new OpenOrderPakoutParam.Body();
body.setcInvCode(mat.getMatnr());
body.setiQuantity(pla.getWeightAnfme());
+ body.setcBatch("");
body.setCbMemo(pla.getMemo());
bodyList.add(body);
@@ -618,13 +619,25 @@
}
}
- return doHttpRequest(list, "鍏ュ簱鍗曚笂鎶�", url, orderReportPath, null, "127.0.0.1");
+ for (OpenOrderPakoutParam param : list){
+ doHttpRequest(param, "鍏ュ簱鍗曚笂鎶�", url, orderReportPath, null, "127.0.0.1");
+
+ }
+
+ return 200;
+
+ //return doHttpRequest(list, "鍏ュ簱鍗曚笂鎶�", url, orderReportPath, null, "127.0.0.1");
}
private OpenOrderPakoutParam checkOrder(List<OpenOrderPakoutParam> list, String orderNo){
for (OpenOrderPakoutParam param : list){
+
+ if(Cools.eq("璋冩嫧鍏ュ簱鍗�",param.getType()) && Cools.isEmpty(orderNo)){
+ return param;
+ }
+
//鍒ゆ柇鏄惁鍖呭惈閲嶅鐨勮鍗曞彿
if(Cools.eq(param.getCCode(),orderNo)){
return param;
@@ -659,21 +672,26 @@
.setJson(JSONObject.toJSONString(requestParam))
.build()
.doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- if(Cools.isEmpty(jsonObject.get("errCode"))){
- throw new CoolException(jsonObject.get("Message").toString());
+ response = response.replace("\\", "");
+ response = response.substring(1,response.length()-1);
+
+ JSONObject jsonObject = JSON.parseObject(response);
+ JSONArray jsonArray = (JSONArray)jsonObject.get("");
+ JSONObject jsonResult = (JSONObject) jsonArray.get(0);
+ if(Cools.isEmpty(jsonResult.get("ErrorCode"))){
+ throw new CoolException(jsonResult.get("errorMsg").toString());
}
- int code = (int) jsonObject.get("errCode");
- if(code != 0){
- throw new CoolException(jsonObject.get("errMsg").toString());
+ int code = Integer.parseInt(jsonResult.get("ErrorCode").toString());
+ if(code != 1){
+ throw new CoolException(jsonResult.get("errorMsg").toString());
}
success = true;
return code;
}catch (Exception e){
log.error(e.getMessage());
- throw new CoolException("璋冪敤鎺ュ彛鍝嶅簲閿欒");
+ throw new CoolException(e.getMessage());
}finally {
apiLogService.save(
namespace,
--
Gitblit v1.9.1