From f0c73d72fe7f939be2d3fdf5fc90889971a67fe5 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 11 六月 2024 17:18:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 319 +++++++++++++++++------------------------------------
1 files changed, 102 insertions(+), 217 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index cae3801..1e2b75c 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -35,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));
- }
-
-
/**
* 搴撳瓨缁熻
*/
@@ -149,6 +49,7 @@
* 鍟嗗搧淇℃伅鍚屾鎺ュ彛
*/
@PostMapping("/mat/v1")
+ @AppAuth(memo = "鐗╂枡鍚屾鎺ュ彛")
public synchronized R syncMatInfoErp(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) MatSyncParam param,
HttpServletRequest request){
@@ -156,69 +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("缁勬墭鎴愬姛");
- }
- /**
- * 鍏ュ簱璁板綍鑾峰彇
- */
- @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());
- }
private void auth(String appkey, Object obj, HttpServletRequest request) {
@@ -235,97 +80,74 @@
}
}
- @PostMapping("/order/matSync/default/v1")
- public synchronized R syncMatInfoU8(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) Map<String, Object> param,
- HttpServletRequest request){
+
+ @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);
}
- int msgU = 0;
- int msgT = 0;
- int msgF = 0;
- StringBuilder msg= new StringBuilder("鍘熷洜锛�");
+ String docName = param.get鎿嶄綔鍗曟嵁();
+ boolean pakin = param.getPakin() == 1 ? true : false;
- List<MatInfoParam> matDetails = (List<MatInfoParam>) param.get("matDetails");
+ openService.syncOrder(param,pakin,docName);
- 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);
-// }
+ return R.ok("鍗曟嵁鎺ュ彈鎴愬姛");
}
@PostMapping("/order/pakin/default/v1")
@AppAuth(memo = "鐢熸垚鍏ュ簱鍗曟嵁")
public synchronized R orderPakin(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) Map<String, Object> param,
+ @RequestBody(required = true) OrderSyncParam param,
HttpServletRequest request){
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
- openService.syncOrder(param,true);
+ String docName = param.getChildren().get(0).getIQuantity() > 0 ? "閾跺骇閲囪喘鍏ュ簱鍗�" : "閾跺骇閲囪喘閫�璐у崟";
+ boolean pakin = param.getChildren().get(0).getIQuantity() > 0 ? true : false;
- return R.ok("鍏ュ簱鍗曟嵁鎺ュ彈鎴愬姛");
+ openService.syncOrder(param,pakin,docName);
+
+ return R.ok("鍗曟嵁鎺ュ彈鎴愬姛");
}
@PostMapping("/order/pakout/default/v1")
- @AppAuth(memo = "鐢熸垚鍑哄簱鍗曟嵁")
+ @AppAuth(memo = "鍚屾宸ュ崟鍗曟嵁")
public synchronized R orderPakout(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) Map<String, Object> param,
+ //@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);
- openService.syncOrder(param,false);
+ 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("鍑哄簱鍗曟嵁鎺ュ彈鎴愬姛");
+ }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("鍗曟嵁鎺ュ彈鎴愬姛");
}
@@ -349,4 +171,67 @@
}
+ 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