From dd37f771537d173f891888c1da7735feb3dabdd5 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期二, 23 十二月 2025 14:20:48 +0800
Subject: [PATCH] 新增备货订单上报
---
src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java | 1
src/main/java/com/zy/common/constant/MesConstant.java | 14 ++++---
src/main/resources/application-dev.yml | 4 +-
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 94 +++++++++++++++++++++++++++++++++++++++++++++--
4 files changed, 101 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java b/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
index 4678106..8741174 100644
--- a/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
@@ -320,6 +320,7 @@
// 澶囪揣鍗曞嚭搴�
newOrder.setOrderNo(params.getPick_no());
newOrder.setNumber(params.getDispatch_no());
+ newOrder.setShipCode(params.getOrder_no());
newOrder.setCstmrName(params.getCus_id());
newOrder.setTel(params.getCus_address());
newOrder.setDocType(Long.parseLong(OrderTypeEnum.STOCK.type + ""));
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 35cd074..3fb456e 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -5,8 +5,12 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.exception.CoolException;
+import com.zy.api.entity.OrderItemsParam;
+import com.zy.api.entity.OutOrderParams;
+import com.zy.api.entity.PubOrderParams;
import com.zy.api.entity.ReportOrderParam;
import com.zy.api.entity.ReportOrderParams;
+import com.zy.api.entity.StockUpOrderParams;
import com.zy.api.entity.dto.XSR;
import com.zy.api.service.KopenApiService;
import com.zy.asrs.entity.*;
@@ -310,7 +314,7 @@
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
"涓婃灦娲惧伐鍗曞畬鎴愪笂鎶�",
- MesConstant.URL + MesConstant.PAKIN_URL,
+ MesConstant.URL + MesConstant.IN_DISPATCH_RESULT,
null,
"127.0.0.1",
JSON.toJSONString(orderParam),
@@ -385,9 +389,9 @@
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
}
} else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL + MesConstant.PAKOUT_URL,
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL + MesConstant.OUT_DISPATCH_RESULT,
JSON.toJSONString(orderParam), JSON.toJSONString(response));
- throw new CoolException("涓婃姤mes绯荤粺澶辫触");
+ throw new CoolException("涓婃姤KOPEN绯荤粺澶辫触");
}
} catch (Exception e) {
log.error("fail", e);
@@ -397,7 +401,7 @@
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
"澶囪揣娲惧伐鍗曞畬鎴愪笂鎶�",
- MesConstant.URL + MesConstant.PAKOUT_URL,
+ MesConstant.URL + MesConstant.OUT_DISPATCH_RESULT,
null,
"127.0.0.1",
JSON.toJSONString(orderParam),
@@ -407,6 +411,88 @@
log.error("", e);
}
}
+ } else if (Integer.valueOf(docType.getDocId() + "").equals(OrderTypeEnum.STOCK.type)) {
+ // 澶囪揣鍗曞弽棣�
+ StockUpOrderParams stockUpOrderParams = new StockUpOrderParams();
+ stockUpOrderParams.setCompany_id(order.getCstmrName())
+ .setWms_id(order.getId() + "")
+ .setDispatch_no(order.getNumber());
+
+ OutOrderParams pubOrderParams = new OutOrderParams();
+ pubOrderParams.setPick_no(order.getOrderNo())
+ .setOrder_no(order.getShipCode())
+ .setCus_id(order.getCstmrName())
+ .setCus_address(order.getTel());
+
+
+ List<OrderItemsParam> reportOrderParams = new ArrayList<>();
+ orderDetls.forEach(detl -> {
+ Mat material = matService.selectByMatnr(detl.getMatnr());
+ if (Objects.isNull(material)) {
+ throw new CoolException("鐗╂枡涓嶅瓨鍦�");
+ }
+ OrderItemsParam itemParam = new OrderItemsParam();
+ // 涓婃姤鏃讹紝榛樿浜у搧绫诲瀷鏄痭ull
+ itemParam.setPro_type(material.getProType());
+ // 涓婃姤鏃讹紝榛樿浜у搧缂栫爜
+ itemParam.setPro_komcode(material.getMatnr());
+ // 涓婃姤鏃讹紝榛樿浜у搧id鏄緵搴斿晢缂栫爜
+ itemParam.setPro_id(detl.getSuppCode());
+
+ // 涓婃姤鏃讹紝榛樿涓婃姤鏃堕棿鏄洿鏂版椂闂�
+ itemParam.setPick_qty(detl.getQty().intValue());
+ reportOrderParams.add(itemParam);
+ });
+ pubOrderParams.setPartList(reportOrderParams);
+
+ List<OutOrderParams> pubOrderParamsList = new ArrayList<>();
+ pubOrderParamsList.add(pubOrderParams);
+ //璁剧疆娲惧伐鍗曟槑缁�
+ stockUpOrderParams.setDetails(pubOrderParamsList);
+ stockUpOrderParams.setUpdate_time(order.getUpdateBy$());
+
+
+ XSR response = null;
+ boolean success = false;
+ try {
+ // response = new HttpHandler.Builder()
+ // .setUri(MesConstant.URL)
+ // .setPath(MesConstant.PAKOUT_URL)
+ // .setJson(JSON.toJSONString(pakoutParam))
+ // .build()
+ // .doPost();
+ // JSONObject jsonObject = JSON.parseObject(response);
+ // if (jsonObject.getInteger("code").equals(200)) {
+ if (true) {
+ success = true;
+ // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
+ if (!orderService.updateSettle(order.getId(), settle, null)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ } else {
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL + MesConstant.OUT_DETAILS_RESULT,
+ JSON.toJSONString(stockUpOrderParams), JSON.toJSONString(response));
+ throw new CoolException("涓婃姤KOPEN绯荤粺澶辫触");
+ }
+ } catch (Exception e) {
+ log.error("fail", e);
+ return FAIL.setMsg(e.getMessage());
+ } finally {
+ try {
+ // 淇濆瓨鎺ュ彛鏃ュ織
+ apiLogService.save(
+ "澶囪揣鍗曞畬鎴愪笂鎶�",
+ MesConstant.URL + MesConstant.OUT_DETAILS_RESULT,
+ null,
+ "127.0.0.1",
+ JSON.toJSONString(stockUpOrderParams),
+ JSON.toJSONString(response),
+ success);
+ } catch (Exception e) {
+ log.error("", e);
+ }
+ }
+
}
return SUCCESS;
}
diff --git a/src/main/java/com/zy/common/constant/MesConstant.java b/src/main/java/com/zy/common/constant/MesConstant.java
index 0fc2f46..09762d3 100644
--- a/src/main/java/com/zy/common/constant/MesConstant.java
+++ b/src/main/java/com/zy/common/constant/MesConstant.java
@@ -5,13 +5,15 @@
*/
public class MesConstant {
- public static final String URL = "http://192.168.99.130:80";
+ //灏忕郴缁熸帴鍙ｅ湴鍧�
+ public static final String URL = "http://webservice.kopen.com.cn:1482/kc-api/api/wms/ ";
- public static final String PACK_DOWN_URL = "mes/api/zy/v1/packDown/sendList";
-
- public static final String PAKIN_URL = "mes/api/zy/v1/warehouse/sendList";
-
- public static final String PAKOUT_URL = "wmsFinprd/api/zy/v1/packOut/sendList";
+ //涓婃灦娲惧伐鍗曞弽棣�
+ public static final String IN_DISPATCH_RESULT = "getInDispatchResult";
+ //澶囪揣鎸囩ず娲惧伐鍗曞弽棣�
+ public static final String OUT_DISPATCH_RESULT = "getOutDispatchResult";
+ //澶囪揣璁㈠崟鍙嶉
+ public static final String OUT_DETAILS_RESULT = "getOutDetailsResult";
/**
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index b93ce22..0e0afc8 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,5 +1,5 @@
server:
- port: 8081
+ port: 8080
servlet:
context-path: /@pom.build.finalName@
@@ -30,7 +30,7 @@
# global-config:
# field-strategy: 0
configuration:
-# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+ # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
map-underscore-to-camel-case: true
cache-enabled: true
call-setters-on-nulls: true
--
Gitblit v1.9.1