#

cp

2024-06-15 ad388e75b34a2145f12cf12215566eef900b4892

#

 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

 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"))) {