#

1

2025-05-15 cb13be5359f1a275a094053ec80b20649a8a26e8

#

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

@@ -115,17 +115,24 @@
                    // 获取入库站信息
                    DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
                    StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
                    if (staProtocol == null) {
                    if (staProtocol == null || !staProtocol.isLoading()) {
                        continue;
                    } else {
                        staProtocol = staProtocol.clone();
                    }
                    Integer workNo = staProtocol.getWorkNo();
                    if (workNo!=9998){
                        continue;
                    }
                    Integer stano = staProtocol.getStaNo();

                    // 尺寸检测异常
                    boolean back = false;
                    String errMsg = "";
                    if (staProtocol.getGrossWt()>=600){
                        errMsg = "超重";
                        back = true;
                    }
                    if (staProtocol.isFrontErr()) {
                        errMsg = "前超限";
                        back = true;
@@ -181,7 +188,7 @@
                    // 判断是否满足入库条件
                    if (staProtocol.isAutoing() && staProtocol.isLoading()
                            && staProtocol.isInEnable()
                            && !staProtocol.isEmptyMk() && (workNo == 0 || (workNo>9000 && workNo<10000))
                            && workNo == 9998
                            && staProtocol.isPakMk()
                            && staProtocol.isPakMkWalk()
                    ) {
@@ -306,12 +313,15 @@
                    // 获取入库站信息
                    DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
                    StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
                    if (staProtocol == null) {
                    if (staProtocol == null || !staProtocol.isLoading()) {
                        continue;
                    } else {
                        staProtocol = staProtocol.clone();
                    }
                    Integer workNo = staProtocol.getWorkNo();
                    if (workNo!=9997){
                        continue;
                    }
                    Integer stano = staProtocol.getStaNo();

                    // 尺寸检测异常
@@ -368,7 +378,7 @@
                    // 判断是否满足入库条件
                    if (staProtocol.isAutoing() && staProtocol.isLoading()
                            && staProtocol.isInEnable()
                            && staProtocol.isEmptyMk() && (workNo == 0 || (workNo>9000 && workNo<10000))
                            && (workNo == 9997)
                            && staProtocol.isPakMk()
                            && staProtocol.isPakMkWalk()
                    ) {

 src/main/java/com/zy/core/model/protocol/StaProtocol.java

@@ -75,7 +75,7 @@
    private boolean rightErr;

    // 超重
    private boolean weightErr;
    private boolean weightErr = false;

    // 扫码失败
    private boolean barcodeErr;
@@ -85,7 +85,7 @@

    //指令ID
    private Integer commandId;
    private Double grossWt;
    private Double grossWt = 0D;

    public BasDevp toSqlModel(){
        BasDevp basDevp = new BasDevp();

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

@@ -213,10 +213,10 @@

        //条码
        Thread.sleep(200);
        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.840.0",(short) (barcodeSize*8));
        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB400.100.0",(short) (barcodeSize*8));
        if (result2.IsSuccess) {
            for (int i = 0; i < barcodeSize; i++) {
                String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
                String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,6, "UTF-8");
                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
                if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
                    barcodeThread.setBarcode(barcode);
@@ -224,6 +224,29 @@
            }
        }

        //条码
        Thread.sleep(200);
        int[] staW = new int[]{1004,1014,1020};

        OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB400.148.0",(short) (staW.length*4));
        if (result3.IsSuccess) {
            for (int i = 0; i < staW.length; i++) {
                Integer siteId = staW[i]; // 站点编号
                StaProtocol staProtocol = station.get(siteId);
                if (null == staProtocol) {
                    staProtocol = new StaProtocol();
                    station.put(siteId, staProtocol);
                }
                staProtocol.setSiteId(siteId);
                boolean[] status = siemensS7Net.getByteTransform().TransBool(result3.Content, i*4 + 2, 2);
                staProtocol.setFrontErr(status[0]);  // 前超限
                staProtocol.setBackErr(status[1]);  // 后超限
                staProtocol.setHighErr(status[2]);  // 高超限
                staProtocol.setLeftErr(status[3]);  // 左超限
                staProtocol.setRightErr(status[4]); // 右超限
            }
        }

        if (result.IsSuccess) {

            OutputQueue.DEVP.offer(MessageFormat.format("【{0}】[id:{1}] <<<<< 实时数据更新成功",DateUtils.convert(new Date()), slave.getId()));

 src/main/resources/application.yml

@@ -67,10 +67,10 @@
  #url: 10.32.53.195:8080
  # WMS系统ip
  #  url: 10.210.157.109:8090
  url: 27.172.2.132:9027
  url: 27.172.2.135:9027
  # 入库任务申请接口
  #inboundTaskApplyPath: api/InterFace/inboundTaskApply
  inboundTaskApplyPath: api/external/wcs/taskCancel
  inboundTaskApplyPath: api/external/wcs/inboundTaskApply
  #  inboundTaskApplyPath: open/asrs/inboundTaskApply
  # 任务状态反馈接口
  taskStatusFeedbackPath: api/external/wcs/taskStatusFeedback