zwl
2025-03-07 108f71eb67f903494630b2b774949686fa5f1a2f
初始化
6个文件已修改
85 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/entity/param/StorageEscalationParam.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/common/utils/HttpHandler.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/wcs/js/console.map.js 64 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/realtimeWatch/console.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/param/StorageEscalationParam.java
@@ -1,13 +1,17 @@
package com.zy.asrs.entity.param;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
@Data
public class StorageEscalationParam {
    //托盘码
    @JSONField(name="BoxNo")
    private String BoxNo;
    //执行状态   0:成功 1:失败
    @JSONField(name="WCSStatus")
    private Integer WCSStatus=0;
    //错误信息   具体的错误信息(超高,超重等)
    @JSONField(name="WCSErrorMessage")
    private String WCSErrorMessage="";
}
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -176,7 +176,12 @@
                        String response = "";
                        Boolean success = false;
                        try {
                            response = new HttpHandler.Builder().setUri(wmsUrl).setPath(inboundTaskApplyPath).setJson(JSON.toJSONString(storageEscalationParam)).build().doPost();
                            response = new HttpHandler.Builder()
                                    .setUri(wmsUrl)
                                    .setPath(inboundTaskApplyPath)
                                    .setJson(JSON.toJSONString(storageEscalationParam))
                                    .build()
                                    .doPost();
                            JSONObject jsonObject = JSON.parseObject(response);
                            if (back) {
                                MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
@@ -1381,7 +1386,7 @@
        LocMast locMast = locMastService.selectByLocNo(locNo);
        taskWrk.setCrnNo(locMast.getCrnNo());
        taskWrk.setTargetPoint(locNo);
        taskWrk.setStartPoint("116");
        taskWrk.setStartPoint("15");
        if (result.getAlley().equals("1")) {
            taskWrk.setCrnNo(1);
        } else {
src/main/java/com/zy/common/utils/HttpHandler.java
@@ -74,12 +74,12 @@
            }
            FormBody body = builder.build();
            request = headerBuilder
                    .url((https?"https://":"http://")+uri+path)
                    .url((https?"https://":"https://")+uri+path)
                    .post(body)
                    .build();
        } else {
            RequestBody body = RequestBody.create(MEDIA_TYPE, json);
            Request.Builder builder = headerBuilder.url((https?"https://":"http://")+uri+path);
            Request.Builder builder = headerBuilder.url((https?"https://":"https://")+uri+path);
            builder.header("Content-Type", "application/json");
            request = builder.post(body).build();
src/main/resources/application.yml
@@ -50,7 +50,7 @@
  #url: 10.32.53.195:8080
  # WMS系统ip
  #  url: 10.210.157.109:8090
  url: 10.197.22.245:8000
  url: https://wl.cicojc.com
  # 入库任务申请接口
  #inboundTaskApplyPath: api/InterFace/inboundTaskApply
  inboundTaskApplyPath: api/zmdms-zt56Wms-core/api/wcs/AcceptTaskStatus
src/main/webapp/static/wcs/js/console.map.js
@@ -251,8 +251,8 @@
            "height": 672,
            "stns": [{
                "type": "stn",
                "id": "site-016",
                "text": "016",
                "id": "site-16",
                "text": "16",
                "top": 457,
                "left": 239,
                "width": 69,
@@ -275,120 +275,120 @@
                "height": 569
            }, {
                "type": "stn",
                "id": "site-015",
                "text": "015",
                "id": "site-15",
                "text": "15",
                "top": 95,
                "left": 310,
                "width": 100,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-014",
                "text": "014",
                "id": "site-14",
                "text": "14",
                "top": 95,
                "left": 412,
                "width": 92,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-013",
                "text": "013",
                "id": "site-13",
                "text": "13",
                "top": 117,
                "left": 412,
                "width": 92,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-012",
                "text": "012",
                "id": "site-12",
                "text": "12",
                "top": 139,
                "left": 412,
                "width": 92,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-011",
                "text": "011",
                "id": "site-11",
                "text": "11",
                "top": 161,
                "left": 412,
                "width": 92,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-010",
                "text": "010",
                "id": "site-10",
                "text": "10",
                "top": 183,
                "left": 412,
                "width": 92,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-009",
                "text": "009",
                "id": "site-9",
                "text": "9",
                "top": 183,
                "left": 310,
                "width": 100,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-008",
                "text": "008",
                "id": "site-8",
                "text": "8",
                "top": 228,
                "left": 310,
                "width": 100,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-007",
                "text": "007",
                "id": "site-7",
                "text": "7",
                "top": 278,
                "left": 310,
                "width": 100,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-006",
                "text": "006",
                "id": "site-6",
                "text": "6",
                "top": 344,
                "left": 310,
                "width": 100,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-005",
                "text": "005",
                "id": "site-5",
                "text": "5",
                "top": 391,
                "left": 310,
                "width": 100,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-004",
                "text": "004",
                "id": "site-4",
                "text": "4",
                "top": 457,
                "left": 310,
                "width": 100,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-003",
                "text": "003",
                "id": "site-3",
                "text": "3",
                "top": 505,
                "left": 310,
                "width": 100,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-002",
                "text": "002",
                "id": "site-2",
                "text": "2",
                "top": 571,
                "left": 310,
                "width": 100,
                "height": 20
            }, {
                "type": "stn",
                "id": "site-001",
                "text": "001",
                "id": "site-1",
                "text": "1",
                "top": 619,
                "left": 310,
                "width": 100,
src/main/webapp/views/realtimeWatch/console.html
@@ -609,7 +609,7 @@
                            siteEl.html(sites[i].siteId);
                        }
                        // RGV位置
                        if(sites[i].siteId === '112' || sites[i].siteId === '212'){
                        if(sites[i].siteId === '16' || sites[i].siteId === '212'){
                            carAnimate(Number(sites[i].siteId), Number(sites[i].nearbySta));
                        }
                    }