From 03b0ea7369dcba72b560ec80f941f9d29ff7b9a5 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 06 十二月 2024 16:21:47 +0800
Subject: [PATCH] 修复库位类型字段错误并优化工作档状态检查逻辑
---
src/main/java/com/zy/asrs/controller/OpenController.java | 480 +++++++++++++++++++++++++++--------------------------------
1 files changed, 221 insertions(+), 259 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 88bca34..e16d6f3 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -9,6 +9,7 @@
import com.core.exception.CoolException;
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;
@@ -32,108 +33,9 @@
add("ea1f0459efc02a79f046f982767939ae");
}};
+
@Autowired
private OpenService openService;
-
-
-
- /****************************************************************************/
- /********************************* 鎵撳寘涓婄嚎 **********************************/
- /****************************************************************************/
-
-
- @PostMapping("/order/pakin/new/package/v1")
- @AppAuth(memo = "鎵撳寘涓婄嚎鎺ュ彛")
- public synchronized R pakinOrderPackage(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) PackParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- openService.packageUp(param);
- return R.ok();
- }
-
-
-
- /**
- * 娣诲姞鍏ュ簱鍗�
- */
- @PostMapping("/order/pakin/new/default/v1")
- public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
- @RequestBody OpenOrderPakinParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- if (Cools.isEmpty(param.getOrderNo())) {
- return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getOrderType())) {
- return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getOrderDetails())) {
- return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
- }
- openService.pakinOrderCreate(param);
- return R.ok();
- }
-
- /**
- * 鍏ュ簱鍗曞洖鍐�
- */
- @PostMapping("/order/pakin/complete/default/v1")
- public synchronized R orderPakinComplete(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) OpenOrderCompleteParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- return R.ok().add(openService.pakinOrderComplete(param));
- }
-
- /**
- * 娣诲姞鍑哄簱鍗�
- */
- @PostMapping("/order/pakout/new/default/v1")
- @AppAuth(memo = "娣诲姞璁㈠崟鍑哄簱")
- public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
- @RequestBody OpenOrderPakoutParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- if (Cools.isEmpty(param.getLgort())) {
- return R.error("鍗曟嵁缂栧彿[lgort]涓嶈兘涓虹┖");
- }
- if (!param.getLgort().equals("5006")) {
- return R.ok();
- }
- if (Cools.isEmpty(param.getOrderNo())) {
- return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getOrderType())) {
- return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getOrderDetails())) {
- return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
- }
- openService.pakoutOrderCreate(param);
- return R.ok();
- }
-
- /**
- * 鍑哄簱鍗曞洖鍐�
- */
- @PostMapping("/order/pakout/complete/default/v1")
- public synchronized R orderPakoutComplete(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) OpenOrderCompleteParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- return R.ok().add(openService.pakoutOrderComplete(param));
- }
-
/**
* 搴撳瓨缁熻
@@ -151,8 +53,8 @@
@PostMapping("/mat/v1")
@AppAuth(memo = "鐗╂枡鍚屾鎺ュ彛")
public synchronized R syncMatInfoErp(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) MatSyncParam param,
- HttpServletRequest request){
+ @RequestBody(required = false) MatSyncParam param,
+ HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
@@ -161,46 +63,6 @@
return R.ok("鏇存柊鎴愬姛");
- }
-
- /**
- * 鍏ュ簱閫氱煡妗ｇ敓鎴�
- */
- @PostMapping("/comb/v1")
- public synchronized R combMES(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) CombParam param,
- HttpServletRequest request){
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- openService.combMes(param);
- return R.ok("缁勬墭鎴愬姛");
- }
-
- /**
- * 鍏ュ簱璁板綍鑾峰彇
- */
- @PostMapping("/inlog/v1")
- public synchronized R inlogERP(@RequestHeader(required = false) String appkey,
- HttpServletRequest request){
- auth(appkey,null, request);
- if (Cools.isEmpty()) {
- return R.parse(BaseRes.PARAM);
- }
- return R.ok().add(openService.inlogERP());
- }
- /**
- * 鍑哄簱璁板綍鑾峰彇
- */
- @PostMapping("/outlog/v1")
- public synchronized R outlogERP(@RequestHeader(required = false) String appkey,
- HttpServletRequest request){
- auth(appkey,null, request);
- if (Cools.isEmpty()) {
- return R.parse(BaseRes.PARAM);
- }
- return R.ok().add(openService.outlogERP());
}
@@ -218,72 +80,13 @@
}
}
- @PostMapping("/order/matSync/default/v1")
- public synchronized R syncMatInfoU8(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) Map<String, Object> param,
- HttpServletRequest request){
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
-
- int msgU = 0;
- int msgT = 0;
- int msgF = 0;
- StringBuilder msg= new StringBuilder("鍘熷洜锛�");
-
- List<MatInfoParam> matDetails = (List<MatInfoParam>) param.get("matDetails");
-
- for (Object matDetail : matDetails){
- MatInfoParam matInfoParam = JSONObject.parseObject(JSON.toJSONString(matDetail),MatInfoParam.class);
- if (Cools.isEmpty(matDetails)) {
- msgF++;
- continue;
- }
- openService.syncMat(matInfoParam);
- if(matInfoParam.isUpdate()){
- msgU++;
- }else if(matInfoParam.isInsert()){
- msgT++;
- } else if(matInfoParam.isError()){
- msgF++;
- msg.append(matInfoParam.getCinvcode()).append(":").append(matInfoParam.getMemo()).append(";");
- }
- }
- String message = "";
- boolean success = false;
- if(msgT != 0){
- message += "鎴愬姛鎺ユ敹鐗╂枡锛�"+msgT+"涓�";
- success = true;
- }
- if(msgU != 0){
- message += "鎴愬姛淇敼鐗╂枡锛�"+msgU+"涓�";
- success = true;
- }
- if(msgF != 0){
- message += "鎺ユ敹鐗╂枡澶辫触锛�"+msgF+"涓�;"+msg;
- }
- if(success){
- return R.ok(message);
- }else {
- return R.error(message);
- }
-
-// if (MsgF==0){
-// return R.ok("鎴愬姛鎺ユ敹鐗╂枡锛�"+MsgT+"涓�");
-// }else if (MsgT==0){
-// return R.error("鎺ユ敹鐗╂枡澶辫触锛�"+MsgF+"涓�;"+Msg);
-// }else {
-// return R.ok("鎴愬姛鎺ユ敹鐗╂枡锛�"+MsgT+"涓�;"+"鎺ユ敹鐗╂枡澶辫触锛�"+MsgF+"涓�;"+Msg);
-// }
-
- }
@PostMapping("/order/pak/default/v1")
@AppAuth(memo = "鐢熸垚閫�璐цˉ璐у崟鎹�")
public synchronized R orderAccept(@RequestHeader(required = false) String appkey,
- @RequestBody(required = true) OrderSyncParam param,
- HttpServletRequest request){
+ @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);
@@ -292,7 +95,7 @@
String docName = param.get鎿嶄綔鍗曟嵁();
boolean pakin = param.getPakin() == 1 ? true : false;
- openService.syncOrder(param,pakin,docName);
+ openService.syncOrder(param, pakin, docName);
return R.ok("鍗曟嵁鎺ュ彈鎴愬姛");
@@ -301,17 +104,73 @@
@PostMapping("/order/pakin/default/v1")
@AppAuth(memo = "鐢熸垚鍏ュ簱鍗曟嵁")
public synchronized R orderPakin(@RequestHeader(required = false) String appkey,
- @RequestBody(required = true) OrderSyncParam param,
- HttpServletRequest request){
+ @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);
}
+ if (Cools.isEmpty(param.getOrderNo()) && Cools.isEmpty(param.getCPOID())) {
+ 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, "閾跺骇濮斿鐢熶骇璁㈠崟");
+ 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;
- String docName = !Cools.isEmpty(param.getOrderType()) ? param.getOrderType() : param.getChildren().get(0).getIQuantity() > 0 ? "閾跺骇閲囪喘鍏ュ簱鍗�" : "閾跺骇閲囪喘閫�璐у崟";
- boolean pakin = param.getChildren().get(0).getIQuantity() > 0 ? true : false;
-
- openService.syncOrder(param,pakin,docName);
+ case "鍗婃垚鍝佸叆搴撳崟":
+ mappingPakOutOrderParam(param, true, "鍗婃垚鍝佸叆搴撳崟");
+ break;
+ case "鎴愬搧鍏ュ簱鍗�":
+ mappingPakOutOrderParam(param, true, "鎴愬搧鍏ュ簱鍗�");
+ break;
+ default:
+ log.info("鏈煡鐨勫崟鎹被鍨�:{}", param);
+ mappingPakOutOrderParam(param, param.getPakin() == 1 ? true : false, param.get鎿嶄綔鍗曟嵁());
+ break;
+ }
return R.ok("鍗曟嵁鎺ュ彈鎴愬姛");
@@ -323,8 +182,8 @@
@PostMapping("/check/default/v1")
@AppAuth(memo = "搴撳瓨鐩樼偣")
public synchronized R checkLoc(@RequestHeader(required = false) String appkey,
- @RequestBody(required = true) CheckParam param,
- HttpServletRequest request){
+ @RequestBody CheckParam param,
+ HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
@@ -336,34 +195,96 @@
}
+ 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 = "鍚屾宸ュ崟鍗曟嵁")
public synchronized R orderPakout(@RequestHeader(required = false) String appkey,
- //@RequestBody(required = false) HashMap<String,Object> param,
- @RequestBody(required = false) OrderProdSyncParam param,
- HttpServletRequest 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);
}
- if(!Cools.eq("鐢熶骇",param.getCVouchtype())){
- String docName = param.getIQuantity() > 0 ? "閾跺骇濮斿鍏ュ簱鍗�" : "閾跺骇濮斿鍏ュ簱閫�璐у崟";
- boolean pakin = param.getIQuantity() > 0 ? true : false;
- mappingPakInOrderParam(param,pakin,docName);
-
- if(!Cools.isEmpty(param.getChildren())){
- String docName1 = param.getChildren().get(0).getIQuantity() > 0 ? "閾跺骇濮斿鏉愭枡鍑哄簱鍗�" : "閾跺骇濮斿鏉愭枡閫�鏂欏崟";
- boolean pakin1 = param.getChildren().get(0).getIQuantity() > 0 ? true : false;
- mappingPakOutOrderParam(param,pakin1,docName1);
- }
-
- }else if(!Cools.isEmpty(param.getChildren())) {
- String docName1 = param.getChildren().get(0).getIQuantity() > 0 ? "閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�" : "閾跺骇鐢熶骇鏉愭枡閫�鏂欏崟";
- boolean pakin1 = param.getChildren().get(0).getIQuantity() > 0 ? true : false;
- mappingPakOutOrderParam(param,pakin1,docName1);
+ 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;
+ case "鍗婃垚鍝佸叆搴撳崟":
+ mappingPakOutOrderParam(param, true, "鍗婃垚鍝佸叆搴撳崟");
+ break;
+ case "鎴愬搧鍏ュ簱鍗�":
+ mappingPakOutOrderParam(param, true, "鎴愬搧鍏ュ簱鍗�");
+ 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 ? "閾跺骇濮斿鍏ュ簱鍗�" : "閾跺骇濮斿鍏ュ簱閫�璐у崟";
+// boolean pakin = param.getIQuantity() > 0 ? true : false;
+// mappingPakInOrderParam(param, pakin, param.get鎿嶄綔鍗曟嵁());
+//
+// if (!Cools.isEmpty(param.getChildren())) {
+// //String docName1 = param.getChildren().get(0).getIQuantity() > 0 ? "閾跺骇濮斿鏉愭枡鍑哄簱鍗�" : "閾跺骇濮斿鏉愭枡閫�鏂欏崟";
+// boolean pakin1 = param.getChildren().get(0).getIQuantity() > 0 ? true : false;
+// mappingPakOutOrderParam(param, pakin1, param.getChildren().get(0).get鎿嶄綔鍗曟嵁());
+// }
+//
+// } else if (!Cools.isEmpty(param.getChildren())) {
+// //String docName1 = param.getChildren().get(0).getIQuantity() > 0 ? "閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�" : "閾跺骇鐢熶骇鏉愭枡閫�鏂欏崟";
+// boolean pakin1 = param.getChildren().get(0).getIQuantity() > 0 ? true : false;
+// mappingPakOutOrderParam(param, pakin1, param.get鎿嶄綔鍗曟嵁());
+// }
return R.ok("鍗曟嵁鎺ュ彈鎴愬姛");
@@ -373,7 +294,8 @@
@AppAuth(memo = "鍗曟嵁鍒犻櫎瀹℃牳")
public synchronized R orderDelete(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) Map<String, Object> param,
- HttpServletRequest request){
+ HttpServletRequest request) {
+ log.info("鍗曟嵁鍒犻櫎瀹℃牳,{}", JSON.toJSONString(param));
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
@@ -381,30 +303,37 @@
boolean success = openService.orderDelete(param.get("id").toString());
- if(success){
+ if (success) {
return R.ok("鍗曟嵁鍒犻櫎鎴愬姛");
- }else {
+ } else {
return R.error("鍗曟嵁姝ｅ湪鎵ц锛屽垹闄ゅけ璐�");
}
}
- private void mappingPakInOrderParam(OrderProdSyncParam param,boolean pakin,String docName){
+ 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());
+ orderDetl.setINum(param.getINum());
+ orderDetl.setIinvexchrate(param.getIinvexchrate());
//娣诲姞鍗曟嵁鏄庣粏鍒板崟鎹富浣�
List<OrderSyncParam.OrderDetl> orderDetls = new ArrayList<>();
@@ -415,41 +344,74 @@
// String docName = param.getIQuantity() > 0 ? "閾跺骇浜у搧鐢熶骇鍏ュ簱鍗�" : "鍏ュ簱閫�鍥炲崟";
// boolean pakin = param.getIQuantity() > 0 ? true : false;
- openService.syncOrder(orderSyncParam,pakin,docName);
+ openService.syncOrder(orderSyncParam, pakin, docName);
//return orderSyncParam;
}
- private void mappingPakOutOrderParam(OrderProdSyncParam param,boolean pakin,String docName){
+
+ 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("");
+ 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){
+ 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());
-
+ if (!Cools.isEmpty(childInfo.getCFree1())) {
+ orderDetl.setBFree1(childInfo.getCFree1());
+ }
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();
+
+ 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());
+ if (!Cools.isEmpty(childInfo.getCFree1())) {
+ orderDetl.setBFree1(childInfo.getCFree1());
+ }
+ orderDetls.add(orderDetl);
+ }
+ orderSyncParam.setChildren(orderDetls);
+
+ openService.syncOrder(orderSyncParam, pakin, docName);
+
+ //return orderSyncParam;
+ }
}
--
Gitblit v1.9.1