From 984039880e1f6ccc4cb61c35e0004147aa46d5bc Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期六, 21 九月 2024 11:20:39 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 335 ++++++++++++++++++++++++++-----------------------------
1 files changed, 161 insertions(+), 174 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 4a9ee52..1e2b75c 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,12 +1,14 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.core.annotations.AppAuth;
-import com.core.common.*;
+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.service.OpenService;
-import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -14,8 +16,8 @@
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* Created by vincent on 2022/4/8
@@ -33,106 +35,6 @@
@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));
- }
-
-
/**
* 搴撳瓨缁熻
*/
@@ -147,6 +49,7 @@
* 鍟嗗搧淇℃伅鍚屾鎺ュ彛
*/
@PostMapping("/mat/v1")
+ @AppAuth(memo = "鐗╂枡鍚屾鎺ュ彛")
public synchronized R syncMatInfoErp(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) MatSyncParam param,
HttpServletRequest request){
@@ -154,44 +57,13 @@
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
- MatSyncParam matSyncParam = openService.syncMat(param);
- if (Cools.isEmpty(matSyncParam.getMats()) || matSyncParam.getMats().size() <=0 ) {
- return R.error("鏁版嵁寮傚父");
- }
- StringBuilder Msg= new StringBuilder("鍘熷洜锛�");
- int MsgT=0,MsgF=0;
- for (MatSyncParam.Mats matParam:matSyncParam.getMats()){
- if (matParam.isType()){
- MsgT++;
- }else {
- MsgF++;
- Msg.append(matParam.getMatnr()).append(":").append(matParam.getMemo()).append(";");
- }
- }
- if (MsgF==0){
- return R.ok("鎴愬姛鎺ユ敹鐗╂枡锛�"+MsgT+"涓�");
- }else if (MsgT==0){
- return R.ok("鎺ユ敹鐗╂枡澶辫触锛�"+MsgF+"涓�;"+Msg);
- }else {
- return R.ok("鎴愬姛鎺ユ敹鐗╂枡锛�"+MsgT+"涓�;"+"鎺ユ敹鐗╂枡澶辫触锛�"+MsgF+"涓�;"+Msg);
- }
+ openService.syncMat(param);
+
+ 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("缁勬墭鎴愬姛");
- }
+
private void auth(String appkey, Object obj, HttpServletRequest request) {
@@ -208,43 +80,158 @@
}
}
- public static void main(String[] args) {
- // 1
- System.out.println("======================================");
- OpenOrderPakinParam param = new OpenOrderPakinParam();
- param.setOrderNo(String.valueOf(new SnowflakeIdWorker().nextId()));
- param.setOrderType("鎵撳寘涓婄嚎鍗�");
- param.setOrderTime(DateUtils.convert(new Date()));
- List<DetlDto> orderDetails = new ArrayList<>();
- param.setOrderDetails(orderDetails);
- for (int i = 0; i < 3; i++) {
- DetlDto detlDto = new DetlDto();
- switch (i) {
- case 0:
- detlDto.setMatnr("MDH020030530");
- detlDto.setBatch("500");
- detlDto.setAnfme(18.0);
- break;
- case 1:
- detlDto.setMatnr("MDH020016416");
- detlDto.setBatch("500");
- detlDto.setAnfme(32.0);
- break;
- case 2:
- detlDto.setMatnr("LSH90152025");
- detlDto.setAnfme(50.0);
- break;
- default:
- break;
- }
- orderDetails.add(detlDto);
+
+ @PostMapping("/order/pak/default/v1")
+ @AppAuth(memo = "鐢熸垚閫�璐цˉ璐у崟鎹�")
+ public synchronized R orderAccept(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = true) OrderSyncParam param,
+ HttpServletRequest request){
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
}
- System.out.println(JSON.toJSONString(param));
- // 2
- System.out.println("======================================");
- OpenOrderCompleteParam param1 = new OpenOrderCompleteParam();
- param1.setOrderNo("963001846497017856");
- System.out.println(JSON.toJSONString(param1));
+
+ String docName = param.get鎿嶄綔鍗曟嵁();
+ boolean pakin = param.getPakin() == 1 ? true : false;
+
+ openService.syncOrder(param,pakin,docName);
+
+ return R.ok("鍗曟嵁鎺ュ彈鎴愬姛");
+
+ }
+
+ @PostMapping("/order/pakin/default/v1")
+ @AppAuth(memo = "鐢熸垚鍏ュ簱鍗曟嵁")
+ public synchronized R orderPakin(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = true) OrderSyncParam param,
+ HttpServletRequest request){
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+
+ String docName = param.getChildren().get(0).getIQuantity() > 0 ? "閾跺骇閲囪喘鍏ュ簱鍗�" : "閾跺骇閲囪喘閫�璐у崟";
+ boolean pakin = param.getChildren().get(0).getIQuantity() > 0 ? true : false;
+
+ openService.syncOrder(param,pakin,docName);
+
+ return R.ok("鍗曟嵁鎺ュ彈鎴愬姛");
+
+ }
+
+ @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){
+
+ 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);
+ }
+
+ return R.ok("鍗曟嵁鎺ュ彈鎴愬姛");
+
+ }
+
+ @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){
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+
+ boolean success = openService.orderDelete(param.get("id").toString());
+
+ if(success){
+ return R.ok("鍗曟嵁鍒犻櫎鎴愬姛");
+ }else {
+ return R.error("鍗曟嵁姝ｅ湪鎵ц锛屽垹闄ゅけ璐�");
+ }
+
+ }
+
+ 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());
+
+ //鐢熸垚鍗曟嵁鏄庣粏
+ OrderSyncParam.OrderDetl orderDetl = new OrderSyncParam.OrderDetl();
+ orderDetl.setcInvCode(param.getCInvCode());
+ orderDetl.setiQuantity(param.getIQuantity());
+ orderDetl.setcDefine22(param.getDefine24());
+ orderDetl.setbFree1(param.getBFree1());
+ orderDetl.setId(param.getId());
+ orderDetl.setIvouchrowno(param.getIvouchrowno());
+
+ //娣诲姞鍗曟嵁鏄庣粏鍒板崟鎹富浣�
+ 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;
+ }
+
+ 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("");
+
+ //鐢熸垚鍗曟嵁鏄庣粏
+ 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());
+ orderDetl.setCsocode(param.getCsocode());
+ orderDetl.setbFree1(childInfo.getBFree1());
+ orderDetl.setId(childInfo.getIds());
+ orderDetl.setIvouchrowno(childInfo.getIvouchrowno());
+
+ orderDetls.add(orderDetl);
+ }
+ orderSyncParam.setChildren(orderDetls);
+
+ openService.syncOrder(orderSyncParam,false,docName);
+
+ //return orderSyncParam;
}
}
--
Gitblit v1.9.1