#

whycq

2025-01-08 9ff358b13905a756c535bda8f70e30fe29bd2925

#

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

@@ -3615,16 +3615,19 @@
//                     获取入库通知档
                    WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", barcode).eq("io_status", "N"));
                    if (Cools.isEmpty(waitPakin)) {
                        WrkMast mast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", barcode).eq("io_type", 105));
                        if (Cools.isEmpty(mast)) {
                        try {
                            CreateComb(barcode, staProtocol.getMatnr().toString(),staProtocol.getWorkNo().intValue(),staProtocol.getBatch(),inSta);
                        }catch (IOException e) {
                            throw new CoolException(e);
                        }
                    } else if (waitPakin.getWeight() == null) {
                        } else {
                        try {
                            LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
                            SearchLocParam param = new SearchLocParam();
                            param.setBarcode(barcode);
                                param.setBatch(staProtocol.getBatch());
                            param.setIoType(105);
                            param.setSourceStaNo(inSta.getStaNo());
                            param.setLocType1(locTypeDto.getLocType1());
@@ -3665,6 +3668,19 @@
                            e.printStackTrace();
                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                        }
                        }
                    } else if (waitPakin.getWeight() == null) {
                        WrkMastSta wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>().eq("wrk_no", staProtocol.getWorkNo().intValue()));
                        if (Cools.isEmpty(wrkMastSta)){
                            wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>().eq("wrk_no2", staProtocol.getWorkNo().intValue()));
                            if (Cools.isEmpty(wrkMastSta)){
                                throw new  CoolException("未找到对应的任务信息");
                            }
                            waitPakin.setWeight(wrkMastSta.getWeight2());
                        }else {
                            waitPakin.setWeight(wrkMastSta.getWeight());
                        }
                        waitPakinService.update(waitPakin,new EntityWrapper<WaitPakin>().eq("zpallet", barcode).eq("io_status", "N"));
                    } else {
                        try {
                            LocTypeDto locTypeDto = new LocTypeDto(staProtocol);

 src/main/java/com/zy/common/model/SearchLocParam.java

@@ -18,6 +18,8 @@
    // 库位规格（ 0:未知, 1:低库位, 2:中库位, 3:高库位 ）
    private Short locType1;

    private String batch;

    public static void main(String[] args) {
        SearchLocParam searchLocParam = new SearchLocParam();
        searchLocParam.setIoType(1);

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

@@ -531,13 +531,12 @@
        }

        // 空桶出库信号
        OperateResultExOne<byte[]> readCall = siemensS7Net.Read("DB102", (short) 4);
        OperateResultExOne<byte[]> readCall = siemensS7Net.Read("DB102.0", (short) 18);
        if (readCall.IsSuccess){
            Integer isNeed = siemensS7Net.getByteTransform().TransInt32(result.Content,  0); // IBC要桶信号
            Integer isFinish = siemensS7Net.getByteTransform().TransInt32(result.Content, 2); // IBC灌装完成信号
            Integer weight = siemensS7Net.getByteTransform().TransInt32(result.Content, 4); // IBC灌装重里
            Integer isAHalf = siemensS7Net.getByteTransform().TransInt32(result.Content, 6); // IBC半桶标记

            isCalled = isNeed;
            isFinish = isFinish;
            weight = weight;