初始化

zwl

昨天 16ed2e0fee6c7e99b68d02bea6a54970d1ecf081

初始化

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

@@ -121,7 +121,7 @@
            HashMap<String, Object> r = new HashMap<>();

            if (param.getStereoscopicTaskType() == 1) {
                //出库任务创建
                //入库任务创建
                StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
                        .eq("type_no", 1)
                        .eq("crn_no", locMast.getCrnNo())
@@ -173,26 +173,31 @@
                map.put("ErrorMessage", "任务类型为空！");
                return map;
            }
            String fusion = Utils.Fusion(param.getOriginalRowNo(), param.getOriginalFloorNo(), param.getOriginalColumnNo());
            param.setStartPoint(fusion);
            LocMast locMast = locMastService.selectByLocNo(param.getStartPoint());
            if (Cools.isEmpty(locMast)) {
                map.put("ReturnStatus", 1);
                map.put("ErrorMessage", "初始库位无法找到！");
                return map;
            if (param.getStereoscopicTaskType() == 2) {
                String fusion = Utils.Fusion(param.getOriginalRowNo(), param.getOriginalFloorNo(), param.getOriginalColumnNo());
                param.setStartPoint(fusion);
                LocMast locMast = locMastService.selectByLocNo(param.getStartPoint());
                if (Cools.isEmpty(locMast)) {
                    map.put("ReturnStatus", 1);
                    map.put("ErrorMessage", "初始库位无法找到！");
                    return map;
                }
            }else if (param.getStereoscopicTaskType() == 1){
                String fusion = Utils.Fusion(param.getGoalRowNo(), param.getGoalFloorNo(), param.getGoalColumnNo());
                param.setStartPoint(fusion);
            }

            HashMap<String, Object> r = new HashMap<>();

            if (param.getStereoscopicTaskType() == 2) {
            HashMap<String, Object> r = new HashMap<>();
            if (param.getStereoscopicTaskType() <= 2) {
                //出库任务创建
                StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
                        .eq("type_no", 2)
                        .eq("crn_no", locMast.getCrnNo())
                        .eq("type_no", param.getStereoscopicTaskType())
                        .eq("crn_no", 1)
                        .eq("stn_no", param.getTerminalNo()));
                if (Cools.isEmpty(staDesc)) {
                    map.put("ReturnStatus", 1);
                    map.put("ErrorMessage", "出库路劲不存在！");
                    map.put("ErrorMessage", "出入库路劲不存在！");
                    return map;
                }
                r = openService.taskCreate(new TaskCreateParam(param, staDesc.getCrnNo()));
@@ -203,7 +208,7 @@
                String fusion1 = Utils.Fusion(param.getGoalRowNo(), param.getGoalFloorNo(), param.getGoalColumnNo());
                param.setTerminalNo(fusion1);
                //移库任务创建
                r = openService.taskCreate(new TaskCreateParam(param, locMast.getCrnNo()));
                r = openService.taskCreate(new TaskCreateParam(param, 1));
                if (r.get("ReturnStatus").equals(1)) {
                    return r;
                }

 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java

@@ -96,11 +96,11 @@
        taskWrk.setIoType(param.getIoType());//任务类型
        taskWrk.setIoPri(param.getTaskPriority());//优先级
        taskWrk.setBarcode(param.getBarcode());//条码
        taskWrk.setCrnNo(locMast.getCrnNo());
        taskWrk.setCrnNo(1);
        if (param.getIoType() == 1) {
            taskWrk.setWrkSts(1);
            if (!Cools.isEmpty(param.getTargetPoint())) {
                taskWrk.setTargetPoint(Utils.getWcsLocNo(param.getTargetPoint()));//终点
                taskWrk.setTargetPoint(param.getStartPoint());//终点
                taskWrk.setOriginTargetPoint(param.getTargetPoint());
            }


 src/main/java/com/zy/asrs/task/TaskReportScheduler.java

@@ -47,7 +47,7 @@
    private String TaskExecCallback;


    @Scheduled(cron = "0/3 * * * * ? ")
//    @Scheduled(cron = "0/3 * * * * ? ")
    public void execute() throws IOException {
        Page<TaskWrkReport> taskWrkReportPage = taskWrkReportService.selectPage(new Page<>(0, 100), new EntityWrapper<TaskWrkReport>().orderBy("createTime", true));
        if (taskWrkReportPage.getRecords() != null) {

 src/main/java/com/zy/core/thread/SiemensCrnThread.java

@@ -192,7 +192,7 @@
     */
    private void readStatus() {
        SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
        updateIoMode(devpThread);
//        updateIoMode(devpThread);
        OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 56);
        if (result.IsSuccess) {
            if (null == crnProtocol) {

 src/main/resources/application.yml

@@ -53,14 +53,14 @@
  #url: 10.32.53.195:8080
  # WMS系统ip
  #  url: 10.210.157.109:8090
  url: 192.168.0.98:8078/dfmp
  url: 192.168.110.113:8886/OpenApi
  # 入库任务申请接口
  #inboundTaskApplyPath: api/InterFace/inboundTaskApply
  inboundTaskApplyPath: other/api/wcs/allocation
  inboundTaskApplyPath: TaskExecCallback
  #  inboundTaskApplyPath: open/asrs/inboundTaskApply
  # 任务开始时，WCS回调WMS
  taskStatusFeedbackPath: other/api/wcs/taskStart
  taskStatusFeedbackPath: TaskExecCallback
  # 任务完成结束时，WCS回调WMS
  TaskExecCallback: other/api/wcs/taskFinish
  TaskExecCallback: TaskExecFinishedCallback
  # 移库申请接口
  movePath: api/InterFace/get_InterFace_TestStorage

 src/main/resources/license.lic

Binary files differ

 src/main/webapp/static/wcs/js/console.map.js

@@ -11,106 +11,61 @@
        "type": "rack",
        "id": "rack7",
        "top": 326,
        "left": 800,
        "width": 795,
        "left": 500,
        "width": 1000,
        "height": 23,
        "minBayNo": 1,
        "maxBayNo": 50,
        "hiddenArr": [1,22]
        "maxBayNo": 42,
        "hiddenArr": [1,2,3,4,5,6,7,8,9,10,11,15,16]
    },
        {
        "type": "rack",
        "id": "rack6",
        "top": 303,
        "left": 820,
        "width": 1050,
        "left": 500,
        "width": 1000,
        "height": 23,
        "minBayNo": 1,
        "maxBayNo": 59,
        "maxBayNo": 42,
        "hiddenArr": [1,59]
    },
        {
        "type": "rack",
        "id": "rack5",
        "top": 209,
        "left": 820,
        "width": 1050,
        "left": 500,
        "width": 1000,
        "height": 23,
        "minBayNo": 1,
        "maxBayNo": 59,
        "hiddenArr": [1,59]
        "maxBayNo": 42,
        "hiddenArr": [1,5,6,15,16,25,26,35,36]
    },
        {
        "type": "rack",
        "id": "rack4",
        "top": 232,
        "left": 820,
        "width": 1050,
        "left": 500,
        "width": 1000,
        "height": 23,
        "minBayNo": 1,
        "maxBayNo": 59,
        "hiddenArr": [1,59]
    },
    //     {
    //     "type": "rack",
    //     "id": "rack3",
    //     "top": 182,
    //     "left": 820,
    //     "width": 1050,
    //     "height": 23,
    //     "minBayNo": 1,
    //     "maxBayNo": 59,
    //     "hiddenArr": [1,59]
    // },
        {
        "type": "rack",
        "id": "rack2",
        "top": 159,
        "left": 820,
        "width": 1050,
        "height": 23,
        "minBayNo": 1,
        "maxBayNo": 59,
        "hiddenArr": [1,59]
    },
        {
        "type": "rack",
        "id": "rack1",
        "top": 98,
        "left": 820,
        "width": 1050,
        "height": 23,
        "minBayNo": 1,
        "maxBayNo": 59,
        "hiddenArr": [1,59]
    },
    //     {
    //     "type": "rack",
    //     "id": "rack0",
    //     "top": 75,
    //     "left": 820,
    //     "width": 1050,
    //     "height": 23,
    //     "minBayNo": 1,
    //     "maxBayNo": 59,
    //     "hiddenArr": [1,59]
    // }
    ],
        "maxBayNo": 42,
        "hiddenArr": [1]
    }],
    "crns": [ {
        "type": "crane",
        "id": "crn-1",
        "text": "1",
        "top": 132,
        "left": 855,
        "top": 265,
        "left": 444,
        "width": 93,
        "height": 22
    },{
        "type": "track",
        "id": "lb_track1",
        "text": "",
        "top": 143,
        "left": 769,
        "width": 850,
        "top": 274,
        "left": 500,
        "width": 1000,
        "height": 2
    }],
    "areas": [{
@@ -132,337 +87,12 @@
            "stns": [{
                "type": "stn",
                "id": "site-100",
                "text": "1008",
                "top": 99,
                "left": 771,
                "text": "100",
                "top": 232,
                "left": 460,
                "width": 62,
                "height": 23
            },{
                "type": "stn",
                "id": "site-101",
                "text": "1007",
                "top": 99,
                "left": 707,
                "width": 62,
                "height": 23
            },{
                "type": "stn",
                "id": "site-102",
                "text": "RGV小车",
                "top": 99,
                "left": 643,
                "width": 62,
                "height": 23
            },{
                "type": "stn",
                "id": "site-103",
                "text": "1011",
                "top": 99,
                "left": 579,
                "width": 62,
                "height": 23
            },
                {
                    "type": "stn",
                    "id": "site-103",
                    "text": "1020",
                    "top": 70,
                    "left": 579,
                    "width": 62,
                    "height": 23
                },
                {
                    "type": "stn",
                    "id": "site-103",
                    "text": "",
                    "top": 70,
                    "left": 515,
                    "width": 62,
                    "height": 23
                },
                {
                    "type": "stn",
                    "id": "site-103",
                    "text": "",
                    "top": 70,
                    "left": 450,
                    "width": 62,
                    "height": 23
                },
            //     {
            //     "type": "stn",
            //     "id": "site-104",
            //     "text": "104",
            //     "top": 124,
            //     "left": 579,
            //     "width": 62,
            //     "height": 34
            // },
                {
                "type": "stn",
                "id": "site-125",
                "text": "1006",
                "top": 160,
                "left": 771,
                "width": 62,
                "height": 23
            },{
                "type": "stn",
                "id": "site-124",
                "text": "1005",
                "top": 160,
                "left": 707,
                "width": 62,
                "height": 23
            },/*{
                "type": "stn",
                "id": "site-123",
                "text": "RGV小车",
                "top": 160,
                "left": 643,
                "width": 62,
                "height": 23
            },*/
            //     {
            //     "type": "stn",
            //     "id": "site-122",
            //     "text": "122",
            //     "top": 160,
            //     "left": 579,
            //     "width": 62,
            //     "height": 23
            // },
            //     {
            //     "type": "stn",
            //     "id": "site-121",
            //     "text": "121",
            //     "top": 186,
            //     "left": 579,
            //     "width": 62,
            //     "height": 42
            // },
                {
                "type": "stn",
                "id": "site-120",
                "text": "1004",
                "top": 231,
                "left": 771,
                "width": 62,
                "height": 23
            },{
                "type": "stn",
                "id": "site-119",
                "text": "1003",
                "top": 231,
                "left": 707,
                "width": 62,
                "height": 23
            },/*{
                "type": "stn",
                "id": "site-118",
                "text": "RGV小车",
                "top": 231,
                "left": 643,
                "width": 62,
                "height": 23
            },*/
            //     {
            //     "type": "stn",
            //     "id": "site-117",
            //     "text": "117",
            //     "top": 231,
            //     "left": 579,
            //     "width": 62,
            //     "height": 23
            // },{
            //     "type": "stn",
            //     "id": "site-116",
            //     "text": "116",
            //     "top": 256,
            //     "left": 579,
            //     "width": 62,
            //     "height": 46
            // },
                {
                "type": "stn",
                "id": "site-115",
                "text": "1002",
                "top": 304,
                "left": 771,
                "width": 62,
                "height": 23
            },{
                "type": "stn",
                "id": "site-114",
                "text": "1001",
                "top": 304,
                "left": 707,
                "width": 62,
                "height": 23
            },
                {
                    "type": "stn",
                    "id": "site-114",
                    "text": "1016",
                    "top": 330,
                    "left": 707,
                    "width": 62,
                    "height": 23
                },
                {
                    "type": "stn",
                    "id": "site-114",
                    "text": "1018",
                    "top": 356,
                    "left": 707,
                    "width": 62,
                    "height": 23
                },
                {
                    "type": "stn",
                    "id": "site-114",
                    "text": "1019",
                    "top": 356,
                    "left": 772,
                    "width": 62,
                    "height": 23
                },
                {
                    "type": "stn",
                    "id": "site-114",
                    "text": "",
                    "top": 356,
                    "left": 837,
                    "width": 62,
                    "height": 23
                },
                {
                    "type": "stn",
                    "id": "site-114",
                    "text": "",
                    "top": 356,
                    "left": 902,
                    "width": 62,
                    "height": 23
                },
                {
                    "type": "stn",
                    "id": "site-114",
                    "text": "1017",
                    "top": 383,
                    "left": 707,
                    "width": 62,
                    "height": 23
                },/*{
                "type": "stn",
                "id": "site-113",
                "text": "RGV小车",
                "top": 304,
                "left": 643,
                "width": 62,
                "height": 23
            },*/
            //     {
            //     "type": "stn",
            //     "id": "site-112",
            //     "text": "112",
            //     "top": 304,
            //     "left": 579,
            //     "width": 62,
            //     "height": 23
            // },
                {
                "type": "stn",
                "id": "site-105",
                "text": "1012",
                "top": 99,
                "left": 515,
                "width": 62,
                "height": 23
            },{
                "type": "stn",
                "id": "site-106",
                "text": "1013",
                "top": 124,
                "left": 515,
                "width": 62,
                "height": 34
            },{
                "type": "stn",
                "id": "site-107",
                "text": "1013",
                "top": 160,
                "left": 515,
                "width": 62,
                "height": 23
            },{
                "type": "stn",
                "id": "site-108",
                "text": "1013",
                "top": 186,
                "left": 515,
                "width": 62,
                "height": 42
            },{
                "type": "stn",
                "id": "site-109",
                "text": "1013",
                "top": 231,
                "left": 515,
                "width": 62,
                "height": 70
            },{
                "type": "stn",
                "id": "site-110",
                "text": "1014",
                "top": 304,
                "left": 515,
                "width": 62,
                "height": 23
            },{
                "type": "stn",
                "id": "site-111",
                "text": "1015",
                "top": 329,
                "left": 515,
                "width": 62,
                "height": 23
            },
            //     {
            //     "type": "stn",
            //     "id": "site-1001",
            //     "text": "1001",
            //     "top": 99,
            //     "left": 451,
            //     "width": 62,
            //     "height": 23
            // },
            //     {
            //     "type": "stn",
            //     "id": "site-1002",
            //     "text": "1002",
            //     "top": 160,
            //     "left": 451,
            //     "width": 62,
            //     "height": 23
            // },{
            //     "type": "stn",
            //     "id": "site-1003",
            //     "text": "1003",
            //     "top": 231,
            //     "left": 451,
            //     "width": 62,
            //     "height": 23
            // },{
            //     "type": "stn",
            //     "id": "site-1004",
            //     "text": "1004",
            //     "top": 304,
            //     "left": 451,
            //     "width": 62,
            //     "height": 23
            // }
            ]
            }]
        }]
    }]
}

 src/main/webapp/static/wcs/js/console1.map.js

File was deleted

 src/main/webapp/static/wcs/js/console2.map.js

File was deleted

 src/main/webapp/static/wcs/js/console3.map.js

File was deleted