From 97c6071eaf01a3ce1a706cb0114dcb27d255aa3d Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期三, 25 十二月 2024 13:03:26 +0800
Subject: [PATCH] 优化订单同步逻辑及库位查找
---
src/main/java/com/zy/asrs/controller/OpenController.java | 170 ++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 115 insertions(+), 55 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index cc71e35..d930b2e 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;
@@ -81,23 +83,22 @@
}
- @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));
+ /*
+ 鐩樼偣鎺ュ彛
+ */
+ @PostMapping("/check/default/v1")
+ @AppAuth(memo = "搴撳瓨鐩樼偣")
+ 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);
}
- String docName = param.get鎿嶄綔鍗曟嵁();
- boolean pakin = param.getPakin() == 1 ? true : false;
+ openService.checkAndAdjustLocDetl(param);
- openService.syncOrder(param, pakin, docName);
-
- return R.ok("鍗曟嵁鎺ュ彈鎴愬姛");
+ return R.ok("搴撳瓨璋冩暣鎴愬姛");
}
@@ -116,18 +117,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, "閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�");
}
@@ -173,32 +179,6 @@
}
- /*
- 鐩樼偣鎺ュ彛
- */
- @PostMapping("/check/default/v1")
- @AppAuth(memo = "搴撳瓨鐩樼偣")
- 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);
- }
-
- openService.checkAndAdjustLocDetl(param);
-
- return R.ok("搴撳瓨璋冩暣鎴愬姛");
-
- }
-
- 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 = "鍚屾宸ュ崟鍗曟嵁")
@@ -220,12 +200,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, "閾跺骇濮斿鏉愭枡鍑哄簱鍗�");
}
@@ -254,32 +236,63 @@
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;
}
+ return R.ok("鍗曟嵁鎺ュ彈鎴愬姛");
-// 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鎿嶄綔鍗曟嵁());
-// }
+ }
+
+ @PostMapping("/order/pak/default/v1")
+ @AppAuth(memo = "鐢熸垚鍏ュ簱鍗曟嵁")
+ public synchronized R orderPakin2(@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);
+ }
+ if (Cools.isEmpty(param.getOrderNo()) && Cools.isEmpty(param.getCPOID())) {
+ return R.parse(BaseRes.PARAM);
+ }
+ String docName = param.getOrderType();
+ if (Cools.isEmpty(docName)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ switch (docName) {
+ case "閾跺骇鐢熶骇棰嗘枡鐢宠鍗�":
+ mappingPakOutOrderParam(param, false, "閾跺骇鐢熶骇棰嗘枡鐢宠鍗�");
+ break;
+ case "閾跺骇鐢熶骇閫�鏂欑敵璇峰崟":
+ mappingPakOutOrderParam(param, true, "閾跺骇鐢熶骇閫�鏂欑敵璇峰崟");
+ break;
+ case "閾跺骇鐢熶骇琛ユ枡鐢宠鍗�":
+ mappingPakOutOrderParam(param, false, "閾跺骇鐢熶骇琛ユ枡鐢宠鍗�");
+ break;
+ case "閾跺骇鐢熶骇鍏ュ簱鐢宠鍗�":
+ mappingPakOutOrderParam(param, true, "閾跺骇鐢熶骇鍏ュ簱鐢宠鍗�");
+ break;
+ default:
+ log.info("鏈煡鐨勫崟鎹被鍨�:{}", param);
+ mappingPakOutOrderParam(param, param.getPakin() == 1 ? true : false, docName);
+ // return R.error("鍗曟嵁鎺ュ彈澶辫触:鏈煡鐨勫崟鎹被鍨�");
+ break;
+ }
return R.ok("鍗曟嵁鎺ュ彈鎴愬姛");
}
+
@PostMapping("/order/delete/default/v1")
@AppAuth(memo = "鍗曟嵁鍒犻櫎瀹℃牳")
@@ -312,6 +325,10 @@
}
if (Cools.isEmpty(orderSyncParam.getDdate())) {
orderSyncParam.setDdate(param.getOrderTime());
+ }
+
+ if (!Cools.isEmpty(param.getCInvCode()) && param.getCInvCode().startsWith("60")) {
+ return;
}
//鐢熸垚鍗曟嵁鏄庣粏
@@ -405,4 +422,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