#1

dubin

昨天 295ee7dd14f5d36e2fe442714ab0a80c480c8029

#1

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

@@ -235,8 +235,8 @@
            wrkMast.setIoType(ioType); // 入出库状态
            wrkMast.setIoPri(10D); // 优先级
            wrkMast.setCrnNo(locMast.getCrnNo());
//            wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 源站
//            wrkMast.setStaNo(staDesc.getStnNo()); // 目标站
            wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 源站
            wrkMast.setStaNo(staDesc.getStnNo()); // 目标站
            wrkMast.setSourceLocNo(dto.getLocNo()); // 源库位
            wrkMast.setFullPlt("Y"); // 满板：Y
            wrkMast.setPicking("N"); // 拣料
@@ -470,8 +470,8 @@
            wrkMast.setWrkSts(11L); // 工作状态：11.生成出库ID
            wrkMast.setIoType(110); // 入出库状态： 110.空板出库
            wrkMast.setIoPri(10D);
//            wrkMast.setSourceStaNo(sourceStaNo); // 源站
//            wrkMast.setStaNo(param.getOutSite()); // 目标站
            wrkMast.setSourceStaNo(sourceStaNo); // 源站
            wrkMast.setStaNo(param.getOutSite()); // 目标站
            wrkMast.setCrnNo(locMast.getCrnNo());
            wrkMast.setSourceLocNo(locNo); // 源库位
            wrkMast.setIoPri(10.0D);//优先级

 src/main/java/com/zy/asrs/task/handler/OutWorkHandler.java

@@ -49,35 +49,35 @@

        String response ="";
        boolean bool =false;
        try {
            log.info("wms派发任务给wcs出库={}", JSON.toJSONString(map));
            response = new HttpHandler.Builder()
                    // .setHeaders(headParam)
                    .setUri(addrs)
                    .setPath(outboundTaskSend)
                    .setJson(JSON.toJSONString(map))
                    .build()
                    .doPost();
            JSONObject jsonObject = JSON.parseObject(response);
            if(jsonObject.getInteger("code") == 200){
                wrkMast.setWrkSts(12L);
                wrkMastService.updateById(wrkMast);
                bool = true;
            }else {
                log.error("wms派发任务给wcs出库失败{},返回值={}", JSON.toJSONString(wrkMast), response);
            }
        } catch (Exception e) {
            log.error("wms派发任务给wcs出库失败{},返回值={}", JSON.toJSONString(wrkMast), response);
        } finally {
            apiLogService.save("wms派发任务给wcs出库"
                    , addrs + outboundTaskSend
                    , null
                    , "127.0.0.1"
                    , JSON.toJSONString(map)
                    , response
                    , bool
            );
        }
//        try {
//            log.info("wms派发任务给wcs出库={}", JSON.toJSONString(map));
//            response = new HttpHandler.Builder()
//                    // .setHeaders(headParam)
//                    .setUri(addrs)
//                    .setPath(outboundTaskSend)
//                    .setJson(JSON.toJSONString(map))
//                    .build()
//                    .doPost();
//            JSONObject jsonObject = JSON.parseObject(response);
//            if(jsonObject.getInteger("code") == 200){
//                wrkMast.setWrkSts(12L);
//                wrkMastService.updateById(wrkMast);
//                bool = true;
//            }else {
//                log.error("wms派发任务给wcs出库失败{},返回值={}", JSON.toJSONString(wrkMast), response);
//            }
//        } catch (Exception e) {
//            log.error("wms派发任务给wcs出库失败{},返回值={}", JSON.toJSONString(wrkMast), response);
//        } finally {
//            apiLogService.save("wms派发任务给wcs出库"
//                    , addrs + outboundTaskSend
//                    , null
//                    , "127.0.0.1"
//                    , JSON.toJSONString(map)
//                    , response
//                    , bool
//            );
//        }
        return SUCCESS;

    }

 src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java

@@ -50,7 +50,7 @@
    @Value("${led.id}")
    private String ledId;

    @Scheduled(cron = "0/2 * * * * ? ")
    //@Scheduled(cron = "0/2 * * * * ? ")
    private void send() {

        //饼图
@@ -155,7 +155,7 @@

    }

    @Scheduled(cron = "0/2 * * * * ? ")
    //@Scheduled(cron = "0/2 * * * * ? ")
    private void ErrorSend(){
        Map<String,Object> map=new HashMap<>();
        map.put("to",ledId);
@@ -174,7 +174,7 @@
    }


    @Scheduled(cron = "0/2 * * * * ? ")
    //@Scheduled(cron = "0/2 * * * * ? ")
    private void TaskSend(){
        Map<String,Object> map=new HashMap<>();
        map.put("to",ledId);

 src/main/java/com/zy/common/service/CommonService.java

@@ -161,7 +161,7 @@
        // 返回dto
        startupDto.setWorkNo(workNo);
        startupDto.setCrnNo(locMast.getCrnNo());
//        startupDto.setSourceStaNo(sourceStaNo);
        startupDto.setSourceStaNo(sourceStaNo);
        startupDto.setLocNo(locNo);
        return startupDto;
    }

 src/main/resources/application.yml

@@ -15,11 +15,6 @@
    password: sa@123
  mvc:
    static-path-pattern: /**
#  redis:
#    host: localhost
#    port: 6379
#    database: 0
#    password: xltys1995
  servlet:
    multipart:
      maxFileSize: 100MB
@@ -69,7 +64,7 @@
wcs:
  #地址
  address:
    URL: http://127.0.0.1:8080/wcs
    URL: http://127.0.0.1:9090/wcs
    #出库移库任务下发
    outboundTaskSend: open/outboundTaskSend
    deviceStatus : open/deviceStatus