From 07fc18f77a9764bd47857e30d65abc03cc1e439c Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 08 十一月 2024 16:21:56 +0800
Subject: [PATCH] Merge branch 'phyzwms2' into phyzasrs-erp
---
src/main/java/com/zy/asrs/controller/OpenController.java | 333 +++++++++++++++++++++++++++++++------------------------
1 files changed, 188 insertions(+), 145 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..9ab5435 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,65 @@
@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("鏈煡鐨勫崟鎹被鍨�:{}", param);
+ mappingPakOutOrderParam(param, param.getPakin() == 1 ? true : false, param.get鎿嶄綔鍗曟嵁());
+ break;
+ }
+
return R.ok("鍗曟嵁鎺ュ彈鎴愬姛");
}
@@ -142,7 +171,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 +185,89 @@
}
+ 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("鏈煡鐨勫崟鎹被鍨�:{}", param);
+ mappingPakOutOrderParam(param, param.getPakin() == 1 ? true : false, param.get鎿嶄綔鍗曟嵁());
+ 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 +276,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 +298,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,89 +331,65 @@
//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.setId(childInfo.getIds());
+ //orderDetl.setbFree1(childInfo.getBFree1());
+ orderDetl.setId(Cools.isEmpty(childInfo.getIPOsID()) ? childInfo.getId() : childInfo.getIPOsID());
orderDetl.setIvouchrowno(childInfo.getIvouchrowno());
+
orderDetls.add(orderDetl);
}
orderSyncParam.setChildren(orderDetls);
- openService.syncOrder(orderSyncParam, false, docName);
+ openService.syncOrder(orderSyncParam, pakin, docName);
//return orderSyncParam;
}
+ private void mappingOrderParamChild(OrderProdSyncParam param, boolean pakin, String docName) {
+ OrderSyncParam orderSyncParam = new 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);
+ List<OrderProdSyncParam.ChildInfo> child = param.getChildren();
+ Synchro.Copy(param, orderSyncParam);
+ orderSyncParam.set鎿嶄綔绯荤粺鍙�(param.get鎿嶄綔绯荤粺鍙�());
+ 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());
+ orderDetls.add(orderDetl);
}
- return docType;
+ orderSyncParam.setChildren(orderDetls);
+
+ openService.syncOrder(orderSyncParam, pakin, docName);
+
+ //return orderSyncParam;
}
}
--
Gitblit v1.9.1