1.修改物料查询模糊查询条件。

2.修改出入箱扫码异常状态判断。

mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/rest/CacheLineHandController.java

@@ -44,8 +44,17 @@ public class CacheLineHandController{
      @Log("物料查询")
      @ApiOperation("物料查询")
      public CommonResult<List<MaterialDto>> materialQuery(@RequestBody JSONObject form) {
+          String params = form.getString("search_bar");
+          //任务类型和任务ID校验，instruct_uuid为前端参数命名，本来应为task_id
+          if(StringUtils.isNotEmpty(params)) {
+               //限制查询参数过短，模糊力度大
+               int length = params.length();
+               if(length < 3) {
+                    throw new BizCoreException("您输入的条件匹配的范围太大，请重新输入稍长一点的内容。");
+               }
+          }
           log.info("海亮缓存线手持服务 [查询物料] 接口被请求, 请求参数-{}", form);
-          return RestBusinessTemplate.execute(() -> cacheLineHandService.materialQuery(form.getString("search_bar")));
+          return RestBusinessTemplate.execute(() -> cacheLineHandService.materialQuery(params));
      }
 
      @PostMapping("/queryMaterial")
@@ -160,6 +169,10 @@ public class CacheLineHandController{
      @ApiOperation("空箱初始化--出入空箱")
      public CommonResult<String> inOutEmptyBox(@RequestBody JSONObject param) {
           log.info("海亮缓存线手持服务 [空箱初始化--出入空箱] 接口被请求, 请求参数-{}", param);
+          //参数校验
+          if(StringUtils.isEmpty(param.getString("inOut_type")) || StringUtils.isEmpty(param.getString("wcsdevice_code")) || StringUtils.isEmpty(param.getString("vehicle_code"))) {
+               throw new BizCoreException(ResultCode.MISS_PARAMETER);
+          }
           return RestBusinessTemplate.execute(() -> cacheLineHandService.inOutEmptyBox(param));
      }
 
@@ -167,7 +180,7 @@ public class CacheLineHandController{
      @Log("缓存线出入箱异常指令查询")
      @ApiOperation("缓存线出入箱异常指令查询")
      public CommonResult<JSONArray> inOutExceptionInstQuery(@RequestBody JSONObject param) {
-          log.info("海亮缓存线手持服务 [缓存线出入箱异常指令查询] 接口被请求, 请求参数-{}", param);
+          log.info("海亮缓存线手持服务 [缓存线出入箱异常指令查询] 接口被·请求, 请求参数-{}", param);
           return RestBusinessTemplate.execute(() -> cacheLineHandService.inOutExceptionInstQuery(param));
      }
 
@@ -176,6 +189,10 @@ public class CacheLineHandController{
      @ApiOperation("缓存线出入箱异常指令确认")
      public CommonResult<String> inOutExceptionInstConfirm(@RequestBody JSONObject param) {
           log.info("海亮缓存线手持服务 [缓存线出入箱异常指令确认] 接口被请求, 请求参数-{}", param);
+          //参数校验
+          if(StringUtils.isEmpty(param.getString("instruct_uuid")) || StringUtils.isEmpty(param.getString("inOut_type")) || StringUtils.isEmpty(param.getString("wcsdevice_code")) || StringUtils.isEmpty(param.getString("vehicle_code"))) {
+               throw new BizCoreException(ResultCode.MISS_PARAMETER);
+          }
           return RestBusinessTemplate.execute(() -> cacheLineHandService.inOutExceptionInstConfirm(param));
      }
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/service/impl/CacheLineHandServiceImpl.java

@@ -73,6 +73,9 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
           //          stopWatch.start();
           //          stopWatch.stop();
           //          System.out.println("缓存本地花费时间 totalTime = " + stopWatch.getTotalTimeMillis());
+          if(StringUtils.isEmpty(param)) {
+               return WQL.getWO("PDA_QUERY").addParam("flag", "6").addParam("condition", param).process().getResultJSONArray(0).toJavaList(MaterialDto.class);
+          }
           List<MaterialDto> materialList;
           ThreadPoolExecutor pool = ThreadPoolExecutorUtil.getPoll();
           //12W种物料信息，查本地缓存
@@ -83,7 +86,7 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
           //2.查reids
           materialList = redisUtils.get("materialList", MaterialDto.class);
           if(null != materialList) {
-               //设置本地缓存
+               //               //设置本地缓存
                cache.setLocalCache("materialList", materialList);
                return getMaterialDto(materialList, param);
           }
@@ -112,7 +115,7 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
      private List<MaterialDto> getMaterialDto(List<MaterialDto> materialList, String param) {
           if(StringUtils.isNotEmpty(param)) {
                //按条件搜索
-               materialList = materialList.stream().filter(m -> (m.getMaterial_name().contains(param)) || m.getMaterial_code().contains(param) || m.getMaterial_spec().contains(param) || m.getClass_name().contains(param)).collect(Collectors.toList());
+               materialList = materialList.stream().filter(m -> (m.getMaterial_name().indexOf(param) > -1) || (m.getMaterial_code().indexOf(param)) > -1 || (m.getMaterial_spec().indexOf(param)) > -1).collect(Collectors.toList());
                return materialList;
           }
           return materialList;
@@ -445,7 +448,7 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
                     throw new BadRequestException("箱子【" + vehicle_code + "】已在库内，无法入空箱！");
                }
                // 3.判断是否可以放入空箱子
-               JSONObject json = positionTab.query("cacheLine_code = '" + cacheLine_code +"position_code = '" + position_code + "' and is_blank= '1'").uniqueResult(0);
+               JSONObject json = positionTab.query("cacheLine_code = '" + cacheLine_code + "position_code = '" + position_code + "' and is_blank= '1'").uniqueResult(0);
                if(json == null) {
                     throw new BadRequestException("无法找到缓存线【" + position_code + "】的空位，无法入空箱！");
                }
@@ -481,53 +484,52 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
       */
      @Override
      public JSONArray inOutExceptionInstQuery(JSONObject param) {
-          // 1 扫码异常-入箱扫码 2 扫码异常-出箱扫码
-          // 出入类型 inOut_type
-          // 缓存线编码 wcsdevice_code
-          // 料箱码 vehicle_code
-          // {"inOut_type":"1","wcsdevice_code":"HCX01","vehicle_code":"10001"}
+          //料箱号
           String vehicle_code = param.getString("vehicle_code");
+          //缓存线编号
           String wcsdevice_code = param.getString("wcsdevice_code");
+          //出入箱类型
           String inOut_type = param.getString("inOut_type");
+          //任务表信息
           WQLObject instructTab = WQLObject.getWQLObject("sch_base_task");
           JSONArray result = new JSONArray();
           // 入箱扫码异常
           if("1".equals(inOut_type)) {
-               String where = "point_code2 = '" + wcsdevice_code + "' and instruct_status <> '06'";
+               String where = "point_code2 = '" + wcsdevice_code + "' and task_status <> '7'";
                if(StringUtils.isNotBlank(vehicle_code)) {
-                    where = "point_code2 = '" + wcsdevice_code + "' and invehicle_code = '" + vehicle_code + "' and instruct_status <> '06'";
+                    where = "point_code2 = '" + wcsdevice_code + "' and vehicle_code = '" + vehicle_code + "' and task_status <> '7'";
                }
                JSONArray arr = instructTab.query(where).getResultJSONArray(0);
                for(int i = 0; i < arr.size(); i++) {
                     JSONObject row = arr.getJSONObject(i);
                     JSONObject json = new JSONObject();
                     json.put("instruct_uuid", row.getString("task_id"));
-                    json.put("instructorder_no", row.getString("instructorder_no"));
+                    json.put("instructorder_no", row.getString("task_code"));
                     json.put("wcsdevice_code", row.getString("point_code2"));
-                    json.put("vehicle_code", row.getString("invehicle_code"));
-                    json.put("startpoint_code", row.getString("startpoint_code"));
-                    json.put("nextpoint_code", row.getString("nextpoint_code"));
-                    json.put("nextpoint_code2", row.getString("nextpoint_code2"));
+                    json.put("vehicle_code", row.getString("vehicle_code"));
+                    json.put("startpoint_code", row.getString("point_code1"));
+                    json.put("nextpoint_code", row.getString("point_code2"));
+                    json.put("nextpoint_code2", row.getString("point_code3"));
                     result.add(json);
                }
           }
           // 出箱扫码异常
           if("2".equals(inOut_type)) {
-               String where = "startwcsdevice_code = '" + wcsdevice_code + "' and instruct_status <> '06'";
+               String where = "point_code1 = '" + wcsdevice_code + "' and task_status <> '7'";
                if(StringUtils.isNotBlank(vehicle_code)) {
-                    where = "startwcsdevice_code = '" + wcsdevice_code + "' and outvehicle_code = '" + vehicle_code + "' and instruct_status <> '06'";
+                    where = "point_code1 = '" + wcsdevice_code + "' and vehicle_code = '" + vehicle_code + "' and task_status <> '7'";
                }
                JSONArray arr = instructTab.query(where).getResultJSONArray(0);
                for(int i = 0; i < arr.size(); i++) {
                     JSONObject row = arr.getJSONObject(i);
                     JSONObject json = new JSONObject();
                     json.put("instruct_uuid", row.getString("task_id"));
-                    json.put("instructorder_no", row.getString("instructorder_no"));
-                    json.put("vehicle_code", row.getString("outvehicle_code"));
-                    json.put("wcsdevice_code", row.getString("startwcsdevice_code"));
-                    json.put("startpoint_code", row.getString("startpoint_code"));
-                    json.put("nextpoint_code", row.getString("nextpoint_code"));
-                    json.put("nextpoint_code2", row.getString("nextpoint_code2"));
+                    json.put("instructorder_no", row.getString("task_code"));
+                    json.put("vehicle_code", row.getString("vehicle_code"));
+                    json.put("wcsdevice_code", row.getString("point_code1"));
+                    json.put("startpoint_code", row.getString("point_code1"));
+                    json.put("nextpoint_code", row.getString("point_code2"));
+                    json.put("nextpoint_code2", row.getString("point_code3"));
                     result.add(json);
                }
           }
@@ -551,7 +553,7 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
           String position_code = param.getString("position_code");
           //载具编码
           String vehicle_code = param.getString("vehicle_code");
-          // 封装给wcs的数据
+          // 封装给acs的数据
           JSONArray jsonArray = new JSONArray();
           JSONObject jsonObject = new JSONObject();
           jsonObject.put("inOut_type", inOut_type);
@@ -713,7 +715,7 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
           WQLObject instructTab = WQLObject.getWQLObject("sch_base_task");
           String where = "point_code2 = '" + wcsdevice_code + "' and vehicle_code = '" + vehicle_code + "' and task_status <> '7'";
           if(StringUtils.isEmpty(vehicle_code)) {
-               where = "point_code2 = '" + wcsdevice_code + "' and instruct_status <> '7'";
+               where = "point_code2 = '" + wcsdevice_code + "' and task_status <> '7'";
           }
           JSONArray arr = instructTab.query(where).getResultJSONArray(0);
           JSONArray result = new JSONArray();
@@ -721,11 +723,11 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
                JSONObject row = arr.getJSONObject(i);
                JSONObject json = new JSONObject();
                json.put("instruct_uuid", row.getString("task_id"));
-               json.put("instructorder_no", row.getString("instructorder_no"));
+               json.put("instructorder_no", row.getString("task_code"));
                json.put("wcsdevice_code", row.getString("point_code2"));
-               json.put("startpoint_code", row.getString("startpoint_code"));
-               json.put("nextpoint_code", row.getString("nextpoint_code"));
-               json.put("nextpoint_code2", row.getString("nextpoint_code2"));
+               json.put("point_code1", row.getString("point_code1"));
+               json.put("nextpoint_code", row.getString("point_code2"));
+               json.put("nextpoint_code2", row.getString("point_code3"));
                result.add(json);
           }
           return result;
@@ -767,22 +769,22 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
           JSONArray arr;
           WQLObject instructTab = WQLObject.getWQLObject("sch_base_task");
           if(StringUtils.isEmpty(vehicle_code)) {
-               arr = instructTab.query("startwcsdevice_code = '" + wcsdevice_code + "'  and instruct_status <> '06'").getResultJSONArray(0);
+               arr = instructTab.query("point_code1 = '" + wcsdevice_code + "'  and task_status <> '7'").getResultJSONArray(0);
           }
           else{
-               arr = instructTab.query("startwcsdevice_code = '" + wcsdevice_code + "' and outvehicle_code = '" + vehicle_code + "' and instruct_status <> '06'").getResultJSONArray(0);
+               arr = instructTab.query("point_code1 = '" + wcsdevice_code + "' and vehicle_code = '" + vehicle_code + "' and task_status <> '7'").getResultJSONArray(0);
           }
           JSONArray result = new JSONArray();
           for(int i = 0; i < arr.size(); i++) {
                JSONObject row = arr.getJSONObject(i);
                JSONObject json = new JSONObject();
                json.put("instruct_uuid", row.getString("task_id"));
-               json.put("instructorder_no", row.getString("instructorder_no"));
-               json.put("wcsdevice_code", row.getString("startwcsdevice_code"));
-               json.put("vehicle_code", row.getString("outvehicle_code"));
-               json.put("startpoint_code", row.getString("startpoint_code"));
-               json.put("nextpoint_code", row.getString("nextpoint_code"));
-               json.put("nextpoint_code2", row.getString("nextpoint_code2"));
+               json.put("instructorder_no", row.getString("task_code"));
+               json.put("wcsdevice_code", row.getString("point_code1"));
+               json.put("vehicle_code", row.getString("vehicle_code"));
+               json.put("startpoint_code", row.getString("point_code1"));
+               json.put("nextpoint_code", row.getString("point_code2"));
+               json.put("nextpoint_code2", row.getString("point_code3"));
                result.add(json);
           }
           return result;

mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/wql/PDA_QUERY.wql

@@ -148,6 +148,9 @@
                         	LEFT JOIN MD_PB_ClassStandard class ON class.class_id = mb.material_type_id
                         WHERE
                         	mb.is_delete = '0'
+                        ORDER BY
+                        	mb.material_id desc
+                        	LIMIT 1000
                         OPTION 输入.condition <> ""
                             mb.material_name LIKE CONCAT ('%', 输入.condition, '%')
                             OR mb.material_code LIKE CONCAT ('%', 输入.condition, '%')

mes/hd/nladmin-system/src/main/resources/config/application-dev1.yml

@@ -0,0 +1,201 @@
+server:
+  port: 8011
+#配置数据源
+spring:
+  data:
+    elasticsearch:
+      repositories:
+        enabled: true
+      client:
+        reactive:
+          #endpoints: 172.31.185.110:9200,172.31.154.9:9200 #内网
+          #          endpoints: 47.96.133.178:8200 #外网
+          endpoints: http://47.96.133.178:8200 #外网
+  elasticsearch:
+    rest:
+      #uris: 172.31.185.110:9200,172.31.154.9:9200 #内网
+      #      uris: 47.96.133.178:8200 #外网
+      uris: http://47.96.133.178:8200 #外网
+      username: elastic
+      password: 123456
+  datasource:
+    druid:
+      db-type: com.alibaba.druid.pool.DruidDataSource
+      driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
+      url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
+      #url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
+      username: ${DB_USER:shenhua}
+      #password: ${DB_PWD:P@ssw0rd}
+      #password: ${DB_PWD:root}
+      #password: ${DB_PWD:Root.123456}
+      password: ${DB_PWD:123456789}
+      # 初始连接数
+      initial-size: 5
+      # 最小连接数
+      min-idle: 15
+      # 最大连接数
+      max-active: 30
+      # 是否自动回收超时连接
+      remove-abandoned: true
+      # 超时时间(以秒数为单位)
+      remove-abandoned-timeout: 180
+      # 获取连接超时时间
+      max-wait: 3000
+      # 连接有效性检测时间
+      time-between-eviction-runs-millis: 60000
+      # 连接在池中最小生存的时间
+      min-evictable-idle-time-millis: 300000
+      # 连接在池中最大生存的时间
+      max-evictable-idle-time-millis: 900000
+      # 指明连接是否被空闲连接回收器(如果有)进行检验.如果检测失败,则连接将被从池中去除
+      test-while-idle: true
+      # 指明是否在从池中取出连接前进行检验,如果检验失败, 则从池中去除连接并尝试取出另一个
+      test-on-borrow: true
+      # 是否在归还到池中前进行检验
+      test-on-return: false
+      # 检测连接是否有效
+      validation-query: select 1
+      # 配置监控统计
+      webStatFilter:
+        enabled: true
+      stat-view-servlet:
+        enabled: true
+        url-pattern: /druid/*
+        reset-enable: false
+      filters:
+        DruidFilter,stat
+
+  redis:
+    #数据库索引
+    database: ${REDIS_DB:1}
+    #host: ${REDIS_HOST:127.0.0.1}
+    host: ${REDIS_HOST:localhost}
+    port: ${REDIS_PORT:6379}
+    password: ${REDIS_PWD:}
+    #连接超时时间
+    timeout: 5000
+    redisson:
+      config: |
+        threads: 4
+        nettyThreads: 4
+        singleServerConfig:
+          connectionMinimumIdleSize: 8
+          connectionPoolSize: 8
+          address: redis://127.0.0.1:6379
+          idleConnectionTimeout: 10000
+          timeout: 3000
+# 登录相关配置
+login:
+  # 登录缓存
+  cache-enable: true
+  #  是否限制单用户登录
+  single-login: false
+  #  验证码
+  login-code:
+    #  验证码类型配置 查看 LoginProperties 类
+    code-type: arithmetic
+    #  登录图形验证码有效时间/分钟
+    expiration: 2
+    #  验证码高度
+    width: 111
+    #  验证码宽度
+    heigth: 36
+    # 内容长度
+    length: 2
+    # 字体名称，为空则使用默认字体
+    font-name:
+    # 字体大小
+    font-size: 25
+
+#jwt
+jwt:
+  header: Authorization
+  # 令牌前缀
+  token-start-with: Bearer
+  # 必须使用最少88位的Base64对该令牌进行编码
+  base64-secret: ZmQ0ZGI5NjQ0MDQwY2I4MjMxY2Y3ZmI3MjdhN2ZmMjNhODViOTg1ZGE0NTBjMGM4NDA5NzYxMjdjOWMwYWRmZTBlZjlhNGY3ZTg4Y2U3YTE1ODVkZDU5Y2Y3OGYwZWE1NzUzNWQ2YjFjZDc0NGMxZWU2MmQ3MjY1NzJmNTE0MzI=
+  # 令牌过期时间 此处单位/毫秒 ，默认4小时，可在此网站生成 https://www.convertworld.com/zh-hans/time/milliseconds.html
+  token-validity-in-seconds: 14400000
+  # 在线用户key
+  online-key: online-token-
+  # 验证码
+  code-key: code-key-
+  # token 续期检查时间范围（默认30分钟，单位毫秒），在token即将过期的一段时间内用户操作了，则给用户的token续期
+  detect: 1800000
+  # 续期时间范围，默认1小时，单位毫秒
+  renew: 3600000
+
+#是否允许生成代码，生产环境设置为false
+generator:
+  enabled: true
+
+#是否开启 swagger-ui
+swagger:
+  enabled: true
+
+# IP 本地解析
+ip:
+  local-parsing: true
+
+# 文件存储路径
+file:
+  mac:
+    path: ~/file/
+    avatar: ~/avatar/
+  linux:
+    path: /home/eladmin/file/
+    avatar: /home/eladmin/avatar/
+  windows:
+    path: C:\eladmin\file\
+    avatar: C:\eladmin\avatar\
+  # 文件大小 /M
+  maxSize: 100
+  avatarMaxSize: 5
+
+sa-token:
+  # token 名称 (同时也是cookie名称)
+  token-name: Authorization
+  # token 有效期，单位s 默认30天, -1代表永不过期
+  timeout: 2592000
+  # token 临时有效期 (指定时间内无操作就视为token过期) 单位: 秒
+  activity-timeout: -1
+  # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录)
+  is-concurrent: true
+  # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token)
+  is-share: false
+  # token风格
+  token-style: random-128
+  # 是否输出操作日志
+  is-log: false
+  jwt-secret-key: opsjajisdnnca0sdkksdfaaasdfwwq
+  # token 前缀
+  token-prefix:
+  cookie:
+    # 配置 Cookie 作用域:根据二级域名实现sso登入如lms.sso.com;acs.sso.com
+    domain:
+
+#jetcache:
+#  defaultCacheType: LOCAL
+#  statIntervalMinutes: 15
+#  areaInCacheName: false
+#  hiddenPackages: com.yb
+#  local:
+#    default:
+#      type: caffeine
+#      limit: 100
+#      keyConvertor: fastjson
+#      expireAfterWriteInMillis: 60000
+#  remote:
+#    default:
+#      type: redis.lettuce
+#      keyConvertor: fastjson
+#      valueEncoder: kryo
+#      valueDecoder: kryo
+#      poolConfig:
+#        minIdle: 5
+#        maxIdle: 200
+#        maxTotal: 1000
+#      uri:
+#        - redis://127.0.0.1:6379
+es:
+  index: mes_log

mes/hd/nladmin-system/src/main/resources/config/application.yml

@@ -43,7 +43,7 @@ rsa:
   private_key: MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8mp0f3FE0GYP3AYPaJF7jUd1M0XxFSE2ceK3k2kw20YvQ09NJKk+OMjWQl9WitG9pB6tSCQIDAQABAkA2SimBrWC2/wvauBuYqjCFwLvYiRYqZKThUS3MZlebXJiLB+Ue/gUifAAKIg1avttUZsHBHrop4qfJCwAI0+YRAiEA+W3NK/RaXtnRqmoUUkb59zsZUBLpvZgQPfj1MhyHDz0CIQDYhsAhPJ3mgS64NbUZmGWuuNKp5coY2GIj/zYDMJp6vQIgUueLFXv/eZ1ekgz2Oi67MNCk5jeTF2BurZqNLR3MSmUCIFT3Q6uHMtsB9Eha4u7hS31tj1UWE+D+ADzp59MGnoftAiBeHT7gDMuqeJHPL4b+kC+gzV4FGTfhR9q3tTbklZkD2A==
 logging:
   file:
-    path: E:\logs\nlwms\
+    path: C:\logs\nlwms\
 demo:
   monitor:
     server-url: https://www.demo-monitor.com