From 4df80cad47f22a930435835e7f7135bd60672cd8 Mon Sep 17 00:00:00 2001 From: ZY <zc857179121@qq.com> Date: 星期四, 26 九月 2024 15:38:43 +0800 Subject: [PATCH] 1 --- src/main/java/com/zy/asrs/task/handler/OrderSendHandler.java | 4 ++-- src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 15 +++++++-------- 2 files changed, 9 insertions(+), 10 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 9e0d85f..7f15db0 100644 --- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java @@ -417,7 +417,7 @@ //鍒犻櫎瀛樿揣妗f if (param.deleteFlag == 1) { for (MatSyncParam.MatParam matParam : param.getMatDetails()) { - matService.deleteById(matParam.getMatnr()); + matService.delete(new EntityWrapper<Mat>().eq("matnr", matParam.getMatnr())); } return; @@ -583,7 +583,7 @@ Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo, brand); Mat mat = matService.selectByMaktx(pla.getBrand()); //褰撶敓浜у崟鍙蜂笉涓�鑷存椂锛岄渶瑕佹柊寤轰竴涓猵aram - if (list.size() == 0 || checkOrder(list, pla.getProOrderNo()) == null) { + if (list.isEmpty() || (!Cools.isEmpty(pla.getProOrderNo()) && checkOrder(list, pla.getProOrderNo()) == null)) { OpenOrderPakoutParam param = new OpenOrderPakoutParam(); param.setcMaker(json.get("user").toString()); String type = Cools.isEmpty(pla.getProOrderNo()) ? "璋冩嫧鍏ュ簱鍗�" : "浜ф垚鍝佸叆搴�"; @@ -620,17 +620,16 @@ } } - //for (OpenOrderPakoutParam param : list) { - 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"); - } + + @Override public List<Order> selectOrderInformation(Map<String, String> param) { List<Order> list = new ArrayList<>(); diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSendHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSendHandler.java index 82ceb2e..5fcea45 100644 --- a/src/main/java/com/zy/asrs/task/handler/OrderSendHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/OrderSendHandler.java @@ -82,7 +82,7 @@ private int doHttpRequest(Object requestParam, String namespace, String url, String path, String appkey, String ip) { String response = ""; boolean success = false; - log.error(JSONObject.toJSONString(requestParam)); + log.info(JSONObject.toJSONString(requestParam)); try { response = new HttpHandler.Builder() .setUri(url) @@ -90,8 +90,8 @@ .setJson(JSONObject.toJSONString(requestParam)) .build() .doPost(); - JSONObject jsonObject = JSON.parseObject(response); log.info("涓婃姤ERP鍑哄簱鍗曟嵁璇锋眰杩斿洖鎶ユ枃锛歿}", response); + JSONObject jsonObject = JSON.parseObject(response); if (Cools.isEmpty(jsonObject.get("ErrorCode"))) { throw new CoolException(jsonObject.get("ErrorMsg").toString()); } -- Gitblit v1.9.1