From 90596ce75f2a1e910fea4d180a3ebd7d70d38ab1 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期四, 12 十二月 2024 16:53:08 +0800
Subject: [PATCH] 修复配置及代码逻辑，优化异常处理和日志记录
---
src/main/java/com/zy/asrs/controller/OpenController.java | 79 +++++++++++++++++++++++++++++++++++++--
1 files changed, 75 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 9ab5435..186ce75 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,13 +1,15 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
import com.core.annotations.AppAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.param.*;
+import com.zy.asrs.entity.param.CheckParam;
+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.OpenService;
import com.zy.common.utils.Synchro;
import com.zy.common.web.BaseController;
@@ -116,18 +118,23 @@
return R.parse(BaseRes.PARAM);
}
String docName = param.get鎿嶄綔鍗曟嵁();
+ if (Cools.isEmpty(docName)) {
+ docName = param.getOrderType();
+ }
switch (docName) {
case "Purchase":
mappingPakOutOrderParam(param, true, "閾跺骇閲囪喘鍏ュ簱鍗�");
break;
case "MO":
mappingPakInOrderParam(param, true, "閾跺骇濮斿鐢熶骇璁㈠崟");
+ mappingOrderParam(param, false, "閾跺骇鏈寘瑁呮垚鍝佸嚭搴撳崟");
if (!Cools.isEmpty(param.getChildren())) {
mappingOrderParamChild(param, false, "閾跺骇濮斿鏉愭枡鍑哄簱鍗�");
}
break;
case "OM":
mappingPakInOrderParam(param, true, "閾跺骇鐢熶骇璁㈠崟");
+ mappingOrderParam(param, false, "閾跺骇濮斿鏈寘瑁呮垚鍝佸嚭搴撳崟");
if (!Cools.isEmpty(param.getChildren())) {
mappingOrderParamChild(param, false, "閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�");
}
@@ -155,6 +162,13 @@
break;
case "鐢熶骇鏉愭枡鍑哄簱琛ユ枡":
mappingPakOutOrderParam(param, false, "閾跺骇鐢熶骇鏉愭枡鍑哄簱琛ユ枡");
+ break;
+
+ case "鍗婃垚鍝佸叆搴撳崟":
+ mappingPakOutOrderParam(param, true, "鍗婃垚鍝佸叆搴撳崟");
+ break;
+ case "鎴愬搧鍏ュ簱鍗�":
+ mappingPakOutOrderParam(param, true, "鎴愬搧鍏ュ簱鍗�");
break;
default:
log.info("鏈煡鐨勫崟鎹被鍨�:{}", param);
@@ -213,12 +227,14 @@
break;
case "MO":
mappingPakInOrderParam(param, true, "閾跺骇鐢熶骇璁㈠崟");
+ mappingOrderParam(param, false, "閾跺骇鏈寘瑁呮垚鍝佸嚭搴撳崟");
if (!Cools.isEmpty(param.getChildren())) {
mappingOrderParamChild(param, false, "閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�");
}
break;
case "OM":
mappingPakInOrderParam(param, true, "閾跺骇濮斿鐢熶骇璁㈠崟");
+ mappingOrderParam(param, false, "閾跺骇濮斿鏈寘瑁呮垚鍝佸嚭搴撳崟");
if (!Cools.isEmpty(param.getChildren())) {
mappingOrderParamChild(param, false, "閾跺骇濮斿鏉愭枡鍑哄簱鍗�");
}
@@ -246,6 +262,12 @@
break;
case "鐢熶骇鏉愭枡鍑哄簱琛ユ枡":
mappingPakOutOrderParam(param, false, "閾跺骇鐢熶骇鏉愭枡鍑哄簱琛ユ枡");
+ break;
+ case "鍗婃垚鍝佸叆搴撳崟":
+ mappingPakOutOrderParam(param, true, "鍗婃垚鍝佸叆搴撳崟");
+ break;
+ case "鎴愬搧鍏ュ簱鍗�":
+ mappingPakOutOrderParam(param, true, "鎴愬搧鍏ュ簱鍗�");
break;
default:
log.info("鏈煡鐨勫崟鎹被鍨�:{}", param);
@@ -316,6 +338,8 @@
//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<>();
@@ -354,8 +378,9 @@
//orderDetl.setbFree1(childInfo.getBFree1());
orderDetl.setId(Cools.isEmpty(childInfo.getIPOsID()) ? childInfo.getId() : childInfo.getIPOsID());
orderDetl.setIvouchrowno(childInfo.getIvouchrowno());
-
-
+ if (!Cools.isEmpty(childInfo.getCFree1())) {
+ orderDetl.setBFree1(childInfo.getCFree1());
+ }
orderDetls.add(orderDetl);
}
orderSyncParam.setChildren(orderDetls);
@@ -384,6 +409,9 @@
orderDetl.setCsocode(param.getCsocode());
orderDetl.setId(childInfo.getIds());
//orderDetl.setIvouchrowno(childInfo.getIvouchrowno());
+ if (!Cools.isEmpty(childInfo.getCFree1())) {
+ orderDetl.setBFree1(childInfo.getCFree1());
+ }
orderDetls.add(orderDetl);
}
orderSyncParam.setChildren(orderDetls);
@@ -392,4 +420,47 @@
//return orderSyncParam;
}
+
+
+ private void mappingOrderParam(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("C" + orderSyncParam.getCPOID());
+ //鐢熸垚鍗曟嵁鏄庣粏
+ OrderSyncParam.OrderDetl orderDetl = new OrderSyncParam.OrderDetl();
+ Synchro.Copy(param, orderDetl);
+
+ if (!param.getCInvCode().startsWith("50")) {
+ 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;
+ }
}
--
Gitblit v1.9.1