#

zjj

2024-12-24 cf12c622c420d9ba18ffccd1ef16af3dacf329e0

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

@@ -1079,10 +1079,10 @@
//            WrkMast wrkMast = wrkMastMapper.selectPakOutStep1(slave.getId(), crnStn.getStaNo());
            List<WrkMast> wrkMasts = wrkMastMapper.selectPakOutStep11(slave.getId(), crnStn.getStaNo());
            //            获取工作状态为14的工作档
            WrkMast wrkMast1 = wrkMastMapper.selectPakOutStep14(slave.getId(), crnStn.getStaNo());
            if ( wrkMast1 !=null) {
                continue;
            }
//            WrkMast wrkMast1 = wrkMastMapper.selectPakOutStep14(slave.getId(), crnStn.getStaNo());
//            if ( wrkMast1 !=null) {
//                continue;
//            }
            for (WrkMast wrkMast : wrkMasts) {
                if (wrkMast == null) {
                    continue;
@@ -2907,7 +2907,7 @@
                        if (inStn.getSourcePlcId() == 4 || inStn.getSourcePlcId() ==5){ //灌装站需要获取输送线物料代码
                            matnr = staProtocol.getMatnr();
                            batch = staProtocol.getBatch();
                            anfme = Cools.isEmpty(staProtocol.getAnfme()) ? anfme:staProtocol.getAnfme().shortValue();
                            anfme = (Cools.isEmpty(staProtocol.getAnfme()) || staProtocol.getAnfme()==0) ? anfme:staProtocol.getAnfme().shortValue();
                            weight11 = staProtocol.getWeight1();
                            weight = weight11;
                            String memoBool = staProtocol.isBan()? "存在":"不存在";
@@ -3035,7 +3035,8 @@
                            if (inStn.getSourcePlcId() == 4){
                                matnr2 = staProtocol.getMatnr();
                                batch2 = staProtocol.getBatch();
                                anfme2 = Cools.isEmpty(staProtocol.getAnfme2()) ? anfme2:staProtocol.getAnfme2().shortValue();
                                anfme2 = (Cools.isEmpty(staProtocol.getAnfme2()) || staProtocol.getAnfme2()==0) ? anfme2:staProtocol.getAnfme2().shortValue();

                                weight11 = staProtocol.getWeight1();
                                weight2 = weight11;
                                String memoBool = staProtocol.isBan()? "存在":"不存在";
@@ -3140,7 +3141,7 @@
                                    wrkMast.setWrkSts(14L);
                                    wrkMast.setModiTime(date);
                                    wrkMastService.updateById(wrkMast);
                                } else if (wrkMast.getIoType()==199){
                                } else if (wrkMast.getIoType()==199 && rgvSlave.getId()==3 && (wrkMast.getStaNo()==3007 || wrkMast.getStaNo()==3012)){
                                    Date date = new Date();
                                    wrkMast.setWrkSts(105L);
                                    wrkMast.setModiTime(date);
@@ -3668,6 +3669,7 @@
                            }

                        } catch (Exception e) {
                            log.error(""+e);
                            e.printStackTrace();
                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                        }