*

lsh

2025-03-20 20d07cb3380f9fc6553b710fa35f6bc969a95445

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

@@ -17,9 +17,11 @@
import com.zy.core.model.LedSlave;
import com.zy.core.model.command.LedCommand;
import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.LedThread;
import com.zy.core.thread.SiemensDevpThread;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@@ -47,12 +49,25 @@
     */
    @PostMapping("/barcode/two")
    public R barcodeTwo(@RequestParam Integer palletizingNo) {
        Date now = new Date();

        String barcode = "";
        for (DevpSlave devp : slaveProperties.getDevp()) {
            // 遍历入库口
            for (DevpSlave.Sta inSta : devp.getDriveSta()) {
                if (inSta.getStaNo().equals(palletizingNo)){
                    SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 2);
                    StaProtocol staProtocolPall = devpThread.getStation().get(palletizingNo);
                    if (staProtocolPall == null) {
                        continue;
                    } else {
                        staProtocolPall = staProtocolPall.clone();
                    }

                    if (!staProtocolPall.isAutoing() || !staProtocolPall.isLoading() || staProtocolPall.getWorkNo() != 0 || !staProtocolPall.isPakMk()){
                        return R.error("未就绪！！！");
                    }

                    // 获取条码扫描仪信息
                    BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
                    if (barcodeThread == null) {
@@ -62,7 +77,7 @@

                    if (!Cools.isEmpty(barcode)) {
//                    log.info("{}号条码扫描器检测条码信息：{}", inSta.getBarcode(), barcode);
                        if ("NG".endsWith(barcode) || "NoRead".equals(barcode) || "00000000".equals(barcode)) {
                        if ("NG".endsWith(barcode) || "NoRead".equals(barcode) || "00000000".equals(barcode) || "000000".equals(barcode)) {
                            barcode = "";
                        }
                    } else {
@@ -71,12 +86,11 @@
                }
            }
        }



        Date now = new Date();
//        Calendar calendar = Calendar.getInstance();
//        calendar.setTime(now);
        if (Cools.isEmpty(barcode) || barcode.equals("")){
            return R.error("未就绪！！！托盘条码为空！！！请检查！！！");
        }
        return R.ok(
                Cools.add("barcode", barcode).add("Date",now)
        );
@@ -345,9 +359,10 @@
    @GetMapping("/led/useInfo")
    public R monitorLedUseInfo(@RequestParam("ledId") Integer ledId) {
        Integer count1 = wrkDetlService.count1();
        Integer count11 = wrkDetlService.count11();
        Integer count3 = wrkDetlService.count3();
        Map<String, Object> map = new HashMap<>();
        map.put("count1", count1);
        map.put("count1", count1+count11);
        map.put("count2", count3);
        return R.ok().add(map);
    }