From 312e24f10492fdf99534946df068ba5b1a8331bd Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 30 三月 2026 15:15:45 +0800
Subject: [PATCH] ERP单据对接
---
src/main/java/com/zy/asrs/controller/OpenController.java | 51 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index cb34a46..4b7db9f 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -5,6 +5,8 @@
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.param.*;
+import com.zy.asrs.entity.u8.ReportU8Vo;
+import com.zy.asrs.entity.u8.U8ResultVo;
import com.zy.asrs.service.OpenService;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
@@ -33,8 +35,26 @@
@Autowired
private OpenService openService;
+ @PostMapping("/purchasein_import")
+ @AppAuth(memo = "璁㈠崟涓婃姤娴嬭瘯鎺ュ彛")
+ public synchronized List<U8ResultVo> ts(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) List<ReportU8Vo> param,
+ HttpServletRequest request){
+
+ List<U8ResultVo> u8ResultVos = new ArrayList<>();
+ for(ReportU8Vo reportU8Vo: param) {
+ U8ResultVo u8ResultVo = new U8ResultVo();
+ u8ResultVo.setResult("T");
+ u8ResultVo.setDescription("");
+ u8ResultVo.setReceiptNo(reportU8Vo.getCvouchcode());
+ u8ResultVo.setU8ReceiptNo("");
+ u8ResultVos.add(u8ResultVo);
+ }
+ return u8ResultVos;
+ }
+
@PostMapping("/order/matSync/default/v1")
- @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
+ @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾")
public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) MatSyncParam param,
HttpServletRequest request){
@@ -67,6 +87,7 @@
* 娣诲姞鍏ュ簱鍗�
*/
@PostMapping("/order/pakin/default/v1")
+ @AppAuth(memo = "鍏ュ簱鍗曚笅鍙�")
public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
@RequestBody OpenOrderPakinParam param,
HttpServletRequest request) {
@@ -77,10 +98,13 @@
if (Cools.isEmpty(param.getOrderNo())) {
return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
}
+ if (Cools.isEmpty(param.getOptType())) {
+ return R.error("鎿嶄綔绫诲瀷[optType]涓嶈兘涓虹┖");
+ }
if (Cools.isEmpty(param.getOrderType())) {
return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
}
- if (Cools.isEmpty(param.getOrderDetails())) {
+ if (!param.getOptType().equals("delete") && Cools.isEmpty(param.getOrderDetails())) {
return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
}
openService.pakinOrderCreate(param);
@@ -102,7 +126,7 @@
* 娣诲姞鍑哄簱鍗�
*/
@PostMapping("/order/pakout/default/v1")
- @AppAuth(memo = "娣诲姞璁㈠崟鍑哄簱")
+ @AppAuth(memo = "鍑哄簱鍗曚笅鍙�")
public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
@RequestBody OpenOrderPakoutParam param,
HttpServletRequest request) {
@@ -110,19 +134,16 @@
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())) {
+ if (Cools.isEmpty(param.getOptType())) {
+ return R.error("鎿嶄綔绫诲瀷[optType]涓嶈兘涓虹┖");
+ }
+ if (!param.getOptType().equals("delete") && Cools.isEmpty(param.getOrderDetails())) {
return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
}
openService.pakoutOrderCreate(param);
@@ -140,6 +161,14 @@
return R.ok().add(openService.pakoutOrderComplete(param));
}
+ /**
+ * 缁撴灉涓婃姤鎺ュ彛-娴嬭瘯
+ */
+ @PostMapping("/order/resultExport/default/v1")
+ public synchronized R orderPakoutComplete(String param) {
+ return new R(200,"鎿嶄綔鎴愬姛");
+ }
+
/**
* 搴撳瓨缁熻
@@ -152,7 +181,7 @@
}
private void auth(String appkey, Object obj, HttpServletRequest request) {
- log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
+ log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", request.getRequestURI(), appkey, JSON.toJSONString(obj));
request.setAttribute("cache", obj);
if (!auth) {
return;
--
Gitblit v1.9.1