rev:界面功能优化

2024-09-09 08:53:03 +08:00
parent 6a05279611
commit bee9748294
15 changed files with 280 additions and 233 deletions
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/AppRun.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/AppRun.java
@@ -3,6 +3,7 @@ package org.nl;
 import cn.dev33.satoken.annotation.SaIgnore;
 import org.dromara.dynamictp.core.spring.EnableDynamicTp;
 import org.mybatis.spring.annotation.MapperScan;
+import org.nl.common.websocket.heartSocket.clientSocket.HeartClientServer;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -15,6 +16,8 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;

+import java.net.InetSocketAddress;
+
 /**
 * 开启审计功能 -> @EnableJpaAuditing
 * https://www.cnblogs.com/niceyoo/p/10908647.html
@@ -30,7 +33,7 @@ import org.springframework.web.bind.annotation.RestController;
@ServletComponentScan
@EnableTransactionManagement
@MapperScan("org.nl.**.mapper")
-//@EnableDynamicTp
+@EnableDynamicTp
 public class AppRun implements CommandLineRunner {
    public static void main(String[] args) {
        SpringApplication.run(AppRun.class, args);
@@ -39,7 +42,7 @@ public class AppRun implements CommandLineRunner {

    @Override
    public void run(String... args) {
-//        HeartClientServer heartServer = new HeartClientServer(new InetSocketAddress("192.168.10.60", 20889));
+        HeartClientServer heartServer = new HeartClientServer(new InetSocketAddress("192.168.8.218", 20889));
        System.out.println("--------项目启动完成--------");
    }

--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/impl/diy/PassRCLHandler.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/impl/diy/PassRCLHandler.java
@@ -21,7 +21,7 @@ import java.util.stream.Stream;
 * 手动过滤XYZ排信息
 * {"y":[1,2,3,104,103,102]}
 */
