opt:增加仓库搜索

2024-06-07 02:09:43 +08:00
parent c74dfebdb0
commit c1881b0cae
6 changed files with 73 additions and 48 deletions
--- a/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/AllocationBillServiceImpl.java
+++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/AllocationBillServiceImpl.java
@@ -192,14 +192,12 @@ public class AllocationBillServiceImpl extends ServiceImpl<AllocationBillMapper,
     */
    @Override
    public CommonPage<InventoryInfos> getInventoryInfo(AllocationBillVO params) {
-//        if (StringUtils.isBlank(params.getDckcbm()) && StringUtils.isBlank(params.getDcckbm()) && StringUtils.isBlank(params.getDckwbm()) && StringUtils.isBlank(params.getWlbm()) && StringUtils.isBlank(params.getPc())&& StringUtils.isBlank(params.getGzh())
-//        {
-//            return null;
-//        }else{
-//            List<InventoryInfos> result = allocationBillMapper.selectByCondition(params.getDckcbm(), params.getDcckbm(), params.getDckwbm(), params.getWlbm(), params.getPc(), "999");
-//            return CommonPage.restPage(result);
-//        }
-        return null;
+        if (StringUtils.isBlank(params.getDckcbm()) && StringUtils.isBlank(params.getDcckbm()) && StringUtils.isBlank(params.getDckwbm()) && StringUtils.isBlank(params.getWlbm()) && StringUtils.isBlank(params.getPc()) && StringUtils.isBlank(params.getGzh())) {
+            return null;
+        } else {
+            List<InventoryInfos> result = allocationBillMapper.selectByCondition(params.getDckcbm(), params.getDcckbm(), params.getDckwbm(), params.getWlbm(), params.getPc(), params.getGzh());
+            return CommonPage.restPage(result);
+        }
    }


