Merge remote-tracking branch 'origin/jx-fyxc-wms' into jx-fyxc-wms

zc

2025-04-18 87df6a2ac0ac8dc46dde8b83853aebdf7efafe64

Merge remote-tracking branch 'origin/jx-fyxc-wms' into jx-fyxc-wms

 src/main/java/com/zy/asrs/entity/param/ShuttleOutTask.java

@@ -4,9 +4,15 @@

@Data
public class ShuttleOutTask {
    //wms任务号
    private String taskNo;
    private String originLoc;
    private String originSite;
    private String destSite;

    //目标站
    private Integer staNo;

    //源库位
    private String sourceLocNo;


    private String priority;
}

 src/main/java/com/zy/asrs/entity/param/ShuttleTask.java

@@ -4,9 +4,19 @@

@Data
public class ShuttleTask {
    //wms任务号
    private String taskNo;
    private String destLoc;
    private String originSite;

    //源站
    private Integer sourceStaNo;

    //目标站
    private Integer staNo;

    //目标库位
    private String locNo;

    private String barcode;

    private String priority;
}

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

@@ -45,7 +45,7 @@


    @Scheduled(cron = "0/3 * * * * ? ")
    private void execute(){
    private void execute() {
        List<WrkMast> wrkMasts = wrkMastService.selectToBeCompleteData();
        if (wrkMasts.isEmpty()) {
            return;
@@ -63,57 +63,58 @@
        }
    }

//    @Scheduled(cron = "0/3 * * * * ? ") //入库任务下发
//    private void ShuttleInTaskSend(){
//        List<WrkMast> wrkMasts1 = wrkMastService.selectList(new EntityWrapper<WrkMast>()
//                .in("io_type", 101,110,103,104,107)
//                .eq("wrk_sts", 105).eq("crn_no",7));
//        if (!Cools.isEmpty(wrkMasts1)){
//            return;
//        }
//        List<WrkMast> wrkMasts = wrkMastService.selectToShuttleTask();
//        if (wrkMasts.isEmpty()) {
//            return;
//        }
//        try {
//            for (WrkMast wrkMast : wrkMasts) {
//                LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getLocNo()));
//                if (locMast == null) {
//                    throw new CoolException("下发四向车wcs任务失败");
//                }
//                String loc = (locMast.getRow1()-16)+"-"+locMast.getBay1()+"-"+locMast.getLev1();
//                ShuttleTask param = new ShuttleTask();
//                param.setTaskNo(wrkMast.getWrkNo().toString());
//                param.setDestLoc(loc);
//                param.setOriginSite("31002");
//                param.setBarcode(wrkMast.getBarcode());
//                param.setPriority("11");
//                String response = new HttpHandler.Builder()
//                        .setUri(shuttleWcsUrl)
//                        .setPath("/openapi/createInTask")
//                        .setJson(JSON.toJSONString(param))
//                        .build()
//                        .doPost();
//                JSONObject jsonObject = JSON.parseObject(response);
//                Integer code = jsonObject.getInteger("code");
//                if (code.equals(200)) {
//                    wrkMast.setWrkSts(105L);
//                    if (!wrkMastService.updateById(wrkMast)) {
//                        log.error("工作档[workNo={}]标记待处理失败", wrkMast.getWrkNo());
//                    }
//                }
//            }
//        }catch (Exception e){
//            throw new CoolException("下发四向车wcs任务失败");
//        }
//
//    }
    @Scheduled(cron = "0/3 * * * * ? ") //入库任务下发
    private void ShuttleInTaskSend() {
        List<WrkMast> wrkMasts1 = wrkMastService.selectList(new EntityWrapper<WrkMast>()
                .in("io_type", 101, 110, 103, 104, 107)
                .eq("wrk_sts", 105).eq("crn_no", 7));
        if (!Cools.isEmpty(wrkMasts1)) {
            return;
        }
        List<WrkMast> wrkMasts = wrkMastService.selectToShuttleTask();
        if (wrkMasts.isEmpty()) {
            return;
        }
        try {
            for (WrkMast wrkMast : wrkMasts) {
                LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getLocNo()));
                if (locMast == null) {
                    throw new CoolException("下发四向车wcs任务失败");
                }
                String loc = (locMast.getRow1() - 4) + "-" + locMast.getBay1() + "-" + locMast.getLev1();
                ShuttleTask param = new ShuttleTask();
                param.setTaskNo(wrkMast.getWrkNo().toString());
                param.setLocNo(loc);
                param.setSourceStaNo(wrkMast.getSourceStaNo());
                param.setStaNo(wrkMast.getStaNo());
                param.setBarcode(wrkMast.getBarcode());
                //param.setPriority("11");
                String response = new HttpHandler.Builder()
                        .setUri(shuttleWcsUrl)
                        .setPath("/openapi/createInTask")
                        .setJson(JSON.toJSONString(param))
                        .build()
                        .doPost();
                JSONObject jsonObject = JSON.parseObject(response);
                Integer code = jsonObject.getInteger("code");
                if (code.equals(200)) {
                    wrkMast.setWrkSts(105L);
                    if (!wrkMastService.updateById(wrkMast)) {
                        log.error("工作档[workNo={}]标记待处理失败", wrkMast.getWrkNo());
                    }
                }
            }
        } catch (Exception e) {
            throw new CoolException("下发四向车wcs任务失败");
        }

    }

    @Scheduled(cron = "0/3 * * * * ? ") //出库库任务下发
    private void ShuttleOutTaskSend(){
    private void ShuttleOutTaskSend() {
        List<WrkMast> wrkMasts1 = wrkMastService.selectList(new EntityWrapper<WrkMast>()
                .in("io_type", 1,10,53,54,57).eq("crn_no",7));
        if (!Cools.isEmpty(wrkMasts1)){
                .in("io_type", 1, 10, 53, 54, 57).eq("crn_no", 7));
        if (!Cools.isEmpty(wrkMasts1)) {
            return;
        }
        List<WrkMast> wrkMasts = wrkMastService.selectToShuttleOutTask();
@@ -126,13 +127,12 @@
                if (locMast == null) {
                    throw new CoolException("下发四向车wcs任务失败");
                }
                String loc = (locMast.getRow1()-16)+"-"+locMast.getBay1()+"-"+locMast.getLev1();
                String loc = (locMast.getRow1() - 4) + "-" + locMast.getBay1() + "-" + locMast.getLev1();
                ShuttleOutTask param = new ShuttleOutTask();
                param.setTaskNo(wrkMast.getWrkNo().toString());
                param.setOriginLoc(loc);
                param.setOriginSite("31004");
                param.setDestSite("31002");
                param.setPriority("11");
                param.setSourceLocNo(loc);
                param.setStaNo(wrkMast.getStaNo());
                //param.setPriority("11");
                String response = new HttpHandler.Builder()
                        .setUri(shuttleWcsUrl)
                        .setPath("/openapi/createOutTask")
@@ -148,15 +148,15 @@
                    }
                }
            }
        }catch (Exception e){
        } catch (Exception e) {
            throw new CoolException("下发四向车wcs任务失败");
        }

    }

