#
pjb
2024-11-28 06cffc25e145c7a2e6e0122f6f3db8fac1db8bb1
#
5个文件已修改
20 ■■■■ 已修改文件
pom.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/domain/param/ForwardAGVTaskParam.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/common.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pom.xml
@@ -194,7 +194,7 @@
    </dependencies>
    <build>
        <finalName>gtwcs</finalName>
        <finalName>gtCrnWcs</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>
src/main/java/com/zy/asrs/domain/param/ForwardAGVTaskParam.java
@@ -9,7 +9,7 @@
    private String reqCode;
    private String reqTime;
    private String taskTyp;
    private String ctnrCode;
//    private String ctnrCode;
    private List<PositionCodePaths> positionCodePath;
    private String clientCode = "";
    private String tokenCode = "";
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1452,7 +1452,7 @@
                        SearchLocParam param = new SearchLocParam();
                        param.setIoType(10);
                        param.setSourceStaNo(emptyInSta.getStaNo());
                        param.setLocType1(locTypeDto.getLocType1());
                        param.setLocType1((short) 0);
                        String response = new HttpHandler.Builder()
                                .setUri(wmsUrl)
                                .setPath("/rpc/pakin/loc/v1")
@@ -2118,7 +2118,7 @@
        agvTaskCreateParam.setReqCode(wrkNo);
        agvTaskCreateParam.setReqTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
        agvTaskCreateParam.setTaskTyp("GT4");
        agvTaskCreateParam.setCtnrCode(param.getBarcode());
//        agvTaskCreateParam.setCtnrCode(param.getBarcode());
        agvTaskCreateParam.setPositionCodePath(agvTaskParamList);
        agvTaskCreateParam.setCtnrTyp("2");
        agvTaskCreateParam.setPriority("1");
src/main/resources/application.yml
@@ -372,35 +372,35 @@
  # LED6
  led[6]:
    id: 7
    ip: 10.10.10.106
    ip: 10.10.10.107
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 2002
  # LED6
  led[7]:
    id: 8
    ip: 10.10.10.106
    ip: 10.10.10.108
    port: 5005
    devpPlcId: ${wcs-slave.devp[1].id}
    staArr: 2011
  # LED6
  led[8]:
    id: 9
    ip: 10.10.10.106
    ip: 10.10.10.109
    port: 5005
    devpPlcId: ${wcs-slave.devp[1].id}
    staArr: 2012
  # LED6
  led[9]:
    id: 10
    ip: 10.10.10.106
    ip: 10.10.10.110
    port: 5005
    devpPlcId: ${wcs-slave.devp[1].id}
    staArr: 3011
  # LED6
  led[10]:
    id: 11
    ip: 10.10.10.106
    ip: 10.10.10.111
    port: 5005
    devpPlcId: ${wcs-slave.devp[1].id}
    staArr: 3012
src/main/webapp/static/js/common.js
@@ -1,4 +1,4 @@
var baseUrl = "/gtwcs";
var baseUrl = "/gtCrnWcs";
// 赋值
function setVal(el, val) {