From 67cb49032b0efff478b2432713d62c305e4e53ce Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 30 十月 2024 17:42:34 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/OpenController.java | 199 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 142 insertions(+), 57 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index b683199..c45aa28 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,13 +1,17 @@
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.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.service.OpenService;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
@@ -33,16 +37,17 @@
}};
-
@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());
}
@@ -52,9 +57,7 @@
*/
@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);
@@ -64,8 +67,6 @@
return R.ok("鏇存柊鎴愬姛");
}
-
-
private void auth(String appkey, Object obj, HttpServletRequest request) {
@@ -85,19 +86,26 @@
@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));
+ 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);
}
-
- String docName = param.get鎿嶄綔鍗曟嵁();
- boolean pakin = param.getPakin() == 1 ? true : false;
-
- openService.syncOrder(param,pakin,docName);
+ 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);
return R.ok("鍗曟嵁鎺ュ彈鎴愬姛");
@@ -105,20 +113,26 @@
@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(required = true) OrderSyncParam param, HttpServletRequest request) {
+ log.info("鐢熸垚鍏ュ簱鍗曟嵁,{}", JSON.toJSONString(param));
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;
+// 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);
-
+ 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绫诲瀷");
+ }
return R.ok("鍗曟嵁鎺ュ彈鎴愬姛");
}
@@ -128,9 +142,7 @@
*/
@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(required = true) CheckParam param, HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
@@ -147,29 +159,51 @@
@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));
+ @RequestBody(required = false) OrderProdSyncParam param, HttpServletRequest request) {
+ log.info("鍚屾宸ュ崟鍗曟嵁,{}", JSON.toJSONString(param));
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);
+ DocType type = getType(param.get鎿嶄綔鍗曟嵁(), param.getIQuantity());
+ if (!Cools.isEmpty(type)) {
+ if (type.getDocName().equals("MO")) {
+ mappingPakInOrderParam(param, true, type.getDocName());
+ mappingPakOutOrderParam(param, false, "閾跺骇濮斿鏉愭枡鍑哄簱鍗�");
+ } else if (type.getDocName().equals("OM")) {
+ mappingPakInOrderParam(param, true, type.getDocName());
+ mappingPakOutOrderParam(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 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 {
+ return R.ok("鍗曟嵁鎺ュ彈澶辫触锛屼笉鏄害瀹氱殑鍗曟嵁l绫诲瀷");
}
+
+// 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);
+// }
return R.ok("鍗曟嵁鎺ュ彈鎴愬姛");
@@ -177,10 +211,8 @@
@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){
- log.info("鍗曟嵁鍒犻櫎瀹℃牳,{}",JSON.toJSONString(param));
+ 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)) {
return R.parse(BaseRes.PARAM);
@@ -188,15 +220,15 @@
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鎿嶄綔绯荤粺鍙�());
@@ -222,12 +254,12 @@
// 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();
@@ -241,7 +273,7 @@
//鐢熸垚鍗曟嵁鏄庣粏
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());
@@ -254,9 +286,62 @@
}
orderSyncParam.setChildren(orderDetls);
- openService.syncOrder(orderSyncParam,false,docName);
+ openService.syncOrder(orderSyncParam, false, 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;
+ }
}
--
Gitblit v1.9.1