*

lsh

2025-07-30 0c6a4102012ca052915af778b563670252399ce2

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

@@ -8,8 +8,10 @@
import com.zy.asrs.domain.dto.AxisBean;
import com.zy.asrs.domain.dto.WorkChartAxis;
import com.zy.asrs.domain.vo.LocChartPie;
import com.zy.asrs.entity.RgvOneSign;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.mapper.ReportQueryMapper;
import com.zy.asrs.mapper.RgvOneSignMapper;
import com.zy.asrs.mapper.WaitPakinMapper;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.WrkDetlService;
@@ -52,6 +54,8 @@
    private WaitPakinMapper waitPakinMapper;
    @Autowired
    private ApiLogService apiLogService;
    @Autowired
    private RgvOneSignMapper rgvOneSignMapper;

    /**
     * 获取当前时间
@@ -72,8 +76,26 @@
                    } else {
                        staProtocolPall = staProtocolPall.clone();
                    }
                    String errorSta = "";
                    boolean signSta = false;

                    if (!staProtocolPall.isAutoing() || !staProtocolPall.isLoading() || staProtocolPall.getWorkNo() != 0 || !staProtocolPall.isPakMk()){
                    if (!staProtocolPall.isAutoing()){
                        errorSta = errorSta+"站点非自动！！！";
                        signSta = true;
                    }
                    if (!staProtocolPall.isLoading()){
                        errorSta = errorSta+"站点无托盘！！！";
                        signSta = true;
                    }
                    if (staProtocolPall.getWorkNo() != 0 ){
                        errorSta = errorSta+"站点存在任务号！！！";
                        signSta = true;
                    }
                    if (!staProtocolPall.isPakMk()){
                        errorSta = errorSta+"站点存在锁定标记！！！";
                        signSta = true;
                    }
                    if (signSta){
                        try{
                            // 保存接口日志
                            apiLogService.save(
@@ -82,12 +104,12 @@
                                    null,
                                    null,
                                    JSON.toJSONString(palletizingNo),
                                    "未就绪！！！",
                                    "未就绪！！！请等待...  原因："+errorSta,
                                    false
                            );
                        }catch (Exception e){
                        }
                        return R.error("未就绪！！！");
                        return R.error("未就绪！！！请等待... 原因："+errorSta);
                    }

                    // 获取条码扫描仪信息
@@ -140,8 +162,34 @@
                );
            }catch (Exception e){
            }
            return R.error("未就绪！！！托盘条码不为空但是已存在数据，不可重复使用！！！请检查！！！");
            return R.error("未就绪！！！托盘条码不为空但是已存在数据，不可重复使用！！！请检查或重新获取！！！");
        }


        RgvOneSign JarTwo = rgvOneSignMapper.selectOneSign(palletizingNo+"barcode"+barcode);
        if (!Cools.isEmpty(JarTwo)){
            try{
                // 保存接口日志
                apiLogService.save(
                        "中控申请获取"+palletizingNo+"站点当前条码信息",
                        "/monitor/barcode/two",
                        null,
                        null,
                        JSON.toJSONString(palletizingNo),
                        "未就绪！！！条码更新中....",
                        false
                );
            }catch (Exception e){
            }
            return R.error("未就绪！！！条码更新中....");
        }

        try{
            rgvOneSignMapper.deleteBarcode(palletizingNo+"barcode");
        } catch (Exception e){

        }

        Cools.CoolMap coolMap = Cools.add("barcode", barcode).add("Date", now);
        try{
            // 保存接口日志