Merge remote-tracking branch 'gitbit/gzynwcs' into gzynwcs

tqs

2022-09-29 f2bcc69468fad1901486ab49a92dabdcdc89960f

Merge remote-tracking branch 'gitbit/gzynwcs' into gzynwcs

# Conflicts:
#	src/main/java/com/zy/core/thread/SiemensDevpThread.java

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

@@ -103,12 +103,14 @@
        for (DevpSlave devp : slaveProperties.getDevp()) {
            // 遍历入库口
            for (DevpSlave.Sta inSta : devp.getInSta()) {
                inSta.setStaNo(102);
                // 获取条码扫描仪信息
                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
                if (barcodeThread == null) {
                    continue;
                }
                String barcode = barcodeThread.getBarcode();
                barcode="ILY0127 0001";
                if(!Cools.isEmpty(barcode)) {
                    log.info("{}号条码扫描器检测条码信息：{}", inSta.getBarcode(), barcode);
                    if("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
@@ -165,7 +167,7 @@
                    try {

                        LocTypeDto locTypeDto = new LocTypeDto(staProtocol);

                        locTypeDto.setLocType1((short)1);
                        SearchLocParam param = new SearchLocParam();
                        param.setBarcode(barcode);
                        param.setIoType(1);

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

@@ -181,6 +181,7 @@
        if (result2.IsSuccess) {
            for (int i = 0; i < barcodeSize; i++) {
                String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*12,12, "UTF-8");
//                String barcode=new String(result2.Content,i*12,12);
                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
                if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
                    barcodeThread.setBarcode(barcode);

 src/main/resources/application.yml

@@ -111,7 +111,7 @@
  # 条码扫描仪
  barcode[0]:
    id: 1
    ip: 10.10.10.52
    ip: 172.28.15.220
    port: 51236
#   # LED1
#  led[0]:
@@ -144,7 +144,7 @@
  #上下行日志打印
  printPacLog: true
  #条码长度
  barcodeLen: 8
  barcodeLen: 12

test:
  url: 127.0.0.1:8080/test