-//@Service("passRCL")
+@Service("passRCL")
@Slf4j
 public class PassRCLHandler extends Decisioner<StIvtStructattr, JSONObject> {
    //现场1/4排深位
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/AbstractTask.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/AbstractTask.java
@@ -1,6 +1,7 @@
 package org.nl.wms.dispatch_manage.task.handler;


+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -31,6 +32,7 @@ public abstract class AbstractTask {
        ISchBaseTaskService taskService = SpringContextHolder.getBean(ISchBaseTaskService.class);
        taskService.update(new UpdateWrapper<SchBaseTask>()
                .set("status",data.getString("status"))
+                .set("update_time", DateUtil.now())
                .eq("task_code",data.getString("task_code")));

    }
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/OutStorageTask.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/OutStorageTask.java
@@ -180,6 +180,7 @@ public class OutStorageTask extends AbstractTask {
    @Override
    public void cancel(JSONObject data) {
        this.updateTask(data);
+        //更新起点终点状态
    }

    private static String getZdPoint(int row,String source_code) {
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/mapper/xml/SchBaseTaskMapper.xml
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/mapper/xml/SchBaseTaskMapper.xml
@@ -26,8 +26,8 @@
            <if test="whereJson.end_time != null">
                AND t.create_time <![CDATA[<=]]> #{whereJson.end_time}
            </if>
-            <if test="whereJson.begin_time != null">
-                AND t.create_time <![CDATA[>=]]> #{whereJson.begin_time}
+            <if test="whereJson.start_time != null">
+                AND t.create_time <![CDATA[>=]]> #{whereJson.start_time}
            </if>
            <if test="collect != null and collect != ''">
                AND t.status IN
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dto/SchBaseTaskQuery.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dto/SchBaseTaskQuery.java
@@ -13,7 +13,7 @@ public class SchBaseTaskQuery implements Serializable {
    private String task_code;
    private String vehicle_code;
    private String point_code;
-    private String begin_time;
+    private String start_time;
    private String end_time;
    private String more_status;
    private String unFinished;
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java
@@ -130,6 +130,9 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
    public void operation(JSONObject param) {
        String task_code = param.getString("task_code");
        SchBaseTask task = this.getOne(new QueryWrapper<SchBaseTask>().eq("task_code", task_code));
+        if (task==null){
+            return;
+        }
        if (task.getStatus().equals(StatusEnum.FORM_STATUS.code("完成"))) {
            throw new BadRequestException("当前任务已完成");
        }
@@ -194,8 +197,11 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
        String task_code = param.getString("task_code");
        String struct_code = param.getString("struct_code");
        StIvtStructattr stIvtStructattr = iStIvtStructattrService.getOne(new QueryWrapper<StIvtStructattr>().eq("struct_code", struct_code));
-        SchBaseTask task = this.getOne(new QueryWrapper<SchBaseTask>().eq("task_code", task_code));
-
+        SchBaseTask task = this.getOne(new QueryWrapper<SchBaseTask>()
+                .eq("task_code", task_code));
+        if (task == null){
+            return null;
+        }
        switch (type) {
            case "ck":
                MdPbVehicleMater vehicleCode = iMdPbVehicleMaterService.getOne(new QueryWrapper<MdPbVehicleMater>()
@@ -210,6 +216,7 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
                iStIvtStructattrService.update(new UpdateWrapper<StIvtStructattr>()
                        .set("update_time", DateUtil.now())
                        .set("vehicle_code", null)
+                        .set("lock_type", StatusEnum.LOCK.code("无锁"))
                        .set("remark", struct_code + "空出异常")
                        .eq("struct_code", struct_code));
                this.update(new UpdateWrapper<SchBaseTask>()
@@ -222,7 +229,6 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
                return rm(stIvtStructattr, task);
            case "rzd":
                JSONObject struct = rzd(stIvtStructattr, task);
-
                return struct;
            case "czd":
                moveTask(task_code, struct_code, stIvtStructattr);
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/devicemanage/DeviceManageController.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/devicemanage/DeviceManageController.java
@@ -97,7 +97,6 @@ public class DeviceManageController {
        }
        MdPbVehicleMater vehicleMater = iMdPbVehicleMaterService.getOne(new QueryWrapper<MdPbVehicleMater>()
                .eq("vehicle_code", vehicleCode)
-                 .isNull("proc_inst_id")
                .eq("is_delete", false));
        if (vehicleMater == null){
            throw new BadRequestException(String.format(vehicleCode+"载具组盘信息不存在"));
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/impl/StIvtIostorinvServiceImpl.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/impl/StIvtIostorinvServiceImpl.java
@@ -235,11 +235,16 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvOutMapp
                    .set("frozen_qty", 0)
                    .eq("is_delete", false)
                    .in("vehicle_code", Arrays.asList(split)));
+            //更新点位锁定
+            iStIvtStructattrService
+                    .update(new UpdateWrapper<StIvtStructattr>()
+                            .set("lock_type",StatusEnum.LOCK.code("无锁"))
+                            .in("vehicle_code", Arrays.asList(split))
+                    );
            iStIvtIostorinvDtlService.update(new UpdateWrapper<StIvtIostorinvdtl>()
                    .set("vehicle_code", null)
                    .set("vehicle_id", null)
                    .eq("id", form.getString("id")));
-
            this.update(new UpdateWrapper<StIvtIostorinv>()
                    .set("status", StatusEnum.FORM_STATUS.code("生成"))
                    .eq("id", form.getString("inv_id")));
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/pick/service/PickingService.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/pick/service/PickingService.java
@@ -112,6 +112,10 @@ public class PickingService {
                throw new BadRequestException("创建失败：未配置任务类型");
            }
            String outbound = data.getForm_data().getString("outbound");
+            String is_move = data.getForm_data().getString("is_move");
+            if (StringUtils.isEmpty(is_move)){
+                data.getForm_data().put("is_move","true");
+            }
            if (task_type.equals("23") && StringUtils.isEmpty(outbound)){
                throw new BadRequestException("创建失败：拣选出库未选择出库口");
            }
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/TaskScheduleService.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/TaskScheduleService.java
@@ -57,7 +57,6 @@ public class TaskScheduleService {
    public void taskPublish(){
        boolean islock = lock.tryLock();
        try {
-            log.info("111---执行定时任务:-----taskPublish-----");
            if (islock){
                //查询所有自动下发的任务
                List<SchBaseTask> list = iSchBaseTaskService.list(new QueryWrapper<SchBaseTask>().eq("is_send", true)
@@ -65,7 +64,7 @@ public class TaskScheduleService {

                if (!CollectionUtils.isEmpty(list)){
                    List<String> taskCodes = list.stream().map(SchBaseTask::getTask_code).collect(Collectors.toList());
-                    log.info("222---执行定时任务:-----taskPublish-----"+ taskCodes);
+                    log.info("---执行定时222任务:-----taskPublish-----"+ taskCodes);
                    TableDataInfo response = wmsToAcsService.interationToExt(list, "createTask");
                    if (!response.getCode().equals(String.valueOf(HttpStatus.HTTP_OK))){
                        JSONArray results = (JSONArray)JSON.toJSON(response.getData());
@@ -83,7 +82,7 @@ public class TaskScheduleService {
                    if (!CollectionUtils.isEmpty(taskCodes)){
                        iSchBaseTaskService.update(new UpdateWrapper<SchBaseTask>()
                                .set("status",StatusEnum.FORM_STATUS.code("下发"))
-                                .in("task_codse",taskCodes));
+                                .in("task_code",taskCodes));
                    }
                }
            }
--- a/wms_pro/hd/nladmin-system/src/main/resources/config/application-dev3.yml
+++ b/wms_pro/hd/nladmin-system/src/main/resources/config/application-dev3.yml
@@ -7,21 +7,21 @@ spring:
    druid:
      db-type: com.alibaba.druid.pool.DruidDataSource
      driverClassName: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://${DB_HOST:192.168.1.218}:${DB_PORT:3306}/${DB_NAME:wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
+      url: jdbc:mysql://${DB_HOST:192.168.8.218}:${DB_PORT:3306}/${DB_NAME:wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
 #      url: jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
      username: ${DB_USER:root}
      password: ${DB_PWD:123456}

      # 初始连接数
-      initial-size: 5
+      initial-size: 15
      # 最小连接数
-      min-idle: 15
+      min-idle: 25
      # 最大连接数
-      max-active: 30
+      max-active: 40
      # 是否自动回收超时连接
      remove-abandoned: true
      # 超时时间(以秒数为单位)
-      remove-abandoned-timeout: 10
+      remove-abandoned-timeout: 20
      # 获取连接超时时间
      max-wait: 9000
      # 连接有效性检测时间
--- a/wms_pro/hd/nladmin-system/src/main/resources/config/application-prod.yml
+++ b/wms_pro/hd/nladmin-system/src/main/resources/config/application-prod.yml
@@ -1,29 +1,29 @@
 server:
-  port: 8011
+  port: 8012
+  max-http-header-size: 65536
 #配置数据源
 spring:
  datasource:
    druid:
      db-type: com.alibaba.druid.pool.DruidDataSource
      driverClassName: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://${DB_HOST:192.168.46.5}:${DB_PORT:3306}/${DB_NAME:hl_one_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
-      #      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:mysql://${DB_HOST:192.168.8.218}:${DB_PORT:3306}/${DB_NAME:wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
+      url: jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
      username: ${DB_USER:root}
-      #      password: ${DB_PWD:123456}
      password: ${DB_PWD:123456}

      # 初始连接数
-      initial-size: 10
+      initial-size: 15
      # 最小连接数
-      min-idle: 10
+      min-idle: 25
      # 最大连接数
-      max-active: 100
+      max-active: 40
      # 是否自动回收超时连接
      remove-abandoned: true
      # 超时时间(以秒数为单位)
-      remove-abandoned-timeout: 180
+      remove-abandoned-timeout: 20
      # 获取连接超时时间
-      max-wait: 5000
+      max-wait: 9000
      # 连接有效性检测时间
      time-between-eviction-runs-millis: 60000
      # 连接在池中最小生存的时间
@@ -112,7 +112,6 @@ jwt:
 generator:
  enabled: true

-
 # IP 本地解析
 ip:
  local-parsing: true
@@ -150,38 +149,9 @@ sa-token:
  jwt-secret-key: opsjajisdnnca0sdkksdfaaasdfwwq
  # token 前缀
  token-prefix:
-  cookie:
-    # 配置 Cookie 作用域:根据二级域名实现sso登入如lms.sso.com;acs.sso.com
-    domain:
  is-read-cookie: false
  is-print: false
-
-#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
-schedulerFile: C:\lms\scheduler.xml
+schedulerFile: /Users/mima0000/Desktop/scheduler.xml
 lucene:
  index:
-    path:  E:\lms\lucene\index
+    path: D:\lms\lucene\index