From bf06377ea6bb5837430aeae88da5793ba44fe5b8 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 01 十一月 2024 13:52:00 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/entity/param/OrderProdSyncParam.java | 179 ++++++----------
src/main/java/com/zy/common/task/ActivateScheduler.java | 4
src/main/java/com/zy/asrs/controller/OpenController.java | 337 +++++++++++++++++-------------
src/main/java/com/zy/asrs/entity/OrderLog.java | 3
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 8
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 2
src/main/java/com/zy/asrs/entity/Order.java | 3
src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java | 113 ----------
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 2
src/main/resources/application.yml | 6
10 files changed, 275 insertions(+), 382 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 5789409..875c707 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,18 +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.DocType;
-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.DocTypeService;
+import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.OpenService;
+import com.zy.common.utils.Synchro;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -40,14 +37,12 @@
@Autowired
private OpenService openService;
- @Autowired
- private DocTypeService docTypeService;
-
/**
* 搴撳瓨缁熻
*/
@RequestMapping("/stock/default/v1")
- public R queryStock(@RequestHeader(required = false) String appkey, HttpServletRequest request) {
+ public R queryStock(@RequestHeader(required = false) String appkey,
+ HttpServletRequest request) {
auth(appkey, null, request);
return R.ok().add(openService.queryStock());
}
@@ -57,7 +52,9 @@
*/
@PostMapping("/mat/v1")
@AppAuth(memo = "鐗╂枡鍚屾鎺ュ彛")
- public synchronized R syncMatInfoErp(@RequestHeader(required = false) String appkey, @RequestBody(required = false) MatSyncParam param, HttpServletRequest request) {
+ public synchronized R syncMatInfoErp(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) MatSyncParam param,
+ HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
@@ -86,26 +83,19 @@
@PostMapping("/order/pak/default/v1")
@AppAuth(memo = "鐢熸垚閫�璐цˉ璐у崟鎹�")
- public synchronized R orderAccept(@RequestHeader(required = false) String appkey, @RequestBody(required = true) OrderSyncParam param, HttpServletRequest request) {
+ 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);
}
- DocType type = getType(param.get鎿嶄綔鍗曟嵁(), param.getChildren().get(0).getIQuantity());
- if (!Cools.isEmpty(type)) {
- if (type.getPakin() == 1) {
- openService.syncOrder(param, true, type.getDocName());
- } else {
- openService.syncOrder(param, false, type.getDocName());
- }
- } else {
- return R.ok("鍗曟嵁鎺ュ彈澶辫触锛屼笉鏄害瀹氱殑鍗曟嵁l绫诲瀷");
- }
-// String docName = param.get鎿嶄綔鍗曟嵁();
-// boolean pakin = param.getPakin() == 1 ? true : false;
-//
-// openService.syncOrder(param, pakin, docName);
+
+ String docName = param.get鎿嶄綔鍗曟嵁();
+ boolean pakin = param.getPakin() == 1 ? true : false;
+
+ openService.syncOrder(param, pakin, docName);
return R.ok("鍗曟嵁鎺ュ彈鎴愬姛");
@@ -113,26 +103,64 @@
@PostMapping("/order/pakin/default/v1")
@AppAuth(memo = "鐢熸垚鍏ュ簱鍗曟嵁")
- public synchronized R orderPakin(@RequestHeader(required = false) String appkey, @RequestBody(required = true) OrderSyncParam param, HttpServletRequest request) {
- log.info("鐢熸垚鍏ュ簱鍗曟嵁,{}", JSON.toJSONString(param));
+ public synchronized R orderPakin(@RequestHeader(required = false) String appkey,
+ @RequestBody Map<String, Object> map,
+ HttpServletRequest request) {
+ log.info("鐢熸垚鍏ュ簱鍗曟嵁,{}", JSON.toJSONString(map));
+ OrderProdSyncParam param = JSON.parseObject(JSON.toJSONString(map), OrderProdSyncParam.class);
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
-
-// String docName = !Cools.isEmpty(param.getOrderType()) ? param.getOrderType() : param.getChildren().get(0).getIQuantity() > 0 ? "閾跺骇閲囪喘鍏ュ簱鍗�" : "閾跺骇閲囪喘閫�璐у崟";
-// boolean pakin = param.getChildren().get(0).getIQuantity() > 0 ? true : false;
-
- DocType type = getType(param.get鎿嶄綔鍗曟嵁(), param.getChildren().get(0).getIQuantity());
- if (!Cools.isEmpty(type)) {
- if (type.getPakin() == 1) {
- openService.syncOrder(param, true, type.getDocName());
- } else {
- openService.syncOrder(param, false, type.getDocName());
- }
- } else {
- return R.ok("鍗曟嵁鎺ュ彈澶辫触锛屼笉鏄害瀹氱殑鍗曟嵁l绫诲瀷");
+ if (Cools.isEmpty(param.getOrderNo()) && Cools.isEmpty(param.getCPOID())) {
+ return R.parse(BaseRes.PARAM);
}
+ String docName = param.get鎿嶄綔鍗曟嵁();
+ switch (docName) {
+ case "Purchase":
+ mappingPakOutOrderParam(param, true, "閾跺骇閲囪喘鍏ュ簱鍗�");
+ break;
+ case "MO":
+ mappingPakInOrderParam(param, true, "閾跺骇濮斿鐢熶骇璁㈠崟");
+ if (!Cools.isEmpty(param.getChildren())) {
+ mappingOrderParamChild(param, false, "閾跺骇濮斿鐢熶骇鏉愭枡鍑哄簱鍗�");
+ }
+ break;
+ case "OM":
+ mappingPakInOrderParam(param, true, "閾跺骇鐢熶骇璁㈠崟");
+ if (!Cools.isEmpty(param.getChildren())) {
+ mappingOrderParamChild(param, false, "閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�");
+ }
+ break;
+ case "閲囪喘鍏ュ簱鍗曢��璐�":
+ mappingPakOutOrderParam(param, false, "閾跺骇閲囪喘鍏ュ簱鍗曢��璐�");
+ break;
+ case "濮斿鍏ュ簱鍗曢��璐�":
+ mappingPakOutOrderParam(param, false, "閾跺骇濮斿鍏ュ簱鍗曢��璐�");
+ break;
+ case "鍏朵粬鍑哄簱鍗�":
+ mappingPakOutOrderParam(param, false, "鍏朵粬鍑哄簱鍗�");
+ break;
+ case "鍏朵粬鍏ュ簱鍗�":
+ mappingPakOutOrderParam(param, true, "鍏朵粬鍏ュ簱鍗�");
+ break;
+ case "濮斿鏉愭枡鍑哄簱閫�鏂�":
+ mappingPakOutOrderParam(param, true, "閾跺骇濮斿鏉愭枡鍑哄簱閫�鏂�");
+ break;
+ case "鐢熶骇鏉愭枡鍑哄簱閫�鏂�":
+ mappingPakOutOrderParam(param, true, "閾跺骇鐢熶骇鏉愭枡鍑哄簱閫�鏂�");
+ break;
+ case "濮斿鏉愭枡鍑哄簱琛ユ枡":
+ mappingPakOutOrderParam(param, false, "閾跺骇濮斿鏉愭枡鍑哄簱琛ユ枡");
+ break;
+ case "鐢熶骇鏉愭枡鍑哄簱琛ユ枡":
+ mappingPakOutOrderParam(param, false, "閾跺骇鐢熶骇鏉愭枡鍑哄簱琛ユ枡");
+ break;
+ default:
+ log.info("鏈煡鐨勫崟鎹被鍨�:{}", docName);
+ break;
+ }
+
return R.ok("鍗曟嵁鎺ュ彈鎴愬姛");
}
@@ -142,7 +170,9 @@
*/
@PostMapping("/check/default/v1")
@AppAuth(memo = "搴撳瓨鐩樼偣")
- public synchronized R checkLoc(@RequestHeader(required = false) String appkey, @RequestBody(required = true) CheckParam param, HttpServletRequest request) {
+ public synchronized R checkLoc(@RequestHeader(required = false) String appkey,
+ @RequestBody CheckParam param,
+ HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
@@ -154,60 +184,88 @@
}
+ public static void main(String[] args) {
+ String jsonString = "\n" +
+ "{\"鎿嶄綔绯荤粺鍙穃": \"004\",\"鎿嶄綔鍗曟嵁\": \"Purchase\",\"鎿嶄綔绫诲瀷\": \"\",\"cPOID\":\"PO10047790\",\"cVenCode\":\"2HLSL\",\"cPersonCode\":\"\",\"cSCCode\":\"\",\"cexch_name\":\"CNY\",\"nflat\":\"1.0\",\"ddate\":\"2024-10-31 00:00:00.0\",\"cMemo\":\"鍚�2407G027\",\"states\":\"0\", \"children\": [{\"ivouchrowno\": \"1\",\"cInvCode\": \"102010400264\",\"dArriveDate\": \"2024-11-20 00:00:00\",\"iQuantity\": \"1220.0000000000\",\"iTaxPrice\": \"3.250000\",\"iPerTaxRate\": \"13.000000\",\"cbMemo\": \"\",\"bomid\": \"\",\"iNum\": \"\",\"cDefine22\": \"2501G023-1\",\"cSource\": \"\",\"Rstates\": \"0\",\"iorderdid\": \"\",\"cFree1\": \"\",\"id\": \"1000260272\"},{\"ivouchrowno\": \"2\",\"cInvCode\": \"102010400265\",\"dArriveDate\": \"2024-11-20 00:00:00\",\"iQuantity\": \"1220.0000000000\",\"iTaxPrice\": \"3.250000\",\"iPerTaxRate\": \"13.000000\",\"cbMemo\": \"\",\"bomid\": \"\",\"iNum\": \"\",\"cDefine22\": \"2501G023-1\",\"cSource\": \"\",\"Rstates\": \"0\",\"iorderdid\": \"\",\"cFree1\": \"\",\"id\": \"1000260273\"},{\"ivouchrowno\": \"3\",\"cInvCode\": \"102020100561\",\"dArriveDate\": \"2024-11-20 00:00:00\",\"iQuantity\": \"1200.0000000000\",\"iTaxPrice\": \"0.150000\",\"iPerTaxRate\": \"13.000000\",\"cbMemo\": \"\",\"bomid\": \"\",\"iNum\": \"\",\"cDefine22\": \"2501G023-1\",\"cSource\": \"\",\"Rstates\": \"0\",\"iorderdid\": \"\",\"cFree1\": \"\",\"id\": \"1000260274\"},{\"ivouchrowno\": \"4\",\"cInvCode\": \"102020100562\",\"dArriveDate\": \"2024-11-20 00:00:00\",\"iQuantity\": \"1200.0000000000\",\"iTaxPrice\": \"0.150000\",\"iPerTaxRate\": \"13.000000\",\"cbMemo\": \"\",\"bomid\": \"\",\"iNum\": \"\",\"cDefine22\": \"2501G023-1\",\"cSource\": \"\",\"Rstates\": \"0\",\"iorderdid\": \"\",\"cFree1\": \"\",\"id\": \"1000260275\"},{\"ivouchrowno\": \"5\",\"cInvCode\": \"102010101502\",\"dArriveDate\": \"2024-11-20 00:00:00\",\"iQuantity\": \"1220.0000000000\",\"iTaxPrice\": \"3.000000\",\"iPerTaxRate\": \"13.000000\",\"cbMemo\": \"\",\"bomid\": \"\",\"iNum\": \"\",\"cDefine22\": \"2501G023-2\",\"cSource\": \"\",\"Rstates\": \"0\",\"iorderdid\": \"\",\"cFree1\": \"\",\"id\": \"1000260276\"},{\"ivouchrowno\": \"6\",\"cInvCode\": \"102010101503\",\"dArriveDate\": \"2024-11-20 00:00:00\",\"iQuantity\": \"1220.0000000000\",\"iTaxPrice\": \"3.000000\",\"iPerTaxRate\": \"13.000000\",\"cbMemo\": \"\",\"bomid\": \"\",\"iNum\": \"\",\"cDefine22\": \"2501G023-2\",\"cSource\": \"\",\"Rstates\": \"0\",\"iorderdid\": \"\",\"cFree1\": \"\",\"id\": \"1000260277\"},{\"ivouchrowno\": \"7\",\"cInvCode\": \"102020100561\",\"dArriveDate\": \"2024-11-20 00:00:00\",\"iQuantity\": \"1200.0000000000\",\"iTaxPrice\": \"0.150000\",\"iPerTaxRate\": \"13.000000\",\"cbMemo\": \"\",\"bomid\": \"\",\"iNum\": \"\",\"cDefine22\": \"2501G023-2\",\"cSource\": \"\",\"Rstates\": \"0\",\"iorderdid\": \"\",\"cFree1\": \"\",\"id\": \"1000260278\"},{\"ivouchrowno\": \"8\",\"cInvCode\": \"102020100562\",\"dArriveDate\": \"2024-11-20 00:00:00\",\"iQuantity\": \"1200.0000000000\",\"iTaxPrice\": \"0.150000\",\"iPerTaxRate\": \"13.000000\",\"cbMemo\": \"\",\"bomid\": \"\",\"iNum\": \"\",\"cDefine22\": \"2501G023-2\",\"cSource\": \"\",\"Rstates\": \"0\",\"iorderdid\": \"\",\"cFree1\": \"\",\"id\": \"1000260279\"}]}";
+ OrderProdSyncParam param = new OrderProdSyncParam();
+ OrderProdSyncParam orderProdSyncParam = JSON.parseObject(jsonString, OrderProdSyncParam.class);
+ System.out.println(orderProdSyncParam.getCPOID());
+ }
@PostMapping("/order/pakout/default/v1")
- //@AppAuth(memo = "鍚屾宸ュ崟鍗曟嵁")
+ @AppAuth(memo = "鍚屾宸ュ崟鍗曟嵁")
public synchronized R orderPakout(@RequestHeader(required = false) String appkey,
- //@RequestBody(required = false) HashMap<String,Object> param,
- @RequestBody(required = false) OrderProdSyncParam param, HttpServletRequest request) {
- log.info("鍚屾宸ュ崟鍗曟嵁,{}", JSON.toJSONString(param));
- ///auth(appkey, param, request);
+ @RequestBody Map<String, Object> map) {
+ log.info("鍚屾宸ュ崟鍗曟嵁,{}", JSON.toJSONString(map));
+ OrderProdSyncParam param = JSON.parseObject(JSON.toJSONString(map), OrderProdSyncParam.class);
+ auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
-
- DocType type = getType(param.get鎿嶄綔鍗曟嵁(), param.getIQuantity());
- if (!Cools.isEmpty(type)) {
- if (param.get鎿嶄綔鍗曟嵁().equals("MO")) {
- mappingPakInOrderParam(param, true, type.getDocName());
+ if (Cools.isEmpty(param.getOrderNo()) && Cools.isEmpty(param.getCPOID())) {
+ return R.parse(BaseRes.PARAM);
+ }
+ String docName = param.get鎿嶄綔鍗曟嵁();
+ switch (docName) {
+ case "Purchase":
+ mappingPakOutOrderParam(param, true, "閾跺骇閲囪喘鍏ュ簱鍗�");
+ break;
+ case "MO":
+ mappingPakInOrderParam(param, true, "閾跺骇濮斿鐢熶骇璁㈠崟");
if (!Cools.isEmpty(param.getChildren())) {
- mappingPakOutOrderParam(param, false, "閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�");
+ mappingOrderParamChild(param, false, "閾跺骇濮斿鐢熶骇鏉愭枡鍑哄簱鍗�");
}
- } else if (param.get鎿嶄綔鍗曟嵁().equals("OM")) {
- mappingPakInOrderParam(param, true, type.getDocName());
+ break;
+ case "OM":
+ mappingPakInOrderParam(param, true, "閾跺骇鐢熶骇璁㈠崟");
if (!Cools.isEmpty(param.getChildren())) {
- mappingPakOutOrderParam(param, false, "閾跺骇濮斿鏉愭枡鍑哄簱鍗�");
+ mappingOrderParamChild(param, false, "閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�");
}
-
- } else {
- if (type.getPakin() == 1) {
- mappingPakInOrderParam(param, true, type.getDocName());
- if (!Cools.isEmpty(param.getChildren())) {
- mappingPakOutOrderParam(param, false, type.getDocName());
- }
- } else {
- mappingPakOutOrderParam(param, false, type.getDocName());
- }
- }
- } else {
- return R.ok("鍗曟嵁鎺ュ彈澶辫触锛屼笉鏄害瀹氱殑鍗曟嵁l绫诲瀷");
+ break;
+ case "閲囪喘鍏ュ簱鍗曢��璐�":
+ mappingPakOutOrderParam(param, false, "閾跺骇閲囪喘鍏ュ簱鍗曢��璐�");
+ break;
+ case "濮斿鍏ュ簱鍗曢��璐�":
+ mappingPakOutOrderParam(param, false, "閾跺骇濮斿鍏ュ簱鍗曢��璐�");
+ break;
+ case "鍏朵粬鍑哄簱鍗�":
+ mappingPakOutOrderParam(param, false, "鍏朵粬鍑哄簱鍗�");
+ break;
+ case "鍏朵粬鍏ュ簱鍗�":
+ mappingPakOutOrderParam(param, true, "鍏朵粬鍏ュ簱鍗�");
+ break;
+ case "濮斿鏉愭枡鍑哄簱閫�鏂�":
+ mappingPakOutOrderParam(param, true, "閾跺骇濮斿鏉愭枡鍑哄簱閫�鏂�");
+ break;
+ case "鐢熶骇鏉愭枡鍑哄簱閫�鏂�":
+ mappingPakOutOrderParam(param, true, "閾跺骇鐢熶骇鏉愭枡鍑哄簱閫�鏂�");
+ break;
+ case "濮斿鏉愭枡鍑哄簱琛ユ枡":
+ mappingPakOutOrderParam(param, false, "閾跺骇濮斿鏉愭枡鍑哄簱琛ユ枡");
+ break;
+ case "鐢熶骇鏉愭枡鍑哄簱琛ユ枡":
+ mappingPakOutOrderParam(param, false, "閾跺骇鐢熶骇鏉愭枡鍑哄簱琛ユ枡");
+ break;
+ default:
+ log.info("鏈煡鐨勫崟鎹被鍨�:{}", docName);
+ break;
}
// if (!Cools.eq("鐢熶骇", param.getCVouchtype())) {
-// String docName = param.getIQuantity() > 0 ? "閾跺骇濮斿鍏ュ簱鍗�" : "閾跺骇濮斿鍏ュ簱閫�璐у崟";
+// //String docName = param.getIQuantity() > 0 ? "閾跺骇濮斿鍏ュ簱鍗�" : "閾跺骇濮斿鍏ュ簱閫�璐у崟";
// boolean pakin = param.getIQuantity() > 0 ? true : false;
-// mappingPakInOrderParam(param, pakin, docName);
+// mappingPakInOrderParam(param, pakin, param.get鎿嶄綔鍗曟嵁());
//
// if (!Cools.isEmpty(param.getChildren())) {
-// String docName1 = param.getChildren().get(0).getIQuantity() > 0 ? "閾跺骇濮斿鏉愭枡鍑哄簱鍗�" : "閾跺骇濮斿鏉愭枡閫�鏂欏崟";
+// //String docName1 = param.getChildren().get(0).getIQuantity() > 0 ? "閾跺骇濮斿鏉愭枡鍑哄簱鍗�" : "閾跺骇濮斿鏉愭枡閫�鏂欏崟";
// boolean pakin1 = param.getChildren().get(0).getIQuantity() > 0 ? true : false;
-// mappingPakOutOrderParam(param, pakin1, docName1);
+// mappingPakOutOrderParam(param, pakin1, param.getChildren().get(0).get鎿嶄綔鍗曟嵁());
// }
//
// } else if (!Cools.isEmpty(param.getChildren())) {
-// String docName1 = param.getChildren().get(0).getIQuantity() > 0 ? "閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�" : "閾跺骇鐢熶骇鏉愭枡閫�鏂欏崟";
+// //String docName1 = param.getChildren().get(0).getIQuantity() > 0 ? "閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�" : "閾跺骇鐢熶骇鏉愭枡閫�鏂欏崟";
// boolean pakin1 = param.getChildren().get(0).getIQuantity() > 0 ? true : false;
-// mappingPakOutOrderParam(param, pakin1, docName1);
+// mappingPakOutOrderParam(param, pakin1, param.get鎿嶄綔鍗曟嵁());
// }
return R.ok("鍗曟嵁鎺ュ彈鎴愬姛");
@@ -216,7 +274,9 @@
@PostMapping("/order/delete/default/v1")
@AppAuth(memo = "鍗曟嵁鍒犻櫎瀹℃牳")
- public synchronized R orderDelete(@RequestHeader(required = false) String appkey, @RequestBody(required = false) Map<String, Object> param, HttpServletRequest request) {
+ public synchronized R orderDelete(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) Map<String, Object> param,
+ HttpServletRequest request) {
log.info("鍗曟嵁鍒犻櫎瀹℃牳,{}", JSON.toJSONString(param));
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
@@ -236,17 +296,22 @@
private void mappingPakInOrderParam(OrderProdSyncParam param, boolean pakin, String docName) {
//鐢熸垚鍗曟嵁涓讳綋
OrderSyncParam orderSyncParam = new OrderSyncParam();
- orderSyncParam.set鎿嶄綔绯荤粺鍙�(param.get鎿嶄綔绯荤粺鍙�());
- orderSyncParam.setcPOID(param.getOrderNoT());
- orderSyncParam.setDdate(param.getOrderTime());
- orderSyncParam.setcMemo(param.getCMemo());
+ Synchro.Copy(param, orderSyncParam);
+
+ if (Cools.isEmpty(orderSyncParam.getCPOID())) {
+ orderSyncParam.setCPOID(param.getOrderNoT());
+ }
+ if (Cools.isEmpty(orderSyncParam.getDdate())) {
+ orderSyncParam.setDdate(param.getOrderTime());
+ }
//鐢熸垚鍗曟嵁鏄庣粏
OrderSyncParam.OrderDetl orderDetl = new OrderSyncParam.OrderDetl();
- orderDetl.setcInvCode(param.getCInvCode());
- orderDetl.setiQuantity(param.getIQuantity());
- orderDetl.setcDefine22(param.getDefine24());
- orderDetl.setbFree1(param.getBFree1());
+ Synchro.Copy(param,orderDetl);
+ //orderDetl.setcInvCode(param.getCInvCode());
+ //orderDetl.setiQuantity(param.getIQuantity());
+ orderDetl.setCDefine22(param.getIvouchrowno());
+ //orderDetl.setbFree1(param.getBFree1());
orderDetl.setId(param.getId());
orderDetl.setIvouchrowno(param.getIvouchrowno());
@@ -264,26 +329,56 @@
//return orderSyncParam;
}
+
private void mappingPakOutOrderParam(OrderProdSyncParam param, boolean pakin, String docName) {
OrderSyncParam orderSyncParam = new OrderSyncParam();
List<OrderProdSyncParam.ChildInfo> child = param.getChildren();
-
- //鐢熸垚鍗曟嵁涓讳綋
- orderSyncParam.set鎿嶄綔绯荤粺鍙�(param.get鎿嶄綔绯荤粺鍙�());
- orderSyncParam.setcPOID(child.get(0).getOrderNoT());
- orderSyncParam.setDdate(param.getOrderTime());
- orderSyncParam.setcMemo(param.getCMemo());
+ Synchro.Copy(param, orderSyncParam);
+ if (Cools.isEmpty(orderSyncParam.getCPOID())) {
+ orderSyncParam.setCPOID(param.getOrderNoT());
+ orderSyncParam.setDdate(param.getOrderTime());
+ }
//鐢熸垚鍗曟嵁鏄庣粏
List<OrderSyncParam.OrderDetl> orderDetls = new ArrayList<>();
for (OrderProdSyncParam.ChildInfo childInfo : child) {
OrderSyncParam.OrderDetl orderDetl = new OrderSyncParam.OrderDetl();
- orderDetl.setcInvCode(childInfo.getCInvCode());
- orderDetl.setiQuantity(childInfo.getIQuantity());
+ Synchro.Copy(childInfo, orderDetl);
+ //orderDetl.setcInvCode(childInfo.getCInvCode());
+ //orderDetl.setiQuantity(childInfo.getIQuantity());
orderDetl.setCsocode(param.getCsocode());
- orderDetl.setbFree1(childInfo.getBFree1());
+ //orderDetl.setbFree1(childInfo.getBFree1());
+ orderDetl.setId(childInfo.getIds());
+ orderDetl.setIvouchrowno(childInfo.getIvouchrowno());
+
+
+ orderDetls.add(orderDetl);
+ }
+ orderSyncParam.setChildren(orderDetls);
+
+ openService.syncOrder(orderSyncParam, pakin, docName);
+
+ //return orderSyncParam;
+ }
+
+ private void mappingOrderParamChild(OrderProdSyncParam param, boolean pakin, String docName) {
+ OrderSyncParam orderSyncParam = new OrderSyncParam();
+
+ List<OrderProdSyncParam.ChildInfo> child = param.getChildren();
+ Synchro.Copy(param, orderSyncParam);
+ orderSyncParam.setCPOID(child.get(0).getOrderNoT());
+ orderSyncParam.setDdate(param.getOrderTime());
+
+ //鐢熸垚鍗曟嵁鏄庣粏
+ List<OrderSyncParam.OrderDetl> orderDetls = new ArrayList<>();
+
+ for (OrderProdSyncParam.ChildInfo childInfo : child) {
+ OrderSyncParam.OrderDetl orderDetl = new OrderSyncParam.OrderDetl();
+ Synchro.Copy(childInfo, orderDetl);
+ orderDetl.setCDefine22(param.getIvouchrowno());
+ orderDetl.setCsocode(param.getCsocode());
orderDetl.setId(childInfo.getIds());
orderDetl.setIvouchrowno(childInfo.getIvouchrowno());
@@ -291,62 +386,8 @@
}
orderSyncParam.setChildren(orderDetls);
- openService.syncOrder(orderSyncParam, false, docName);
+ openService.syncOrder(orderSyncParam, pakin, docName);
//return orderSyncParam;
- }
-
-
- private DocType getType(String type, Double iQuantity) {
- DocType docType = new DocType();
- switch (type) {
- case "Purchase":
- docType.setDocName("閾跺骇閲囪喘鍏ュ簱鍗�");
- docType.setPakin(1);
- break;
- case "MO":
- docType.setDocName("閾跺骇鐢熶骇璁㈠崟");
- docType.setPakin(0);
- break;
- case "OM":
- docType.setDocName("閾跺骇濮斿鐢熶骇璁㈠崟");
- docType.setPakin(0);
- break;
- case "閲囪喘鍏ュ簱鍗曢��璐�":
- docType.setDocName("閾跺骇閲囪喘鍏ュ簱鍗曢��璐у崟");
- docType.setPakin(0);
- break;
- case "濮斿鍏ュ簱鍗曢��璐�":
- docType.setDocName("閾跺骇濮斿鍏ュ簱鍗曢��璐у崟");
- docType.setPakin(1);
- break;
- case "鐢熶骇鏉愭枡鍑哄簱閫�鏂�":
- docType.setDocName("閾跺骇鐢熶骇鏉愭枡鍑哄簱閫�鏂欏崟");
- docType.setPakin(1);
- break;
- case "濮斿鏉愭枡鍑哄簱閫�鏂�":
- docType.setDocName("閾跺骇濮斿鏉愭枡鍑哄簱閫�鏂欏崟");
- docType.setPakin(1);
- break;
- case "鐢熶骇鏉愭枡鍑哄簱琛ユ枡":
- docType.setDocName("閾跺骇鐢熶骇鏉愭枡鍑哄簱琛ユ枡鍗�");
- docType.setPakin(0);
- break;
- case "濮斿鏉愭枡鍑哄簱琛ユ枡":
- docType.setDocName("閾跺骇濮斿鏉愭枡鍑哄簱琛ユ枡鍗�");
- docType.setPakin(0);
- break;
- case "鍏朵粬鍏ュ簱鍗�":
- docType.setDocName("閾跺骇鍏朵粬鍏ュ簱鍗�");
- docType.setPakin(1);
- break;
- case "鍏朵粬鍑哄簱鍗�":
- docType.setDocName("閾跺骇鍏朵粬鍑哄簱鍗�");
- docType.setPakin(0);
- break;
- default:
- docType = docTypeService.selectOrAdd(type, iQuantity > 0);
- }
- return docType;
}
}
diff --git a/src/main/java/com/zy/asrs/entity/Order.java b/src/main/java/com/zy/asrs/entity/Order.java
index a08ae89..de1f901 100644
--- a/src/main/java/com/zy/asrs/entity/Order.java
+++ b/src/main/java/com/zy/asrs/entity/Order.java
@@ -272,6 +272,9 @@
@TableField("in_time")
private String InTime;
+ @TableField("Upstreamcode")
+ private String Upstreamcode;
+
public Order() {}
public Order(String uuid,String orderNo,String orderTime,Long docType,Long itemId,String itemName,Long allotItemId,String defNumber,String number,Long cstmr,String cstmrName,String tel,String operMemb,Double totalFee,Double discount,Double discountFee,Double otherFee,Double actFee,Integer payType,String salesman,Integer accountDay,Integer postFeeType,Double postFee,Date payTime,Date sendTime,String shipName,String shipCode,Long settle,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
diff --git a/src/main/java/com/zy/asrs/entity/OrderLog.java b/src/main/java/com/zy/asrs/entity/OrderLog.java
index 35f44f5..71e7fd9 100644
--- a/src/main/java/com/zy/asrs/entity/OrderLog.java
+++ b/src/main/java/com/zy/asrs/entity/OrderLog.java
@@ -271,6 +271,9 @@
@TableField("in_time")
private String InTime;
+ @TableField("Upstreamcode")
+ private String Upstreamcode;
+
public OrderLog() {}
public OrderLog(String uuid,String orderNo,String orderTime,Long docType,Long itemId,String itemName,Long allotItemId,String defNumber,String number,Long cstmr,String cstmrName,String tel,String operMemb,Double totalFee,Double discount,Double discountFee,Double otherFee,Double actFee,Integer payType,String salesman,Integer accountDay,Integer postFeeType,Double postFee,Date payTime,Date sendTime,String shipName,String shipCode,Long settle,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
diff --git a/src/main/java/com/zy/asrs/entity/param/OrderProdSyncParam.java b/src/main/java/com/zy/asrs/entity/param/OrderProdSyncParam.java
index 4dedc6b..29c92cd 100644
--- a/src/main/java/com/zy/asrs/entity/param/OrderProdSyncParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OrderProdSyncParam.java
@@ -9,6 +9,27 @@
private String 鎿嶄綔绯荤粺鍙�;
private String 鎿嶄綔鍗曟嵁;
private String 鎿嶄綔绫诲瀷;
+ private String Upstreamcode;
+ //鍏ュ嚭搴撴爣璁�
+ private Integer pakin;
+ //鍗曟嵁绫诲瀷
+ private String orderType;
+
+ //璁㈠崟缂栧彿
+ private String cPOID;
+ //渚涘簲鍟嗙紪鐮�
+ private String cVenCode;
+ //璁㈠崟鎵�鏈変汉
+ private String cPersonCode;
+ //浜よ揣鏂瑰紡
+ private String cSCCode;
+ //甯佺
+ private String cexch_name;
+ //姹囩巼
+ private Double nflat;
+ //鍗曟嵁鏃ユ湡
+ private String ddate;
+
//宸ュ崟鍙�
private String orderNo;
//宸ュ崟鍙稵
@@ -39,88 +60,57 @@
private String prodIndefine;
//
private String id;
+
+
//瀛愪欢淇℃伅
private List<ChildInfo> children;
- public void setOrderNo(String orderNo) {
- this.orderNo = orderNo;
- }
-
- public void setOrderNoT(String orderNoT) {
- this.orderNoT = orderNoT;
- }
-
- public void setOrderTime(String orderTime) {
- this.orderTime = orderTime;
- }
-
- public void setIvouchrowno(String ivouchrowno) {
- this.ivouchrowno = ivouchrowno;
- }
-
- public void setcInvCode(String cInvCode) {
- this.cInvCode = cInvCode;
- }
-
- public void setCsocode(String csocode) {
- this.csocode = csocode;
- }
-
- public void setiQuantity(Double iQuantity) {
- this.iQuantity = iQuantity;
- }
-
- public void setStates(Integer states) {
- this.states = states;
- }
-
- public void setbFree1(String bFree1) {
- this.bFree1 = bFree1;
- }
-
- public void setDefine24(String define24) {
- this.define24 = define24;
- }
-
- public void setcVouchtype(String cVouchtype) {
- this.cVouchtype = cVouchtype;
- }
-
- public void setChild(List<ChildInfo> children) {
- this.children = children;
- }
-
- public void set鎿嶄綔绯荤粺鍙�(String 鎿嶄綔绯荤粺鍙�) {
- this.鎿嶄綔绯荤粺鍙� = 鎿嶄綔绯荤粺鍙�;
- }
-
- public void set鎿嶄綔鍗曟嵁(String 鎿嶄綔鍗曟嵁) {
- this.鎿嶄綔鍗曟嵁 = 鎿嶄綔鍗曟嵁;
- }
-
- public void set鎿嶄綔绫诲瀷(String 鎿嶄綔绫诲瀷) {
- this.鎿嶄綔绫诲瀷 = 鎿嶄綔绫诲瀷;
- }
-
- public void setcMemo(String cMemo) {
- this.cMemo = cMemo;
- }
-
- public void setSourceIndefine(String sourceIndefine) {
- this.sourceIndefine = sourceIndefine;
- }
-
- public void setProdIndefine(String prodIndefine) {
- this.prodIndefine = prodIndefine;
- }
/**
* 鐢ㄤ簬鐢熸垚鍑哄簱鍗曟嵁
*/
@Data
- public static class ChildInfo{
- //ID
+ public static class ChildInfo {
+ private String 鎿嶄綔绯荤粺鍙�;
+ private String 鎿嶄綔鍗曟嵁;
+ private String 鎿嶄綔绫诲瀷;
+
+
+ //璁㈠崟琛屽彿
+ private String ivouchrowno;
+ //鐗╂枡缂栫爜
+ private String cInvCode;
+ //鎵瑰彿
+ private String batch;
+ //闇�姹傛椂闂�
+ private String dArriveDate;
+ //闇�姹傛暟閲�
+ private Double iQuantity;
+ //鍚◣鍗曚环
+ private Double iTaxPrice;
+ //绋庣巼
+ private Double iPerTaxRate;
+ //琛屽娉�
+ private String cbMemo;
+ //浠舵暟
+ private Double iNum;
+ //鍗曟嵁鏉ユ簮
+ private String cSource;
+ //鐢熶骇璁㈠崟鍙凤紙閿�鍞鍗曞彿锛�
+ private String cDefine22;
+ //琛岀姸鎬�
+ private String Rstates;
+ //閿�鍞鍗曞彿 锛堝弬鐓ч攢鍞鍗曠敓鎴愶級
+ private String csocode;
+ //瑙勬牸锛堣嚜鐢遍」1锛�
+ private String bFree1;
+ //閲囪喘璁㈠崟瀛愯〃鏍囪瘑
private String id;
+ //閿�鍞鍗曞瓙琛ㄦ爣璇�
+ private String iorderdid;
+
+ //ID
+ // private String id;
//IDs
private String ids;
//宸ュ崟鍙稵
@@ -128,52 +118,17 @@
//宸ュ崟鍙�
private String orderNo;
//鐗╂枡缂栫爜
- private String cInvCode;
+ //private String cInvCode;
//鏁伴噺
- private Double iQuantity;
+ // private Double iQuantity;
//瑙勬牸锛堣嚜鐢遍」1锛�
- private String bFree1;
+ // private String bFree1;
//鍗曟嵁琛屽彿
- private String ivouchrowno;
+ // private String ivouchrowno;
//瀛愪欢鍙�
private String childNo;
- public void setId(String id) {
- this.id = id;
- }
-
- public void setIds(String ids) {
- this.ids = ids;
- }
-
- public void setOrderNoT(String orderNoT) {
- this.orderNoT = orderNoT;
- }
-
- public void setcInvCode(String cInvCode) {
- this.cInvCode = cInvCode;
- }
-
- public void setiQuantity(Double iQuantity) {
- this.iQuantity = iQuantity;
- }
-
- public void setbFree1(String bFree1) {
- this.bFree1 = bFree1;
- }
-
- public void setOrderNo(String orderNo) {
- this.orderNo = orderNo;
- }
-
- public void setIvouchrowno(String ivouchrowno) {
- this.ivouchrowno = ivouchrowno;
- }
-
- public void setChildNo(String childNo) {
- this.childNo = childNo;
- }
}
}
diff --git a/src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java b/src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java
index 1248bc5..c625a62 100644
--- a/src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java
@@ -11,11 +11,12 @@
private String 鎿嶄綔鍗曟嵁;
private String 鎿嶄綔绫诲瀷;
+
//鍏ュ嚭搴撴爣璁�
private Integer pakin;
//鍗曟嵁绫诲瀷
private String orderType;
-
+ private String Upstreamcode;
//璁㈠崟缂栧彿
private String cPOID;
//渚涘簲鍟嗙紪鐮�
@@ -37,57 +38,6 @@
private List<OrderDetl> children;
- public void setcPOID(String cPOID) {
- this.cPOID = cPOID;
- }
-
- public void setcVenCode(String cVenCode) {
- this.cVenCode = cVenCode;
- }
-
- public void setcPersonCode(String cPersonCode) {
- this.cPersonCode = cPersonCode;
- }
-
- public void setcSCCode(String cSCCode) {
- this.cSCCode = cSCCode;
- }
-
- public void setCexch_name(String cexch_name) {
- this.cexch_name = cexch_name;
- }
-
- public void setNflat(Double nflat) {
- this.nflat = nflat;
- }
-
- public void setcMemo(String cMemo) {
- this.cMemo = cMemo;
- }
-
- public void setStates(Integer states) {
- this.states = states;
- }
-
- public void setDdate(String ddate) {
- this.ddate = ddate;
- }
-
- public void setChildren(List<OrderDetl> children) {
- this.children = children;
- }
-
- public void set鎿嶄綔绯荤粺鍙�(String 鎿嶄綔绯荤粺鍙�) {
- this.鎿嶄綔绯荤粺鍙� = 鎿嶄綔绯荤粺鍙�;
- }
-
- public void set鎿嶄綔鍗曟嵁(String 鎿嶄綔鍗曟嵁) {
- this.鎿嶄綔鍗曟嵁 = 鎿嶄綔鍗曟嵁;
- }
-
- public void set鎿嶄綔绫诲瀷(String 鎿嶄綔绫诲瀷) {
- this.鎿嶄綔绫诲瀷 = 鎿嶄綔绫诲瀷;
- }
@Data
public static class OrderDetl {
@@ -137,65 +87,6 @@
return Objects.hash(ivouchrowno, cInvCode, batch, dArriveDate, iQuantity, iTaxPrice, iPerTaxRate, cbMemo, iNum, cSource, cDefine22, Rstates, csocode, bFree1, id, iorderdid);
}
- public void setIvouchrowno(String ivouchrowno) {
- this.ivouchrowno = ivouchrowno;
- }
-
- public void setcInvCode(String cInvCode) {
- this.cInvCode = cInvCode;
- }
-
- public void setdArriveDate(String dArriveDate) {
- this.dArriveDate = dArriveDate;
- }
-
- public void setiQuantity(Double iQuantity) {
- this.iQuantity = iQuantity;
- }
-
- public void setiTaxPrice(Double iTaxPrice) {
- this.iTaxPrice = iTaxPrice;
- }
-
- public void setiPerTaxRate(Double iPerTaxRate) {
- this.iPerTaxRate = iPerTaxRate;
- }
-
- public void setCbMemo(String cbMemo) {
- this.cbMemo = cbMemo;
- }
-
- public void setiNum(Double iNum) {
- this.iNum = iNum;
- }
-
- public void setcSource(String cSource) {
- this.cSource = cSource;
- }
-
- public void setcDefine22(String cDefine22) {
- this.cDefine22 = cDefine22;
- }
-
- public void setRstates(String rstates) {
- Rstates = rstates;
- }
-
- public void setCsocode(String csocode) {
- this.csocode = csocode;
- }
-
- public void setbFree1(String bFree1) {
- this.bFree1 = bFree1;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public void setIorderdid(String iorderdid) {
- this.iorderdid = iorderdid;
- }
}
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 87839b2..18650b8 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1001,7 +1001,7 @@
order.setCreateTime(now);
order.setUpdateTime(now);
-
+ order.setUpstreamcode(param.getUpstreamcode());
//璁㈠崟鐘舵��
order.setSettle(1L);
//鐘舵��
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 67082b5..70646f1 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -72,10 +72,10 @@
continue;
}
}
- ReturnT<String> result = orderSyncHandler.start(order);
- if (!result.isSuccess()) {
- log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
- }
+// ReturnT<String> result = orderSyncHandler.start(order);
+// if (!result.isSuccess()) {
+// log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+// }
}
}
}
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 77337d6..fb9bfd8 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -92,7 +92,7 @@
@Transactional
public void timelyStart(Order order) {
- List<String> docNames = new ArrayList<>(Arrays.asList("閾跺骇閲囪喘鍏ュ簱鍗�", "閾跺骇濮斿鏉愭枡鍑哄簱鍗�","鍏朵粬鍏ュ簱鍗�","鍏朵粬鍑哄簱鍗�"));
+ List<String> docNames = new ArrayList<>(Arrays.asList("閾跺骇閲囪喘鍏ュ簱鍗�", "閾跺骇濮斿鏉愭枡鍑哄簱鍗�","閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�"));
DocType docType = docTypeService.selectById(order.getDocType());
if (docNames.contains(docType.getDocName())) {
diff --git a/src/main/java/com/zy/common/task/ActivateScheduler.java b/src/main/java/com/zy/common/task/ActivateScheduler.java
index 4b96119..968b76a 100644
--- a/src/main/java/com/zy/common/task/ActivateScheduler.java
+++ b/src/main/java/com/zy/common/task/ActivateScheduler.java
@@ -18,8 +18,8 @@
public class ActivateScheduler {
// @Scheduled(cron = "0/1 * 8 * * ? ") // 姣忓ぉ8鐐�
- @Scheduled(cron = "* 0/1 * * * ? ") // 姣忓垎閽�
- @PostConstruct
+ //@Scheduled(cron = "* 0/1 * * * ? ") // 姣忓垎閽�
+ //@PostConstruct
private void execute(){
// 鑾峰彇婵�娲荤爜
String activationCode = SystemProperties.getActivationCode(OSinfo.getOSname().getActivationCodePath());
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ba9e7e5..7512ebf 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8083
+ port: 8080
servlet:
context-path: /@pom.build.finalName@
@@ -10,8 +10,8 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=phyzasrs
-# url: jdbc:sqlserver://192.168.4.15:1433;databasename=phyzasrs
+ #url: jdbc:sqlserver://127.0.0.1:1433;databasename=phyzasrs
+ url: jdbc:sqlserver://192.168.108.248:1433;databasename=phyzasrs
username: sa
password: sa@123
mvc:
--
Gitblit v1.9.1