//    @Scheduled(cron = "0/3 * * * * ? ") //移库任务下发
    private void ShuttleMoveTaskSend(){
        List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", 11).eq("io_type",11));
    //    @Scheduled(cron = "0/3 * * * * ? ") //移库任务下发
    private void ShuttleMoveTaskSend() {
        List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", 11).eq("io_type", 11));
        if (wrkMasts.isEmpty()) {
            return;
        }
@@ -167,8 +167,8 @@
                if (originLoc == null || destLoc == null) {
                    throw new CoolException("下发四向车wcs任务失败");
                }
                String originLoc1 = (originLoc.getRow1()-16)+"-"+originLoc.getBay1()+"-"+originLoc.getLev1();
                String destLoc1 = (destLoc.getRow1()-16)+"-"+destLoc.getBay1()+"-"+destLoc.getLev1();
                String originLoc1 = (originLoc.getRow1() - 16) + "-" + originLoc.getBay1() + "-" + originLoc.getLev1();
                String destLoc1 = (destLoc.getRow1() - 16) + "-" + destLoc.getBay1() + "-" + destLoc.getLev1();
                ShuttleMoveTask param = new ShuttleMoveTask();
                param.setTaskNo(wrkMast.getWrkNo().toString());
                param.setOriginLoc(originLoc1);
@@ -190,12 +190,11 @@
                    }
                }
            }
        }catch (Exception e){
        } catch (Exception e) {
            throw new CoolException("下发四向车wcs任务失败");
        }

    }



}