*

lsh

2025-03-11 353417afe917a2314f13bb40c70c02e818306182

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

@@ -68,6 +68,14 @@
    private Long rgvCount;
    @Value("${constant-parameters.rgvDate}")
    private Double rgvDate;
    @Value("${wms.url}")
    private String wmsUrl;
    @Value("${wms.reportOutPath}")
    private String wmsOutPath;
    @Value("${wms.reportSwitch}")
    private boolean reportSwitch;
    @Value("${wms.reportSwitchAuto}")
    private boolean reportSwitchAuto;

    /*
    * 验证许可证是否有效
@@ -352,7 +360,7 @@
    }

    //任务完成
    public synchronized void rgvCompleteWrkMastSta() {
    public synchronized void rgvCompleteWrkMastSta(int[] autoZ) {
        try {
            for (RgvSlave rgvSlave : slaveProperties.getRgv()) {
                RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvSlave.getId());
@@ -389,9 +397,9 @@
                    wrkMast.setAppeTime(now);
                    try{
                        try{
                            if (true){
                            if (reportSwitch){
                                RgvTaskReportingParam rgvTaskReportingParam = new RgvTaskReportingParam(wrkMast);
                                ReturnT<String> result = new PostMesDataUtils().postMesDataWcs("", "", rgvTaskReportingParam);
                                ReturnT<String> result = new PostMesDataUtils().postMesDataWcs(wmsUrl, wmsOutPath, rgvTaskReportingParam);
                                if (result.getCode()==200){
                                    wrkMast.setWrkSts(4L);
                                    wrkMast.setAppeTime(now);
@@ -402,20 +410,22 @@
                                }
                            } else {
                                //测试用
                                wrkMast.setWrkSts(5L);
                                wrkMast.setWrkSts(4L);
                                wrkMast.setAppeTime(now);
                                wrkMastService.updateById(wrkMast);
                                WrkMast wrkMast1 = new WrkMast();
                                int workNo = commonService.getWorkNo(0);
                                wrkMast1.setWrkNo((long) workNo);
                                wrkMast1.setSourceStaNo(wrkMast.getStaNoCs());
                                wrkMast1.setStaNo(wrkMast.getSourceNoCs());
                                wrkMast1.setWrkSts(1L);
                                wrkMast1.setIoType(1);
                                wrkMast1.setModiTime(now);
                                wrkMast1.setAppeTime(now);
                                wrkMast1.setMemo("测试数据");
                                wrkMastService.insert(wrkMast1);
                                if (reportSwitchAuto) {
                                    WrkMast wrkMast1 = new WrkMast();
                                    int workNo = commonService.getWorkNo(0);
                                    wrkMast1.setWrkNo((long) workNo);
                                    wrkMast1.setSourceStaNo(wrkMast.getSourceNoCs(autoZ));
                                    wrkMast1.setStaNo(wrkMast.getStaNoCs(autoZ));
                                    wrkMast1.setWrkSts(1L);
                                    wrkMast1.setIoType(1);
                                    wrkMast1.setModiTime(now);
                                    wrkMast1.setAppeTime(now);
                                    wrkMast1.setMemo("测试数据");
                                    wrkMastService.insert(wrkMast1);
                                }
                                continue;
                            }
                        } catch (Exception e){