--- a/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/EasOutInBillDetailServiceImpl.java
+++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/EasOutInBillDetailServiceImpl.java
@@ -59,6 +59,7 @@ public class EasOutInBillDetailServiceImpl extends ServiceImpl<EasOutInBillDetai
     */
    @Override
    public CommonPage<EasOutInBillDetail> page(EasOutInBillDetailVO params) {
+        params.setSize(500);
        Page<EasOutInBillDetail> result = easOutInBillDetailMapper.selectPage(new Page<>(params.getPage(), params.getSize()), new QueryWrapper<EasOutInBillDetail>()
                .lambda()
                .eq(ObjectUtil.isNotEmpty(params), EasOutInBillDetail::getDjid, params.getDjid())
@@ -253,7 +254,6 @@ public class EasOutInBillDetailServiceImpl extends ServiceImpl<EasOutInBillDetai
    /**
     * 自动审核
     */
-    @Async("taskExecutor")
    public void auditBills(String id) {
        List<EasOutInBillDetail> easOutInBillDetailList = easOutInBillDetailMapper
                .selectList(new LambdaQueryWrapper<EasOutInBillDetail>().eq(EasOutInBillDetail::getDjid, id));
--- a/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/EasOutInBillServiceImpl.java
+++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/EasOutInBillServiceImpl.java
@@ -680,10 +680,10 @@ public class EasOutInBillServiceImpl extends ServiceImpl<EasOutInBillMapper, Eas

    private void updateBills(EasOutInBillDto bill, String msg) {
        UpdateWrapper<EasOutInBill> updateWrapper = new UpdateWrapper<EasOutInBill>().set("update_id", SecurityUtils.getCurrentUserId()).set("update_name", SecurityUtils.getCurrentNickName()).set("update_time", DateUtil.format(DateUtil.beginOfDay(DateUtil.date()), "yyyy-MM-dd")).eq("djid", bill.getBillId());
-        if (StringUtils.isNotBlank(msg)) {
-            updateWrapper.set("djzt", "审核");
-        } else {
+        if (StringUtils.isNoneBlank(msg)) {
            updateWrapper.set("shjg", msg);
+        } else {
+            updateWrapper.set("djzt", "审核");
        }
        updateWrapper.set("update_id",SecurityUtils.getCurrentUsername());
        updateWrapper.set("update_name",SecurityUtils.getCurrentNickName());
--- a/nlsso-server/src/main/resources/config/application-dev.yml
+++ b/nlsso-server/src/main/resources/config/application-dev.yml
@@ -10,7 +10,7 @@ spring:
      datasource:
        mysql:
          driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-          url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:nl_sq_wms_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+          url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:nl_sq_wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
          username: ${DB_USER:root}
          password: ${DB_PWD:123456}
          type: com.alibaba.druid.pool.DruidDataSource
--- a/nlsso-server/src/main/resources/config/application-devLocal.yml
+++ b/nlsso-server/src/main/resources/config/application-devLocal.yml
@@ -1,5 +1,5 @@
 server:
-  port: 8012
+  port: 8011
 #配置数据源
 spring:
  autoconfigure:
@@ -11,31 +11,32 @@ spring:
        mysql:
          driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
          url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:nl_sq_wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
-          username: ${DB_USER:generallu}
+          username: ${DB_USER:root}
          password: ${DB_PWD:123456}
          type: com.alibaba.druid.pool.DruidDataSource
        mysql_srm:
+          #          driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
+          #          url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:nl_sq_wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+          #          username: ${DB_USER:wms_third}
+          #          password: ${DB_PWD:NOBLElift@!#wms}
+          #          type: com.alibaba.druid.pool.DruidDataSource
          driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-          url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:nl_sq_wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+          url: jdbc:log4jdbc:mysql://${DB_HOST:10.10.188.32}:${DB_PORT:3306}/${DB_NAME:nuoli_v1.0}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
          username: ${DB_USER:wms_third}
-          password: ${DB_PWD:NOBLElift@!#wms}
+          password: ${DB_PWD:NOBLElift@#wms}
          type: com.alibaba.druid.pool.DruidDataSource
-        #          driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-        #          url: jdbc:log4jdbc:mysql://${DB_HOST:10.10.188.30}:${DB_PORT:3306}/${DB_NAME:nuoli_v1.0}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
-        #          username: ${DB_USER:wms_third}
-        #          password: ${DB_PWD:NOBLElift@!#wms}
-        #          type: com.alibaba.druid.pool.DruidDataSource
        oracle_eas:
          driver-class-name: oracle.jdbc.OracleDriver
-          url: jdbc:oracle:thin:@localhost:1521:orcl
-          username: ${DB_USER:user1}
-          password: ${DB_PWD:Noble12319}
+          url: jdbc:oracle:thin:@192.168.100.98:1521:orcl
+          username: ${DB_USER:stuser}
+          password: ${DB_PWD:stuser123}
+          type: com.alibaba.druid.pool.DruidDataSource
+        sqlserver:
+          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+          url: jdbc:sqlserver://10.93.41.2\WINCC;DatabaseName=马钢_RH
+          username: ${DB_USER:sa}
+          password: ${DB_PWD:123}
          type: com.alibaba.druid.pool.DruidDataSource
-  #          driver-class-name: oracle.jdbc.OracleDriver
-  #          url: jdbc:oracle:thin:@192.168.100.97:1521:orcl
-  #          username: ${DB_USER:stuser}
-  #          password: ${DB_PWD:stuser123}
-  #          type: com.alibaba.druid.pool.DruidDataSource
  redis:
    #数据库索引
    host: ${REDIS_HOST:127.0.0.1}
@@ -46,14 +47,12 @@ spring:
        threads: 4
        nettyThreads: 4
        singleServerConfig:
-          database: 3
+          database: 15
          connectionMinimumIdleSize: 8
          connectionPoolSize: 8
          address: redis://127.0.0.1:6379
          idleConnectionTimeout: 10000
          timeout: 3000
-
-
 # 登录相关配置
 login:
  # 登录缓存
@@ -72,23 +71,48 @@ login:
    heigth: 36
    # 内容长度
    length: 2
-    # 字体名称，为空则使用默认字体
+    # 字体名称，为空则使用默认字体，如遇到线上乱码，设置其他字体即可
    font-name:
    # 字体大小
    font-size: 25

-#是否允许生成代码，生产环境设置为false
-generator:
-  enabled: true
-
-#是否开启 swagger-ui
-swagger:
-  enabled: true
+#jwt
+jwt:
+  header: Authorization
+  # 令牌前缀
+  token-start-with: Bearer
+  # 必须使用最少88位的Base64对该令牌进行编码
+  base64-secret: ZmQ0ZGI5NjQ0MDQwY2I4MjMxY2Y3ZmI3MjdhN2ZmMjNhODViOTg1ZGE0NTBjMGM4NDA5NzYxMjdjOWMwYWRmZTBlZjlhNGY3ZTg4Y2U3YTE1ODVkZDU5Y2Y3OGYwZWE1NzUzNWQ2YjFjZDc0NGMxZWU2MmQ3MjY1NzJmNTE0MzI=
+  # 令牌过期时间 此处单位/毫秒 ，默认2小时，可在此网站生成 https://www.convertworld.com/zh-hans/time/milliseconds.html
+  token-validity-in-seconds: 7200000
+  # 在线用户key
+  online-key: online-token-
+  # 验证码
+  code-key: code-key-
+  # token 续期检查时间范围（默认30分钟，单位默认毫秒），在token即将过期的一段时间内用户操作了，则给用户的token续期
+  detect: 1800000
+  # 续期时间范围，默认 1小时，这里单位毫秒
+  renew: 3600000

 # IP 本地解析
 ip:
  local-parsing: true

+#是否允许生成代码，生产环境设置为false
+generator:
+  enabled: false
+
+#如果生产环境要开启swagger，需要配置请求地址
+#springfox:
+#  documentation:
+#    swagger:
+#      v2:
+#        host: # 接口域名或外网ip
+
+#是否开启 swagger-ui
+swagger:
+  enabled: false
+
 # 文件存储路径
 file:
  mac:
@@ -105,7 +129,7 @@ file:
  avatarMaxSize: 5
 logging:
  file:
-    path: C:\log\wms
+    path: /app/jar/logs
  config: classpath:logback-spring.xml

 # Sa-Token配置
@@ -134,6 +158,7 @@ sa-token:
    allow-url: "*"
    # 是否打开单点注销功能
    is-slo: true
+
    # ------- SSO-模式三相关配置 （下面的配置在SSO模式三并且 is-slo=true 时打开）
    # 是否打开模式三
    isHttp: true
@@ -146,7 +171,7 @@ sa-token:
  token-session-check-login: false
  alone-redis:
    # Redis数据库索引（默认为0）
-    database: 1
+    database: 9
    # Redis服务器地址
    host: 127.0.0.1
    # Redis服务器连接端口
--- a/nlsso-server/src/main/resources/config/application.yml
+++ b/nlsso-server/src/main/resources/config/application.yml
@@ -4,7 +4,7 @@ server:
    relaxed-path-chars: [ '|','{','}','[',']' ]  #字符问题： https://blog.csdn.net/weixin_41996632/article/details/90715118
 spring:
  profiles:
-    active: prod
+    active: devLocal
  datasource:
    druid:
      initial-size: 5 #初始化时建立物理连接的个数
@@ -201,15 +201,17 @@ easConfig:
  dataType: EAS_NOBLE
  deleteTask: 86400000
 srmConfig:
-  host: http://10.10.188.31:8080/nuoli-srm/wmsBaseApi/receiveWmsInWhOrderAck
+  inOutHost: http://10.10.188.31:8080/nuoli-srm/wmsBaseApi/receiveWmsInWhOrderAck
+  host: http://10.10.188.31:8080/nuoli-srm/wmsBaseApi/receiveWmsInRecOrderAck
 #easConfig:
-#  host: http://192.168.100.100:8080//ormrpc/services/
+#  host: http://192.168.100.100:8080/ormrpc/services/
 #  user: user
 #  password: Noble123!9
-#  datacenter: test
+#  datacenter: test2024
 #  wsdlService: WSNLMESFacade
 #  operationName: dealTask
 #  syncInfo: 30000
 #  deleteInfo: 30000
 #srmConfig:
-#  host: http://10.10.188.30:8080/nuoli-srm/wmsBaseApi/receiveWmsInWhOrderAck
+#  inOutHost: http://10.10.188.30:8080/nuoli-srm/wmsBaseApi/receiveWmsInWhOrderAck
+#  host: http://10.10.188.30:8080/nuoli-srm/wmsBaseApi/receiveWmsInRecOrderAck