From aefc453a2a9bfcc654bcc7a2ce4735243119665e Mon Sep 17 00:00:00 2001
From: bfwms <1>
Date: 星期二, 23 九月 2025 15:27:40 +0800
Subject: [PATCH] ERP对接
---
src/main/java/com/zy/asrs/controller/OpenController.java | 105 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 64 insertions(+), 41 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index c0c3585..9d16f1f 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,14 +1,12 @@
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.exception.CoolException;
import com.zy.asrs.entity.WrkMast;
-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.PackParam;
+import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.OpenService;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.model.DetlDto;
@@ -20,6 +18,7 @@
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
/**
@@ -62,29 +61,7 @@
- /**
- * 娣诲姞鍏ュ簱鍗�
- */
- @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();
- }
+
/**
* 鍏ュ簱鍗曞洖鍐�
@@ -140,18 +117,31 @@
+ @PostMapping("/order/matSync/default/v2")
+// @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
+ public synchronized R syncMatInfoV2(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) MatSyncParam.MatParam param,
+ HttpServletRequest request){
-
-
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ MatSyncParam matSyncParam = new MatSyncParam();
+ List<MatSyncParam.MatParam> objects = new ArrayList<>();
+ objects.add(param);
+ matSyncParam.matDetails = objects;
+ openService.syncMat(matSyncParam);
+ return R.ok();
+ }
/**
- * 娣诲姞鍑哄簱鍗�
+ * 娣诲姞鍏ュ簱鍗�
*/
- @PostMapping("/order/pakout/new/default/v1")
- @AppAuth(memo = "娣诲姞璁㈠崟鍑哄簱")
- public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
- @RequestBody OpenOrderPakoutParam param,
- HttpServletRequest request) {
+ @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);
@@ -165,20 +155,53 @@
if (Cools.isEmpty(param.getOrderDetails())) {
return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
}
- openService.pakoutOrderCreate(param);
+ openService.pakinOrderCreate(param);
+ return R.ok();
+ }
+
+ /**
+ * 娣诲姞鍑哄簱鍗�
+ */
+ @PostMapping("/order/pakout/new/default/v1")
+ @AppAuth(memo = "娣诲姞璁㈠崟鍑哄簱")
+ public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
+ @RequestBody HashMap<String , Object> map, HttpServletRequest request
+ ) {
+ auth(appkey, map, request);
+ String toJSONString = JSONObject.toJSONString(map.get("data"));
+ List<OpenOrderPakoutParam> openOrderPakoutParams=JSON.parseArray(toJSONString,OpenOrderPakoutParam.class);
+ int i=1;
+ for (OpenOrderPakoutParam param: openOrderPakoutParams){
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getOrderNo())) {
+ return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
+ }
+ System.out.println(i+"-------------------------------"+param.getOrderNo());
+ i++;
+ 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("/pickToFill/barcode")
@AppAuth(memo = "鎹℃枡杞叏鏉�")
- public synchronized R againOut(@RequestHeader(required = false) String appkey,
- @RequestBody PackParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
+ public synchronized R againOut(@RequestHeader(required = false) String appkey,@RequestBody HashMap<String , Object> map, HttpServletRequest request) {
+ auth(appkey, map, request);
+ String toJSONString = JSONObject.toJSONString(map);
+ PackParam param=JSON.parseObject(toJSONString,PackParam.class);
if (Cools.isEmpty(param)||Cools.isEmpty(param.getBarcode())) {
return R.error("鎵樼洏鐮佷负绌�,璇锋鏌�");
}
--
Gitblit v1.9.1