#

LSH

2023-06-06 663acb6ceb8175e18ada056aa15bbe062ac72f03

#

 pom.xml

@@ -106,7 +106,7 @@
    </dependencies>

    <build>
        <finalName>lktwms</finalName>
        <finalName>jtwms</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>

 src/main/java/com/zy/asrs/controller/MobileController.java

@@ -77,7 +77,7 @@

    /**
     * 根据单号检索单据数据
     * http://localhost:8081/jkwms/mobile/order/serach/orderNo/auth?orderNo=123123
     * http://localhost:8081/jtwms/mobile/order/serach/orderNo/auth?orderNo=123123
     */
//    @RequestMapping("/order/search/orderNo/auth")
//    @ManagerAuth

 src/main/java/com/zy/asrs/utils/Point.java

New file
@@ -0,0 +1,47 @@
package com.zy.asrs.utils;

import java.util.ArrayList;
import java.util.List;

public class Point {
    public double x;
    public double y;

    public Point(double x, double y) {
        this.x = x;
        this.y = y;
    }

    public double distance(Point other) {
        double dx = this.x - other.x;
        double dy = this.y - other.y;
        return Math.sqrt(dx*dx + dy*dy);
    }

    public double angle(Point other) {
        double dx = other.x - this.x;
        double dy = other.y - this.y;
        return Math.atan2(dy, dx);
    }

    public Point interpolate(Point other, double t) {
        double newX = this.x + t * (other.x - this.x);
        double newY = this.y + t * (other.y - this.y);
        return new Point(newX, newY);
    }

    public static List<Point> interpolate(Point p1, Point p2, double interval) {
        List<Point> points = new ArrayList<>();
        double distance = p1.distance(p2);
        double angle = p1.angle(p2);

        for (double t=interval/distance; t<1; t+=interval/distance) {
            Point p = p1.interpolate(p2, t);
            points.add(p);
        }

        return points;
    }
}



 src/main/java/com/zy/ints/entity/ErpDetTb.java

File was deleted

 src/main/java/com/zy/ints/entity/ErpDetTbBak.java

File was deleted

 src/main/java/com/zy/ints/entity/ErpLk.java

File was deleted

 src/main/java/com/zy/ints/entity/ErpLkBak.java

File was deleted

 src/main/java/com/zy/ints/entity/LkDetTb.java

File was deleted

 src/main/java/com/zy/ints/entity/LkDetTbBak.java

File was deleted

 src/main/java/com/zy/ints/entity/Prdt.java

File was deleted

 src/main/java/com/zy/ints/entity/PrdtBak.java

File was deleted

 src/main/java/com/zy/ints/erp/ErpDbProperties.java

File was deleted

 src/main/java/com/zy/ints/erp/ErpSqlServer.java

File was deleted

 src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java

File was deleted

 src/main/java/com/zy/ints/task/scheduler/ErpLkScheduler.java

File was deleted

 src/main/java/com/zy/ints/task/scheduler/ErpPrdtScheduler.java

File was deleted

 src/main/java/com/zy/ints/task/scheduler/ErpPrdtSchedulerNew.java

File was deleted

 src/main/java/com/zy/ints/task/scheduler/LkDetTbScheduler.java

File was deleted

 src/main/resources/application.yml

@@ -54,22 +54,6 @@
  doubleLocsLeft : 1,5,9
  # 右深库位排号
  doubleLocsRight : 4,8,12
#ERP接口
erp:
  enabled: false
  enabledNew: false
  enabledErpDetTb: false
  enabledErpPrdt: false
  #  enabled: false
  #查看ERP中间表间隔
  refreshtime: 0/5 * * * * ?
  db:
    driver_class_name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://192.168.0.13:1433;databasename=DB_2022
    username: sa
    password: Qaz@1234
  useName:
    ip: 192.168.0.13


comb:

 src/main/webapp/static/js/common.js

@@ -1,4 +1,4 @@
var baseUrl = "/lktwms";
var baseUrl = "/jtwms";

// 详情窗口-高度
var detailHeight = '80%';