From 5ae41979b5a6190ab6989942c1ba062071bfc40c Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期三, 09 四月 2025 20:23:37 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/OpenController.java | 105 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 80 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index c88d787..6a56c94 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -10,6 +10,7 @@
import com.zy.asrs.entity.param.MatSyncParam;
import com.zy.asrs.entity.param.OrderProdSyncParam;
import com.zy.asrs.entity.param.OrderSyncParam;
+import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.OpenService;
import com.zy.common.utils.Synchro;
import com.zy.common.web.BaseController;
@@ -38,6 +39,11 @@
@Autowired
private OpenService openService;
+
+
+ @Autowired
+ private ApiLogService apiLogService;
+
/**
* 搴撳瓨缁熻
@@ -69,7 +75,7 @@
private void auth(String appkey, Object obj, HttpServletRequest request) {
- log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
+ //log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
request.setAttribute("cache", obj);
if (!auth) {
return;
@@ -82,26 +88,6 @@
}
}
-
- @PostMapping("/order/pak/default/v1")
- @AppAuth(memo = "鐢熸垚閫�璐цˉ璐у崟鎹�")
- public synchronized R orderAccept(@RequestHeader(required = false) String appkey,
- @RequestBody(required = true) OrderSyncParam param,
- HttpServletRequest request) {
- log.info("鐢熸垚閫�璐цˉ璐у崟鎹�,{}", JSON.toJSONString(param));
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
-
- String docName = param.get鎿嶄綔鍗曟嵁();
- boolean pakin = param.getPakin() == 1 ? true : false;
-
- openService.syncOrder(param, pakin, docName);
-
- return R.ok("鍗曟嵁鎺ュ彈鎴愬姛");
-
- }
/*
鐩樼偣鎺ュ彛
@@ -127,7 +113,7 @@
public synchronized R orderPakin(@RequestHeader(required = false) String appkey,
@RequestBody Map<String, Object> map,
HttpServletRequest request) {
- log.info("鐢熸垚鍏ュ簱鍗曟嵁,{}", JSON.toJSONString(map));
+ //log.info("鐢熸垚鍏ュ簱鍗曟嵁,{}", JSON.toJSONString(map));
OrderProdSyncParam param = JSON.parseObject(JSON.toJSONString(map), OrderProdSyncParam.class);
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
@@ -147,6 +133,8 @@
case "MO":
mappingPakInOrderParam(param, true, "閾跺骇濮斿鐢熶骇璁㈠崟");
mappingOrderParam(param, false, "閾跺骇鏈寘瑁呮垚鍝佸嚭搴撳崟");
+ mappingOrderParamDB40(param, false, "鍗婃垚鍝佽皟鎷ㄥ崟");
+ //mappingOrderParam40(param, false, "鍗婃垚鍝佸嚭搴撳崟");
if (!Cools.isEmpty(param.getChildren())) {
mappingOrderParamChild(param, false, "閾跺骇濮斿鏉愭枡鍑哄簱鍗�");
}
@@ -204,7 +192,7 @@
@AppAuth(memo = "鍚屾宸ュ崟鍗曟嵁")
public synchronized R orderPakout(@RequestHeader(required = false) String appkey,
@RequestBody Map<String, Object> map) {
- log.info("鍚屾宸ュ崟鍗曟嵁,{}", JSON.toJSONString(map));
+ //log.info("鍚屾宸ュ崟鍗曟嵁,{}", JSON.toJSONString(map));
OrderProdSyncParam param = JSON.parseObject(JSON.toJSONString(map), OrderProdSyncParam.class);
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
@@ -221,6 +209,8 @@
case "MO":
mappingPakInOrderParam(param, true, "閾跺骇鐢熶骇璁㈠崟");
mappingOrderParam(param, false, "閾跺骇鏈寘瑁呮垚鍝佸嚭搴撳崟");
+ mappingOrderParamDB40(param, false, "鍗婃垚鍝佽皟鎷ㄥ崟");
+ //mappingOrderParam40(param, false, "鍗婃垚鍝佸嚭搴撳崟");
if (!Cools.isEmpty(param.getChildren())) {
mappingOrderParamChild(param, false, "閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�");
}
@@ -276,7 +266,7 @@
public synchronized R orderPakin2(@RequestHeader(required = false) String appkey,
@RequestBody Map<String, Object> map,
HttpServletRequest request) {
- log.info("鐢熸垚鍏ュ簱鍗曟嵁,{}", JSON.toJSONString(map));
+ //log.info("鐢熸垚鍏ュ簱鍗曟嵁,{}", JSON.toJSONString(map));
OrderProdSyncParam param = JSON.parseObject(JSON.toJSONString(map), OrderProdSyncParam.class);
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
@@ -300,7 +290,7 @@
mappingPakOutOrderParam(param, false, "閾跺骇鐢熶骇琛ユ枡鐢宠鍗�");
break;
case "閾跺骇鐢熶骇鍏ュ簱鐢宠鍗�":
- mappingPakOutOrderParam(param, true, "閾跺骇鐢熶骇鍏ュ簱鍗�");
+ mappingPakOutOrderParam(param, true, "閾跺骇鐢熶骇鍏ュ簱鐢宠鍗�");
break;
default:
log.info("鏈煡鐨勫崟鎹被鍨�:{}", param);
@@ -485,4 +475,69 @@
//return orderSyncParam;
}
+
+ private void mappingOrderParamDB40(OrderProdSyncParam param, boolean pakin, String docName) {
+ //鐢熸垚鍗曟嵁涓讳綋
+ OrderSyncParam orderSyncParam = new OrderSyncParam();
+ Synchro.Copy(param, orderSyncParam);
+
+ if (Cools.isEmpty(orderSyncParam.getCPOID())) {
+ orderSyncParam.setCPOID(param.getOrderNoT());
+ }
+ if (Cools.isEmpty(orderSyncParam.getDdate())) {
+ orderSyncParam.setDdate(param.getOrderTime());
+ }
+ orderSyncParam.setCPOID("DC" + orderSyncParam.getCPOID());
+ //鐢熸垚鍗曟嵁鏄庣粏
+ OrderSyncParam.OrderDetl orderDetl = new OrderSyncParam.OrderDetl();
+ Synchro.Copy(param, orderDetl);
+
+ if (!(param.getCInvCode().startsWith("401") || param.getCInvCode().startsWith("402"))) {
+ return;
+ }
+ //orderDetl.setcInvCode(param.getCInvCode());
+ //orderDetl.setiQuantity(param.getIQuantity());
+ orderDetl.setCDefine22(param.getIvouchrowno());
+ //orderDetl.setbFree1(param.getBFree1());
+ orderDetl.setId(param.getId());
+ orderDetl.setIvouchrowno(param.getIvouchrowno());
+ orderDetl.setINum(param.getINum());
+ orderDetl.setIinvexchrate(param.getIinvexchrate());
+
+ //娣诲姞鍗曟嵁鏄庣粏鍒板崟鎹富浣�
+ List<OrderSyncParam.OrderDetl> orderDetls = new ArrayList<>();
+ orderDetls.add(orderDetl);
+
+ orderSyncParam.setChildren(orderDetls);
+
+// String docName = param.getIQuantity() > 0 ? "閾跺骇浜у搧鐢熶骇鍏ュ簱鍗�" : "鍏ュ簱閫�鍥炲崟";
+// boolean pakin = param.getIQuantity() > 0 ? true : false;
+
+ openService.syncOrder(orderSyncParam, pakin, docName);
+
+ //return orderSyncParam;
+ }
+
+
+
+// @PostMapping("/order/add")
+// public R re(@RequestHeader(required = false) String appkey,
+// HttpServletRequest request) throws IOException {
+// List<ApiLog> apiLogs = apiLogService.selectList(new EntityWrapper<ApiLog>().eq("url", "/phyzwms/open/asrs/order/pakin/default/v1").eq("response", "{\"msg\":\"鏈嶅姟鍣ㄩ敊璇痋",\"code\":500}").ge("create_time", "2025-01-06 00:00:00"));
+// for (ApiLog apiLog : apiLogs) {
+// Map<String, Object> param = new HashMap<>();
+// ObjectMapper mapper = new ObjectMapper();
+// if (!Cools.isEmpty(apiLog.getRequest())) {
+// param = mapper.readValue(apiLog.getRequest(), Map.class);
+// try {
+// orderPakin(appkey, param, request);
+// } catch (Exception e) {
+//
+// }
+// }
+// }
+// return R.ok();
+//
+// }
+
}
--
Gitblit v1.9.1