#

Administrator

3 天以前 a06eb7682556938481810c2ea36477cc42d002b5

#

 src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java

@@ -178,7 +178,7 @@
                        .setUri(wcs_address)
                        .setPath(path)
//                        .setHttps(wcs_address != null && wcs_address.startsWith("https://"))
                        .setTimeout(10, TimeUnit.SECONDS)
                        .setTimeout(60, TimeUnit.SECONDS)
                        .setJson(JSON.toJSONString(payload))
                        .build()
                        .doPost();

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

@@ -58,6 +58,11 @@

    @Autowired
    private ReportQueryMapper reportQueryMapper;
    @Autowired
    private WorkService workService;

    @Autowired
    private LocMastService locMastService;
//    @PostMapping("/order/matSync/default/v1")
////    @AppAuth(memo = "商品信息同步接口")
//    public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
@@ -515,6 +520,12 @@
            }
            validOutOrders.add(outTaskParam);
        }
        for (OutTaskParam outTaskParam : validOutOrders) {
            LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "F").eq("barcode", outTaskParam.getPalletId()));
            if (locMast == null) {
                throw new CoolException("没有找到托盘码=" + outTaskParam.getPalletId() + "对应的库位");
            }
        }

        for (OutTaskParam outTaskParam : validOutOrders) {
            R r = openService.outOrder(outTaskParam,validOutOrders.size());

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

@@ -428,6 +428,10 @@
            for (WrkMast wrkMast : activeTasks) {
                HashMap<String,Object> hashMap = new HashMap<>();
                hashMap.put("taskNo", wrkMast.getWrkNo());
                if (!Cools.isEmpty(wrkMast) && wrkMast.getWrkSts() ==11L) {
                    workService.cancelWrkMast(wrkMast.getWrkNo()+"", 9955L);
                    continue;
                }
                taskList.add(hashMap);
            }
            wcsApiService.pauseOutTasks(taskList);
@@ -1294,7 +1298,7 @@
    public R outOrder(OutTaskParam param,int count) {
        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "F").eq("barcode", param.getPalletId()));
        if (locMast == null) {
            return R.error("没有找到托盘码=" + param.getPalletId() + "对应的库位");
            throw new CoolException("没有找到托盘码=" + param.getPalletId() + "对应的库位");
        }
        Integer ioType = 101;
        // 获取路径

 src/main/java/com/zy/common/web/WcsController.java

@@ -437,6 +437,8 @@
     */
    @Transactional
    public StartupDto startupFullPutStore(Integer devpNo, String barcode, LocTypeDto locTypeDto, List<WaitPakin> waitPakins) {
        long startTime = System.currentTimeMillis();
        try {
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
        // 检索库位
@@ -516,6 +518,9 @@
        dto.setLocNo(wcsLoc);
        dto.setTaskNo(workNo + "");
        return dto;
        } finally {
            log.info("startupFullPutStore耗时:{}ms, sourceStaNo:{}, barcode:{}", System.currentTimeMillis() - startTime, devpNo, barcode);
        }
    }

    @Transactional

 src/main/resources/application.yml

@@ -110,7 +110,7 @@
    method: POST
  #  地址
  address:
    URL: https://127.0.0.1:9090/wcs
    URL: http://127.0.0.1:9090/wcs
    #入库任务下发地址
    createInTask : /openapi/createInTask
    #出库任务下发地址