From 6f088dc1cb716e345da064a5e89f148bd248c75d Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 30 四月 2024 10:54:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 317 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 259 insertions(+), 58 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 01996c4..06b718e 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,21 +1,23 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
-import com.core.common.*;
+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.OpenOrderCompleteParam;
-import com.zy.asrs.entity.param.OpenOrderPakinParam;
-import com.zy.asrs.entity.param.OpenOrderPakoutParam;
+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;
import org.springframework.web.bind.annotation.*;
+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
@@ -41,13 +43,15 @@
@PostMapping("/order/pakin/new/package/v1")
+ @AppAuth(memo = "鎵撳寘涓婄嚎鎺ュ彛")
public synchronized R pakinOrderPackage(@RequestHeader(required = false) String appkey,
- @RequestParam(required = false) String barcode) {
- auth(appkey, barcode);
- if (Cools.isEmpty(barcode)) {
+ @RequestBody(required = false) PackParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
- openService.packageUp(barcode);
+ openService.packageUp(param);
return R.ok();
}
@@ -58,8 +62,9 @@
*/
@PostMapping("/order/pakin/new/default/v1")
public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
- @RequestBody OpenOrderPakinParam param) {
- auth(appkey, param);
+ @RequestBody OpenOrderPakinParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
@@ -81,8 +86,9 @@
*/
@PostMapping("/order/pakin/complete/default/v1")
public synchronized R orderPakinComplete(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) OpenOrderCompleteParam param) {
- auth(appkey, param);
+ @RequestBody(required = false) OpenOrderCompleteParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
return R.ok().add(openService.pakinOrderComplete(param));
}
@@ -90,11 +96,19 @@
* 娣诲姞鍑哄簱鍗�
*/
@PostMapping("/order/pakout/new/default/v1")
+ @AppAuth(memo = "娣诲姞璁㈠崟鍑哄簱")
public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
- @RequestBody OpenOrderPakoutParam param) {
- auth(appkey, param);
+ @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]涓嶈兘涓虹┖");
@@ -114,8 +128,9 @@
*/
@PostMapping("/order/pakout/complete/default/v1")
public synchronized R orderPakoutComplete(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) OpenOrderCompleteParam param) {
- auth(appkey, param);
+ @RequestBody(required = false) OpenOrderCompleteParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
return R.ok().add(openService.pakoutOrderComplete(param));
}
@@ -124,14 +139,73 @@
* 搴撳瓨缁熻
*/
@RequestMapping("/stock/default/v1")
- public R queryStock(@RequestHeader(required = false) String appkey) {
- auth(appkey, null);
+ public R queryStock(@RequestHeader(required = false) String appkey,
+ HttpServletRequest request) {
+ auth(appkey, null, request);
return R.ok().add(openService.queryStock());
}
+ /**
+ * 鍟嗗搧淇℃伅鍚屾鎺ュ彛
+ */
+ @PostMapping("/mat/v1")
+ 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);
+ }
+ openService.syncMat(param);
- private void auth(String appkey, Object obj) {
- log.info("{}鎺ュ彛琚闂紒appkey:{},璇锋眰鏁版嵁锛歿}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
+ 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) {
+ log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
+ request.setAttribute("cache", obj);
if (!auth) {
return;
}
@@ -143,43 +217,170 @@
}
}
- 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/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);
}
- System.out.println(JSON.toJSONString(param));
- // 2
- System.out.println("======================================");
- OpenOrderCompleteParam param1 = new OpenOrderCompleteParam();
- param1.setOrderNo("963001846497017856");
- System.out.println(JSON.toJSONString(param1));
+
+ 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/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);
+ }
+
+ openService.syncOrder(param,true,"閲囪喘鍏ュ簱鍗�");
+
+ return R.ok("鍏ュ簱鍗曟嵁鎺ュ彈鎴愬姛");
+
+ }
+
+ @PostMapping("/order/pakout/default/v1")
+ @AppAuth(memo = "鍚屾宸ュ崟鍗曟嵁")
+ public synchronized R orderPakout(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) OrderProdSyncParam param,
+ HttpServletRequest request){
+
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+
+ openService.syncOrder(mappingPakInOrderParam(param),true,"鐢熶骇鍏ュ簱鍗�");
+ openService.syncOrder(mappingPakOutOrderParam(param),false,"鐢熶骇鍑哄簱鍗�");
+
+
+ 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 OrderSyncParam mappingPakInOrderParam(OrderProdSyncParam param){
+ //鐢熸垚鍗曟嵁涓讳綋
+ OrderSyncParam orderSyncParam = new OrderSyncParam();
+ orderSyncParam.setCPOID(param.getOrderNoT());
+ orderSyncParam.setDdate(param.getOrderTime());
+ orderSyncParam.setCMemo("");
+
+ //鐢熸垚鍗曟嵁鏄庣粏
+ OrderSyncParam.OrderDetl orderDetl = new OrderSyncParam.OrderDetl();
+ orderDetl.setCInvCode(param.getCInvCode());
+ orderDetl.setIQuantity(param.getIQuantity());
+ orderDetl.setCsocode(param.getCsocode());
+ orderDetl.setBFree1(null);
+
+ //娣诲姞鍗曟嵁鏄庣粏鍒板崟鎹富浣�
+ List<OrderSyncParam.OrderDetl> orderDetls = new ArrayList<>();
+ orderDetls.add(orderDetl);
+
+ orderSyncParam.setChildren(orderDetls);
+
+ return orderSyncParam;
+ }
+
+ private OrderSyncParam mappingPakOutOrderParam(OrderProdSyncParam param){
+ OrderSyncParam orderSyncParam = new OrderSyncParam();
+
+ List<OrderProdSyncParam.ChildInfo> child = param.getChild();
+
+ //鐢熸垚鍗曟嵁涓讳綋
+ 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() + "");
+ orderDetls.add(orderDetl);
+ }
+ orderSyncParam.setChildren(orderDetls);
+
+ return orderSyncParam;
}
}
--
Gitblit v1.9.1