From 80871b3ce987584cc9801fd1ecee849efeac3e5f Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 18 十二月 2025 10:11:21 +0800
Subject: [PATCH] 修改ＫＯＰＥＮ返回值实例
---
src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java | 57 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 30 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java b/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
index a92dc6b..7573e27 100644
--- a/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
@@ -11,6 +11,7 @@
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.enums.MatLocType;
import com.zy.api.enums.OrderType;
import com.zy.api.enums.OrderWkType;
@@ -56,12 +57,12 @@
* @date 2025/11/24 14:49
*/
@Override
- public R receiveOrders(PubOrderParams params) {
+ public XSR receiveOrders(PubOrderParams params) {
if (params.getType().equals(OrderWkType.getTypeVal(params.getType()))) {
- return R.error("褰撳墠绫诲瀷涓嶆槸涓婃灦娲惧伐鍗曪紒锛�");
+ return XSR.error("褰撳墠绫诲瀷涓嶆槸涓婃灦娲惧伐鍗曪紒锛�");
}
addOrUpdateOrders(params, "add");
- return R.ok("鍗曟嵁涓嬪彂鎴愬姛锛侊紒");
+ return XSR.ok("鍗曟嵁涓嬪彂鎴愬姛锛侊紒");
}
/**
@@ -72,9 +73,9 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public R getInDispatchResult(ReportOrderParam params) {
+ public XSR getInDispatchResult(ReportOrderParam params) {
if (Objects.isNull(params)) {
- return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ return XSR.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
String response = null;
try {
@@ -85,18 +86,18 @@
.build()
.doPost();
if (Objects.isNull(response) || response.trim().isEmpty()) {
- return R.error("澶栫綉鎺ュ彛鏃犲搷搴旓紒锛�");
+ return XSR.error("澶栫綉鎺ュ彛鏃犲搷搴旓紒锛�");
}
JSONObject jsonObject = JSONObject.parseObject(response);
Integer code = jsonObject.getInteger("code");
if (!Objects.isNull(code) && code.equals(1)) {
- return R.ok("鍏ュ簱鍗曚笂鎶ュ畬鎴愶紒锛�");
+ return XSR.ok("鍏ュ簱鍗曚笂鎶ュ畬鎴愶紒锛�");
} else {
String msg = jsonObject.getString("message");
- return R.error(Objects.isNull(msg) ? "涓婃姤澶辫触锛侊紒" : msg);
+ return XSR.error(Objects.isNull(msg) ? "涓婃姤澶辫触锛侊紒" : msg);
}
} catch (Exception e) {
- return R.error(e.getMessage());
+ return XSR.error(e.getMessage());
}
}
@@ -112,24 +113,24 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public R sendOutDispatch(PubOrderParams params) {
+ public XSR sendOutDispatch(PubOrderParams params) {
if (Objects.isNull(params)) {
- return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ return XSR.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
// 鏍￠獙鍙傛暟
if (Objects.isNull(params.getDispatch_no())) {
- return R.error("娲惧伐鍗曠紪鍙蜂笉鑳戒负绌猴紒锛�");
+ return XSR.error("娲惧伐鍗曠紪鍙蜂笉鑳戒负绌猴紒锛�");
}
if (Objects.isNull(params.getKopen_id())) {
- return R.error("娴佹按鍙蜂笉鑳戒负绌猴紒锛�");
+ return XSR.error("娴佹按鍙蜂笉鑳戒负绌猴紒锛�");
}
if (Objects.isNull(params.getCompany_id())) {
- return R.error("鍏徃ID涓嶈兘涓虹┖锛侊紒");
+ return XSR.error("鍏徃ID涓嶈兘涓虹┖锛侊紒");
}
addOrUpdateOrders(params, "add");
- return R.ok("澶囪揣鎸囩ず娲惧伐鍗曚笅鍙戞垚鍔燂紒锛�");
+ return XSR.ok("澶囪揣鎸囩ず娲惧伐鍗曚笅鍙戞垚鍔燂紒锛�");
}
// /**
@@ -184,15 +185,15 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public synchronized R basMatupdate(List<SyncMatParmas> params) {
+ public synchronized XSR basMatupdate(List<SyncMatParmas> params) {
if (Objects.isNull(params) || params.isEmpty()) {
- return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ return XSR.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
params.forEach(mats -> {
- if (Objects.isNull(mats) ) {
+ if (Objects.isNull(mats)) {
throw new CoolException("鐗╂枡缂栫爜涓嶈兘涓虹┖锛侊紒");
}
- Mat matnr = matService.selectByMatnr(mats.getPro_komcode());
+ Mat matnr = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", mats.getPro_komcode()));
if (!Objects.isNull(matnr)) {
// 璁㈠崟鏃堕棿
if (Utils.isValidFormat(mats.getUpdate_time(), "yyyy-MM-dd HH:mm:ss")) {
@@ -204,6 +205,7 @@
matnr.setWeight(Double.parseDouble(mats.getPro_wet()));
matnr.setSuppCode(mats.getPro_id());
matnr.setTagId(MatLocType.getTag(mats.getPro_type()));
+ matnr.setLocType(MatLocType.getTag(mats.getPro_type()));
matnr.setManu(mats.getCompany_id());
if (!matService.updateById(matnr)) {
throw new CoolException("鐗╂枡鏇存柊澶辫触鎴栨棤闇�鏇存柊锛侊紒");
@@ -223,6 +225,7 @@
matnr.setWeight(Double.parseDouble(mats.getPro_wet()));
matnr.setSuppCode(mats.getPro_id());
matnr.setTagId(MatLocType.getTag(mats.getPro_type()));
+ matnr.setLocType(MatLocType.getTag(mats.getPro_type()));
matnr.setManu(mats.getCompany_id());
if (!matService.insert(matnr)) {
throw new CoolException("鐗╂枡鏇存柊澶辫触锛侊紒");
@@ -230,7 +233,7 @@
}
});
- return R.ok("淇濆瓨鎴愬姛锛侊紒");
+ return XSR.ok("淇濆瓨鎴愬姛锛侊紒");
}
/**
@@ -399,22 +402,22 @@
* @date 2025/11/24 15:40
*/
@Override
- public R getOutDetails(StockUpOrderParams params) {
+ public XSR getOutDetails(StockUpOrderParams params) {
if (Objects.isNull(params)) {
- return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ return XSR.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
// 鏍￠獙鍙傛暟
if (Objects.isNull(params.getDispatch_no())) {
- return R.error("娲惧伐鍗曠紪鍙蜂笉鑳戒负绌猴紒锛�");
+ return XSR.error("娲惧伐鍗曠紪鍙蜂笉鑳戒负绌猴紒锛�");
}
if (Objects.isNull(params.getKopen_id())) {
- return R.error("娴佹按鍙蜂笉鑳戒负绌猴紒锛�");
+ return XSR.error("娴佹按鍙蜂笉鑳戒负绌猴紒锛�");
}
if (Objects.isNull(params.getCompany_id())) {
- return R.error("鍏徃ID涓嶈兘涓虹┖锛侊紒");
+ return XSR.error("鍏徃ID涓嶈兘涓虹┖锛侊紒");
}
if (Objects.isNull(params.getDetails()) || params.getDetails().isEmpty()) {
- return R.error("璁㈠崟鏄庣粏涓嶈兘涓虹┖锛侊紒");
+ return XSR.error("璁㈠崟鏄庣粏涓嶈兘涓虹┖锛侊紒");
}
List<OrderItemsParam> items = new ArrayList<>();
@@ -439,7 +442,7 @@
addOrUpdateOrders(pubOrderParams, "add");
});
- return R.ok("澶囪揣鍗曚笅鍙戞垚鍔燂紒锛�");
+ return XSR.ok("澶囪揣鍗曚笅鍙戞垚鍔燂紒锛�");
}
}
--
Gitblit v1.9.1