From 34a93b4b34e056ac7c20891efe5630245dc9766c Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期五, 09 六月 2023 16:57:25 +0800 Subject: [PATCH] #出库修改完成数量变更修改工作数量 --- src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 28 +++++++++++++--------------- 1 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java index c576799..9e5475b 100644 --- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java @@ -20,6 +20,7 @@ import com.zy.common.utils.HttpHandler; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -44,30 +45,27 @@ @Autowired private DocTypeService docTypeService; + + @Transactional public ReturnT<String> start(Order order) { DocType docType = docTypeService.selectById(order.getDocType()); if (null == docType) { + log.info("涓婃姤鍑洪敊锛屼笉瀛樺湪璇ュ崟鎹被鍨嬶細 " + order); return SUCCESS; } List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId()); // 鍏ュ簱瀹屾垚涓婃姤 if (docType.getPakin() == 1) { - MesPakinParam pakinParam = new MesPakinParam(); - pakinParam.setPakinTime(DateUtils.convert(order.getUpdateTime())); - pakinParam.setLgortFrom("5008"); - pakinParam.setLgortTo("5006"); - for (OrderDetl orderDetl : orderDetls) { - String serial = Cools.isEmpty(orderDetl.getBatch()) ? "" : orderDetl.getBatch(); - pakinParam.getList().add(new MesPakinParam.Detl(orderDetl.getMatnr() + (Cools.isEmpty(serial) ? "" : "-" + serial), orderDetl.getAnfme())); - } + JSONObject orderJson = new JSONObject(); + orderJson.put("orderNo",order.getOrderNo()); String response = ""; boolean success = false; try { response = new HttpHandler.Builder() .setUri(MesConstant.URL) .setPath(MesConstant.PAKIN_URL) - .setJson(JSON.toJSONString(pakinParam)) + .setJson(orderJson.toJSONString()) .build() .doPost(); JSONObject jsonObject = JSON.parseObject(response); @@ -78,7 +76,7 @@ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳"); } } else { - log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(pakinParam), response); + log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(orderJson), response); throw new CoolException("涓婃姤mes绯荤粺澶辫触"); } } catch (Exception e) { @@ -89,11 +87,11 @@ try { // 淇濆瓨鎺ュ彛鏃ュ織 apiLogService.save( - "鎴愬搧搴撳叆搴撲笂鎶�", + "鍏ュ簱涓婃姤", MesConstant.URL + MesConstant.PAKIN_URL, null, "127.0.0.1", - JSON.toJSONString(pakinParam), + JSON.toJSONString(orderJson), response, success ); @@ -102,14 +100,14 @@ } // 鍑哄簱瀹屾垚涓婃姤 if (docType.getPakout() == 1) { - if (true) { - return SUCCESS; - } MesPakoutParam pakoutParam = new MesPakoutParam(); pakoutParam.setTag(!order.getDocType$().equalsIgnoreCase("鎵嬪姩鍑哄簱鍗�")); pakoutParam.setPakoutTime(DateUtils.convert(order.getUpdateTime())); pakoutParam.setLgortFrom("5006"); pakoutParam.setLgortTo("1111"); + if (!pakoutParam.isTag()) { + pakoutParam.setKunnr("C1000"); + } pakoutParam.setOrderNo(order.getOrderNo()); for (OrderDetl orderDetl : orderDetls) { String serial = Cools.isEmpty(orderDetl.getBatch()) ? "" : orderDetl.getBatch(); -- Gitblit v1.9.1