From 05466547c913ad2cd29944e5444dd387ce64b25f Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 18 十二月 2025 16:07:48 +0800
Subject: [PATCH] bug修复
---
src/main/java/com/zy/api/controller/KopenApiController.java | 34 ++++++++++++++++------------------
1 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/api/controller/KopenApiController.java b/src/main/java/com/zy/api/controller/KopenApiController.java
index 3e7af17..ae7619e 100644
--- a/src/main/java/com/zy/api/controller/KopenApiController.java
+++ b/src/main/java/com/zy/api/controller/KopenApiController.java
@@ -1,12 +1,11 @@
package com.zy.api.controller;
-import com.core.common.R;
-import com.zy.api.entity.OrderParams;
import com.zy.api.entity.PubOrderParams;
import com.zy.api.entity.ReportOrderParam;
import com.zy.api.entity.StockUpOrderParams;
import com.zy.api.entity.SyncMatParmas;
+import com.zy.api.entity.dto.XSR;
import com.zy.api.service.KopenApiService;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -40,19 +39,19 @@
*/
@ApiOperation("涓婃灦娲惧伐鍗�")
@PostMapping("/sendInDispatch")
- public R receiveOrders(@RequestBody PubOrderParams params) {
+ public XSR receiveOrders(@RequestBody PubOrderParams params) {
if (Objects.isNull(params)) {
- return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ return XSR.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
if (Objects.isNull(params.getType())) {
- return R.error("鍗曟嵁绫诲瀷涓嶈兘涓虹┖锛�");
+ return XSR.error("鍗曟嵁绫诲瀷涓嶈兘涓虹┖锛�");
}
return kopenApiService.receiveOrders(params);
}
/**
* 涓婃父涓嬪彂闆朵欢鏁版嵁鍙樻洿
- * s
+ *
* @author Ryan
* @date 2025/11/24 15:19
* @param params
@@ -60,13 +59,12 @@
*/
@ApiOperation("闆朵欢淇℃伅鏁版嵁鏇存柊")
@PostMapping("/sendPartsMaster")
- public R basMatUpdate(@RequestBody List<SyncMatParmas> params) {
+ public XSR basMatUpdate(@RequestBody List<SyncMatParmas> params) {
if (Objects.isNull(params) || params.isEmpty()) {
- return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ return XSR.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
return kopenApiService.basMatupdate(params);
}
-
/**
* 涓婃灦娲惧伐鍗曞弽棣�
@@ -77,12 +75,12 @@
*/
@ApiOperation("涓婃灦娲惧伐鍗曞弽棣�")
@PostMapping("/getInDispatchResult")
- public R getInDispatchResult(@RequestBody ReportOrderParam params) {
+ public XSR getInDispatchResult(@RequestBody ReportOrderParam params) {
if (Objects.isNull(params)) {
- return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ return XSR.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
if (Objects.isNull(params.getKopen_id()) && Objects.isNull(params.getInv_no()) && Objects.isNull(params.getDispatch_no())) {
- return R.error("鍙栨秷鏉′欢涓嶈兘涓虹┖锛侊紒");
+ return XSR.error("鍙栨秷鏉′欢涓嶈兘涓虹┖锛侊紒");
}
return kopenApiService.getInDispatchResult(params);
}
@@ -96,12 +94,12 @@
*/
@ApiOperation("澶囪揣鎸囩ず娲惧伐鍗曚笅鍙�")
@PostMapping("/sendOutDispatch")
- public R sendStockPrepareDispatch(@RequestBody PubOrderParams params) {
+ public XSR sendStockPrepareDispatch(@RequestBody PubOrderParams params) {
if (Objects.isNull(params)) {
- return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ return XSR.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
if (Objects.isNull(params.getDetails()) || params.getDetails().isEmpty()) {
- return R.error("涓婃姤璁㈠崟鍒楄〃涓嶈兘涓虹┖锛侊紒");
+ return XSR.error("涓婃姤璁㈠崟鍒楄〃涓嶈兘涓虹┖锛侊紒");
}
return kopenApiService.sendOutDispatch(params);
}
@@ -136,12 +134,12 @@
*/
@ApiOperation("澶囪揣鍗曚笅鍙�")
@PostMapping("/getOutDetails")
- public R getOutDetails(@RequestBody StockUpOrderParams params) {
+ public XSR getOutDetails(@RequestBody StockUpOrderParams params) {
if (Objects.isNull(params)) {
- return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ return XSR.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
if (Objects.isNull(params.getDetails()) || params.getDetails().isEmpty()) {
- return R.error("涓婃姤璁㈠崟鍒楄〃涓嶈兘涓虹┖锛侊紒");
+ return XSR.error("涓婃姤璁㈠崟鍒楄〃涓嶈兘涓虹┖锛侊紒");
}
return kopenApiService.getOutDetails(params);
}
--
Gitblit v1.9.1