From 80871b3ce987584cc9801fd1ecee849efeac3e5f Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 18 十二月 2025 10:11:21 +0800
Subject: [PATCH] 修改ＫＯＰＥＮ返回值实例
---
/dev/null | 30 -------
src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java | 51 ++++++------
src/main/java/com/zy/api/service/KopenApiService.java | 12 +-
src/main/webapp/static/js/mat/mat.js | 4
src/main/java/com/zy/api/entity/dto/XSR.java | 77 +++++++++++++++++++
src/main/webapp/views/mat/mat.html | 4
src/main/webapp/static/js/common.js | 8 +-
src/main/java/com/zy/api/controller/KopenApiController.java | 29 +++---
8 files changed, 132 insertions(+), 83 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..122fa3f 100644
--- a/src/main/java/com/zy/api/controller/KopenApiController.java
+++ b/src/main/java/com/zy/api/controller/KopenApiController.java
@@ -7,6 +7,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.service.KopenApiService;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -40,12 +41,12 @@
*/
@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);
}
@@ -60,9 +61,9 @@
*/
@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 +78,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 +97,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 +137,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);
}
diff --git a/src/main/java/com/zy/api/entity/dto/BaseResponse.java b/src/main/java/com/zy/api/entity/dto/BaseResponse.java
deleted file mode 100644
index 3e39c44..0000000
--- a/src/main/java/com/zy/api/entity/dto/BaseResponse.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.zy.api.entity.dto;
-
-import java.sql.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-@Data
-@Accessors(chain = true)
-@ApiModel(value = "BaseResponse", description = "鍩虹鍝嶅簲")
-public class BaseResponse {
-
-
- private String message;
-
- private Boolean success;
-
- private String returnMessage;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date timestamp;
-
-
-
-
-}
diff --git a/src/main/java/com/zy/api/entity/dto/XSR.java b/src/main/java/com/zy/api/entity/dto/XSR.java
new file mode 100644
index 0000000..d241e06
--- /dev/null
+++ b/src/main/java/com/zy/api/entity/dto/XSR.java
@@ -0,0 +1,77 @@
+package com.zy.api.entity.dto;
+
+import java.sql.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "BaseResponse", description = "鍩虹鍝嶅簲")
+public class XSR<T> {
+ private static final String SUCCESS_CODE = "200";
+ private static final String FAIL_CODE = "500";
+
+ private String code;
+
+ private String message;
+
+ private Boolean success;
+
+ private String returnMessage;
+
+ private T data;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date timestamp;
+
+ public XSR() {
+ this.timestamp = new Date(System.currentTimeMillis());
+ }
+
+ public static <T> XSR<T> ok() {
+ return new XSR<T>()
+ .setCode(SUCCESS_CODE)
+ .setSuccess(true)
+ .setMessage("鎿嶄綔鎴愬姛")
+ .setReturnMessage("鎿嶄綔鎴愬姛");
+ }
+
+ public static <T> XSR<T> ok(T data) {
+ return new XSR<T>()
+ .setCode(SUCCESS_CODE)
+ .setSuccess(true)
+ .setMessage("鎿嶄綔鎴愬姛")
+ .setReturnMessage("鎿嶄綔鎴愬姛")
+ .setData(data);
+ }
+
+ public static <T> XSR<T> ok(T data, String message) {
+ return new XSR<T>()
+ .setCode(SUCCESS_CODE)
+ .setSuccess(true)
+ .setMessage(message)
+ .setReturnMessage(message)
+ .setData(data);
+ }
+
+ public static <T> XSR<T> error(String message) {
+ return new XSR<T>()
+ .setCode(FAIL_CODE)
+ .setSuccess(false)
+ .setMessage(message)
+ .setReturnMessage(message);
+ }
+
+ public static <T> XSR<T> error(String code, String message) {
+ return new XSR<T>()
+ .setCode(code)
+ .setSuccess(false)
+ .setMessage(message)
+ .setReturnMessage(message);
+ }
+}
diff --git a/src/main/java/com/zy/api/service/KopenApiService.java b/src/main/java/com/zy/api/service/KopenApiService.java
index 74af3a5..b368a52 100644
--- a/src/main/java/com/zy/api/service/KopenApiService.java
+++ b/src/main/java/com/zy/api/service/KopenApiService.java
@@ -2,11 +2,11 @@
import java.util.List;
-import com.core.common.R;
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;
public interface KopenApiService {
@@ -18,7 +18,7 @@
* @param params
* @return com.core.common.R
*/
- R receiveOrders(PubOrderParams params);
+ XSR receiveOrders(PubOrderParams params);
/**
* 鍩虹闆朵欢鍙樻洿
@@ -27,7 +27,7 @@
* @param matnrs
* @return com.core.common.R
*/
- R basMatupdate(List<SyncMatParmas> matnrs);
+ XSR basMatupdate(List<SyncMatParmas> matnrs);
/**
@@ -42,14 +42,14 @@
* @param params
* @return
*/
- R getInDispatchResult(ReportOrderParam params);
+ XSR getInDispatchResult(ReportOrderParam params);
/**
* 澶囪揣鎸囩ず娲惧伐鍗曚笅鍙�
* @param params
* @return
*/
- R sendOutDispatch(PubOrderParams params);
+ XSR sendOutDispatch(PubOrderParams params);
/**
* 澶囪揣鍗曚笅鍙�
@@ -58,5 +58,5 @@
* @param params
* @return com.core.common.R
*/
- R getOutDetails(StockUpOrderParams params);
+ XSR getOutDetails(StockUpOrderParams params);
}
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 3e3634b..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,9 +185,9 @@
*/
@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)) {
@@ -232,7 +233,7 @@
}
});
- return R.ok("淇濆瓨鎴愬姛锛侊紒");
+ return XSR.ok("淇濆瓨鎴愬姛锛侊紒");
}
/**
@@ -401,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<>();
@@ -441,7 +442,7 @@
addOrUpdateOrders(pubOrderParams, "add");
});
- return R.ok("澶囪揣鍗曚笅鍙戞垚鍔燂紒锛�");
+ return XSR.ok("澶囪揣鍗曚笅鍙戞垚鍔燂紒锛�");
}
}
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 04b19f5..e767615 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -184,12 +184,14 @@
// {field: 'id', align: 'center',title: 'ID'}
// ,{field: 'uuid', align: 'center',title: '缂栧彿'}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О锛堝搧鍚嶏級', width: 200}
- ,{field: 'specs', align: 'center',title: '瑙勬牸'}
+ ,{field: 'specs', align: 'center',title: '灏哄'}
+ ,{field: 'weight', align: 'center',title: '閲嶉噺'}
+ ,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�'}
,{field: 'model', align: 'center',title: '浠ｇ爜', hide: true}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
,{field: 'upQty', align: 'center',title: '缁勬墭涓婇檺'}
- ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: false}
+ ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
,{field: 'sku', align: 'center',title: 'sku', hide: true}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
@@ -199,12 +201,10 @@
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
- ,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: true}
,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
- ,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
,{field: 'deadTime', align: 'center',title: '淇濊川鏈�', hide: true}
,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟', hide: true}
diff --git a/src/main/webapp/static/js/mat/mat.js b/src/main/webapp/static/js/mat/mat.js
index 777cab7..4874d47 100644
--- a/src/main/webapp/static/js/mat/mat.js
+++ b/src/main/webapp/static/js/mat/mat.js
@@ -5,8 +5,8 @@
function getCol() {
var cols = [
{type: 'checkbox'}
- , {field: 'tagId$', align: 'center', title: '褰掔被', templet: '#tagTpl'}
- , {field: 'locType$', align: 'center', title: '搴撲綅绫诲瀷'}
+ , {field: 'tagId$', align: 'center', title: '褰掔被', templet: '#tagTpl', width: 90}
+ , {field: 'locType$', align: 'center', title: '搴撲綅绫诲瀷', width: 90}
// ,{field: 'store_max', align: 'center',title: '搴撳瓨涓婇檺'}
// ,{field: 'store_min', align: 'center',title: '搴撳瓨涓嬮檺'}
// ,{field: 'store_max_date', align: 'center',title: '搴撻緞涓婇檺(澶�)'}
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index 19ed4fb..0d215af 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -60,12 +60,12 @@
<div class="layui-fluid">
<!-- 宸� -->
<div class="layui-row layui-col-space15">
- <div class="layui-col-md3">
+ <div class="layui-col-md2">
<div class="layui-card">
<div class="layui-card-body" style="padding: 10px;">
<!-- 鏍戝伐鍏锋爮 -->
<div class="layui-form toolbar" id="organizationTreeBar">
- <div class="layui-inline" style="max-width: 200px;">
+ <div class="layui-inline" style="max-width: 150px;">
<input id="condition" onkeyup="findData(this)" type="text" class="layui-input" placeholder="璇疯緭鍏ュ叧閿瓧" autocomplete="off">
</div>
<div class="layui-inline">
--
Gitblit v1.9.1