From ad388e75b34a2145f12cf12215566eef900b4892 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期六, 15 六月 2024 13:00:31 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java | 7 +++++--
zy-asrs-openapi/src/main/resources/application.yml | 8 ++++++++
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-openapi/src/main/resources/application.yml b/zy-asrs-openapi/src/main/resources/application.yml
index d8d79c1..00ae452 100644
--- a/zy-asrs-openapi/src/main/resources/application.yml
+++ b/zy-asrs-openapi/src/main/resources/application.yml
@@ -44,3 +44,11 @@
super:
pwd: xltys1995
+
+#License鐩稿叧閰嶇疆
+license:
+ subject: nbncasrs
+ publicAlias: publicCert
+ storePass: public_zhongyang_123456789
+ licensePath: license.lic
+ publicKeysStorePath: publicCerts.keystore
\ No newline at end of file
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java
index d8fbe6f..c6e0a66 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java
@@ -23,7 +23,9 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
+import java.net.URLDecoder;
import java.util.*;
@RestController
@@ -105,7 +107,7 @@
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ @RequestParam Map<String, Object> param) throws UnsupportedEncodingException {
LambdaQueryWrapper<Order> wrapper = new LambdaQueryWrapper<>();
excludeTrash(param);
wrapper.eq(Order::getStatus, 1);
@@ -122,7 +124,8 @@
wrapper.eq(Order::getDocType, param.get("doc_type"));
}
if (!Cools.isEmpty(param.get("docName"))) {
- DocType docType = docTypeService.getOne(new LambdaQueryWrapper<DocType>().eq(DocType::getDocName, param.get("docName")));
+ String docName = URLDecoder.decode(param.get("docName").toString(), "UTF-8");
+ DocType docType = docTypeService.getOne(new LambdaQueryWrapper<DocType>().eq(DocType::getDocName, docName));
wrapper.eq(Order::getDocType, docType.getDocId());
}
if (!Cools.isEmpty(param.get("settle"))) {
--
Gitblit v1.9.1