自动化立库仓库-WCS系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
#
luxiaotao1123
2020-12-30 ed1da6c8a6f697b00b0d44b4257c0b288ce293d3 
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java


@@ -728,7 +728,11 @@


                    if (latest == null) {


                        if (crnProtocol.getAlarm1() != null && crnProtocol.getAlarm1() > 0) {


                            WrkMast wrkMast = wrkMastMapper.selectById(crnProtocol.getTaskNo());


                            BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm1());


                            if (wrkMast == null) {


                                continue;


                            }


                            BasCrnError crnError = basCrnErrorMapper.selectById(crn.getId()==2?(crnProtocol.getAlarm1()+1000):crnProtocol.getAlarm1());


                            String errName = crnError==null? String.valueOf(crnProtocol.getAlarm1()):crnError.getErrName();


                            BasErrLog basErrLog = new BasErrLog(


                                    null,    // 编号


                                    wrkMast.getWrkNo(),    // 工作号


@@ -744,7 +748,7 @@


                                    wrkMast.getSourceLocNo(),    // 源库位


                                    wrkMast.getBarcode(),    // 条码


                                    crnProtocol.getAlarm1().intValue(),    // 异常码


                                    crnError.getErrName(),    // 异常


                                    errName,    // 异常


                                    1,    // 异常情况


                                    now,    // 添加时间


                                    null,    // 添加人员


@@ -774,7 +778,7 @@


                    if (crnProtocol.getAlarm1() != null && crnProtocol.getAlarm1() > 0) {


                        // 记录新异常


                        if (latest == null || (latest.getErrCode() != crnProtocol.getAlarm1().intValue())) {


                            BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm1());


                            BasCrnError crnError = basCrnErrorMapper.selectById(crn.getId()==2?(crnProtocol.getAlarm1()+1000):crnProtocol.getAlarm1());


                            String errName = crnError==null? String.valueOf(crnProtocol.getAlarm1()):crnError.getErrName();


                            BasErrLog basErrLog = new BasErrLog(


                                    null,    // 编号