#

mrzhssss

2022-11-30 06c8c14db3806051a4b8031a7b17a0bd818b3b88

#

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

@@ -201,5 +201,15 @@
        return R.error("plc已掉线");
    }

    /**
     * 母托盘出库
     * @return
     */
    @PostMapping("/motherPallet")
    public R motherPalletOut(){
        boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(3, null));
        return R.ok("母托盘出库成功");
    }


}

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

@@ -87,6 +87,8 @@
    private BasErrLogService basErrLogService;
    @Autowired
    private BasCrnErrorMapper basCrnErrorMapper;
    @Autowired
    private WrkMastService wrkMastService;

    @Value("${wms.url}")
    private String wmsUrl;
@@ -107,7 +109,6 @@
                }
                String barcode = barcodeThread.getBarcode();

                barcode = "80011105";

                if (!Cools.isEmpty(barcode)) {
                    log.info("{}号条码扫描器检测条码信息：{}", inSta.getBarcode(), barcode);
@@ -161,12 +162,13 @@
                        log.error("工作档中已存在该站状态为（ 2.设备上走 ）的数据,工作号={}", wrkMast.getWrkNo());
                        continue;
                    }
//                    // 获取入库通知档
//                    List<WaitPakin> waitPakins = waitPakinMapper.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", barcode).eq("io_status", "N"));
//                    if (waitPakins.isEmpty()) {
//                        log.error("无此入库条码数据。条码号={}", barcode);
//                        continue;
//                    }

                    WrkMast checkPick = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
                            .eq("barcode", barcode)
                            .eq("io_type", 103));
                    if (!Cools.isEmpty(checkPick)) {
                        continue;
                    }

                    try {

@@ -337,19 +339,19 @@
            // 遍历拣料入库口
            for (DevpSlave.Sta pickSta : devp.getPickSta()) {
//                // 获取条码扫描仪信息
//                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, pickSta.getBarcode());
//                if (barcodeThread == null) {
//                    continue;
//                }
//                String barcode = barcodeThread.getBarcode();
//                if(!Cools.isEmpty(barcode)) {
//                    log.info("{}号条码扫描器检测条码信息：{}", pickSta.getBarcode(), barcode);
//                    if("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
//                        continue;
//                    }
//                } else {
//                    continue;
//                }
                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, pickSta.getBarcode());
                if (barcodeThread == null) {
                    continue;
                }
                String barcode = barcodeThread.getBarcode();
                if(!Cools.isEmpty(barcode)) {
                    log.info("{}号条码扫描器检测条码信息：{}", pickSta.getBarcode(), barcode);
                    if("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
                        continue;
                    }
                } else {
                    continue;
                }

                // 获取拣料入库站信息
                SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
@@ -363,7 +365,12 @@
//                // 入出库模式判断
//                if (devpThread.ioMode != IoModeType.PAKIN_MODE) { continue; }

                if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() && staProtocol.isPakMk()) {
                if (staProtocol.isAutoing()
                        && staProtocol.isLoading()
                        && staProtocol.isInEnable()
                        && !staProtocol.isEmptyMk()
                        && (staProtocol.getWorkNo() == 0 || staProtocol.getWorkNo() > 9990)
                        && staProtocol.isPakMk()) {
//                    WrkMast wrkMast = wrkMastMapper.selectPickStep(barcode);
                    WrkMast wrkMast = wrkMastMapper.selectPakInStep3(staProtocol.getWorkNo().intValue());
                    if (wrkMast == null) {

 src/main/java/com/zy/core/thread/SiemensDevpThread.java

@@ -90,6 +90,10 @@
                    case 2:
                        write((StaProtocol)task.getData());
                        break;
                    case 3:
                        OperateResult write = siemensS7Net.Write("DB100.170" , (short) 1);
                        System.out.println("写入成功");
                        break;
                    default:
                        break;
                }

 src/main/resources/application.yml

@@ -153,13 +153,13 @@
      barcode: ${wcs-slave.barcode[0].id}
    # 空板入库口1
    emptyInSta[0]:
      staNo: 12
      staNo: 15
    # 出库口1
    outSta[0]:
      staNo: 11
    # 拣料入库口1
    pickSta[0]:
      staNo: 11
      staNo: 15
      barcode: ${wcs-slave.barcode[0].id}

  # 条码扫描仪