自动化立库仓库-WCS系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
Junjie
2023-12-25 2dc3f0507d6e883d16b1c3c095ca06455a6fa1a7 
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java


@@ -1,11 +1,11 @@


package com.zy.asrs.service.impl;




import com.alibaba.fastjson.JSON;


import com.alibaba.fastjson.JSONArray;


import com.alibaba.fastjson.JSONObject;


import com.baomidou.mybatisplus.mapper.EntityWrapper;


import com.baomidou.mybatisplus.mapper.Wrapper;


import com.core.common.Cools;


import com.core.common.SpringUtils;


import com.core.exception.CoolException;


import com.zy.asrs.entity.*;


import com.zy.asrs.mapper.*;


@@ -37,8 +37,6 @@




import java.util.*;


import java.util.stream.Collectors;




import static com.zy.asrs.utils.Utils.isJson;




/**


 * 立体仓库WCS系统主流程业务


@@ -106,7 +104,7 @@


    @Autowired


    private RedisUtil redisUtil;


    @Autowired


    private WrkMastLocMapper wrkMastLocMapper;


    private WrkMastLogMapper wrkMastLogMapper;


    @Autowired


    private BasLiftOptService basLiftOptService;


    @Autowired


@@ -241,7 +239,7 @@


                        param.setLocType1(locTypeDto.getLocType1());


                        String response = new HttpHandler.Builder()


                                .setUri(wmsUrl)


                                .setPath("/rpc/pakin/loc/v1")


                                .setPath("/rpc/pakin/loc/v2")


                                .setJson(JSON.toJSONString(param))


                                .build()


                                .doPost();


@@ -280,7 +278,7 @@


                                    ledThread.setLedMk(false);


                                }


                            }


                            News.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);


                            News.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v2", JSON.toJSONString(param), response);


                        } else if (code == 700) {


//                            staProtocol.setWorkNo((short) 32002);


//                            staProtocol.setRollback102(1);//102站回退信号


@@ -470,11 +468,11 @@


//                        }


//                        //*********************同库位组校验*********************




                        // 保存工作主档历史档


                        if (wrkMastMapper.saveWrkMastLog(wrkMast.getWrkNo()) == 0) {


                            News.info(wrkMast.getWrkNo() + "保存工作主档历史档失败");


                            continue;


                        }


//                        // 保存工作主档历史档


//                        if (wrkMastMapper.saveWrkMastLog(wrkMast.getWrkNo()) == 0) {


//                            News.info(wrkMast.getWrkNo() + "保存工作主档历史档失败");


//                            continue;


//                        }




                        try {


                            LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());//源库位


@@ -483,6 +481,7 @@


                            param.setBarcode(wrkMast.getBarcode());


                            param.setIoType(wrkMast.getIoType());


                            param.setSourceStaNo(pickSta.getStaNo());


                            param.setLiftNo(pickSta.getLiftNo());


                            param.setLocType1(locMast.getLocType1());


                            String response = new HttpHandler.Builder()


                                    .setUri(wmsUrl)


@@ -495,28 +494,28 @@


                            if (code.equals(200)) {


                                StartupDto dto = jsonObject.getObject("data", StartupDto.class);




                                //获取回库提升机目标站


                                LiftStaProtocol liftStaProtocol = NyLiftUtils.getLiftStaByLev(pickSta.getLiftNo(), Utils.getLev(dto.getLocNo()));


                                if (liftStaProtocol == null) {


                                    News.info(wrkMast.getWrkNo() + "获取回库提升机目标站失败");


                                    continue;


                                }




                                // 更新工作档数据状态


                                wrkMast.setIoType(wrkMast.getIoType() - 50); // 入出库类型: 103->53,104->54


                                wrkMast.setWrkSts(2L); // 工作状态: 2.设备上走


                                wrkMast.setSourceStaNo(dto.getSourceStaNo()); // 源站


                                wrkMast.setStaNo(liftStaProtocol.getStaNo());//目标站


                                wrkMast.setLocNo(dto.getLocNo()); // 目标库位


                                wrkMast.setShuttleNo(null); // 穿梭车清空


                                wrkMast.setLiftNo(null);// 提升机清空


                                wrkMast.setModiTime(new Date());


                                if (wrkMastMapper.updateById(wrkMast) == 0) {


                                    News.info(wrkMast.getWrkNo() + "更新工作档数据状态失败");


                                    continue;


                                }


//                                //获取回库提升机目标站


//                                LiftStaProtocol liftStaProtocol = NyLiftUtils.getLiftStaByLev(pickSta.getLiftNo(), Utils.getLev(dto.getLocNo()));


//                                if (liftStaProtocol == null) {


//                                    News.info(wrkMast.getWrkNo() + "获取回库提升机目标站失败");


//                                    continue;


//                                }


//


//                                // 更新工作档数据状态


//                                wrkMast.setIoType(wrkMast.getIoType() - 50); // 入出库类型: 103->53,104->54


//                                wrkMast.setWrkSts(2L); // 工作状态: 2.设备上走


//                                wrkMast.setSourceStaNo(dto.getSourceStaNo()); // 源站


//                                wrkMast.setStaNo(liftStaProtocol.getStaNo());//目标站


//                                wrkMast.setLocNo(dto.getLocNo()); // 目标库位


//                                wrkMast.setShuttleNo(null); // 穿梭车清空


//                                wrkMast.setLiftNo(null);// 提升机清空


//                                wrkMast.setModiTime(new Date());


//                                if (wrkMastMapper.updateById(wrkMast) == 0) {


//                                    News.info(wrkMast.getWrkNo() + "更新工作档数据状态失败");


//                                    continue;


//                                }


                            } else if (code == 500) {


                                News.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);


                                News.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v2", JSON.toJSONString(param), response);


                            }


                        } catch (Exception e) {


                            e.printStackTrace();


@@ -619,11 +618,11 @@


                            continue;


                        }




                        // 保存工作主档历史档


                        if (wrkMastMapper.saveWrkMastLog(wrkMast.getWrkNo()) == 0) {


                            News.info(wrkMast.getWrkNo() + "保存工作主档历史档失败");


                            continue;


                        }


//                        // 保存工作主档历史档


//                        if (wrkMastMapper.saveWrkMastLog(wrkMast.getWrkNo()) == 0) {


//                            News.info(wrkMast.getWrkNo() + "保存工作主档历史档失败");


//                            continue;


//                        }




                        //盘点找新库位


                        try {


@@ -633,6 +632,7 @@


                            param.setBarcode(wrkMast.getBarcode());


                            param.setIoType(107);//盘点


                            param.setSourceStaNo(pickSta.getStaNo());


                            param.setLiftNo(pickSta.getLiftNo());


                            param.setLocType1(locMast.getLocType1());


                            String response = new HttpHandler.Builder()


                                    .setUri(wmsUrl)


@@ -645,32 +645,32 @@


                            if (code.equals(200)) {


                                StartupDto dto = jsonObject.getObject("data", StartupDto.class);




                                //获取回库提升机目标站


                                LiftStaProtocol liftStaProtocol = NyLiftUtils.getLiftStaByLev(pickSta.getLiftNo(), Utils.getLev(dto.getLocNo()));


                                if (liftStaProtocol == null) {


                                    News.info(wrkMast.getWrkNo() + "获取回库提升机目标站失败");


                                    continue;


                                }




                                // 更新工作档数据状态


                                wrkMast.setIoType(wrkMast.getIoType() - 50); // 入出库类型: 107->57


                                wrkMast.setWrkSts(2L); // 工作状态: 2.设备上走


                                wrkMast.setSourceStaNo(dto.getSourceStaNo()); // 源站


                                wrkMast.setStaNo(liftStaProtocol.getStaNo());//目标站


                                wrkMast.setLocNo(dto.getLocNo()); // 目标库位


                                wrkMast.setShuttleNo(null); // 穿梭车清空


                                wrkMast.setLiftNo(null);// 提升机清空


                                wrkMast.setModiTime(new Date());


                                if (wrkMastMapper.updateById(wrkMast) == 0) {


                                    News.info(wrkMast.getWrkNo() + "更新工作档数据状态失败");


                                    continue;


                                }


//                                //获取回库提升机目标站


//                                LiftStaProtocol liftStaProtocol = NyLiftUtils.getLiftStaByLev(pickSta.getLiftNo(), Utils.getLev(dto.getLocNo()));


//                                if (liftStaProtocol == null) {


//                                    News.info(wrkMast.getWrkNo() + "获取回库提升机目标站失败");


//                                    continue;


//                                }


//


//                                // 更新工作档数据状态


//                                wrkMast.setIoType(wrkMast.getIoType() - 50); // 入出库类型: 107->57


//                                wrkMast.setWrkSts(2L); // 工作状态: 2.设备上走


//                                wrkMast.setSourceStaNo(dto.getSourceStaNo()); // 源站


//                                wrkMast.setStaNo(liftStaProtocol.getStaNo());//目标站


//                                wrkMast.setLocNo(dto.getLocNo()); // 目标库位


//                                wrkMast.setShuttleNo(null); // 穿梭车清空


//                                wrkMast.setLiftNo(null);// 提升机清空


//                                wrkMast.setModiTime(new Date());


//                                if (wrkMastMapper.updateById(wrkMast) == 0) {


//                                    News.info(wrkMast.getWrkNo() + "更新工作档数据状态失败");


//                                    continue;


//                                }




//                                staProtocol.setStaNo(dto.getSourceStaNo().shortValue());//写入目标站


//                                MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));




                            } else if (code == 500) {


                                News.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);


                                News.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v2", JSON.toJSONString(param), response);


                            }


                        } catch (Exception e) {


                            e.printStackTrace();


@@ -1390,7 +1390,7 @@


                        if (wrkMastMapper.updateById(wrkMast) > 0) {


                            if (wrkMast.getWrkSts() == 111) {


                                // 保存工作主档历史档


                                if (wrkMastLocMapper.save(wrkMast.getWrkNo()) <= 0) {


                                if (wrkMastLogMapper.save(wrkMast.getWrkNo()) <= 0) {


                                    log.info("保存工作历史档[workNo={0}]失败", wrkMast.getWrkNo());


                                }


                                // 删除工作主档


@@ -1612,8 +1612,12 @@


            NyLiftCommand liftCommand = NyLiftUtils.getLiftCommand(liftProtocol.getLiftNo().intValue(), NyLiftTaskModelType.MOVE_TRAY.id, startSta, targetSta, wrkMast.getWrkNo());


            if (wrkMast.getIoType() == 53 || wrkMast.getIoType() == 57) {


                //拣料再回库，重新分配设备工作号


                Random random = new Random();


                int deviceWrk = Math.abs((liftCommand.getTaskNo().intValue() + random.nextInt(9999)));//获取设备工作号


                int deviceWrk = commonService.getWorkNo(8);//生成提升机设备工作号


                BasLiftOpt basLiftOpt = basLiftOptService.selectByDeviceWrk(String.valueOf(deviceWrk), liftThread.getSlave().getId());


                if (basLiftOpt != null) {


                    News.info("{}任务，{}号提升机，设备工作号出现重复情况，请联系技术人员支持。", wrkMast.getWrkNo(), liftProtocol.getLiftNo());


                    return false;


                }


                liftCommand.setTaskNo((short) deviceWrk);


            }


            ArrayList<NyLiftCommand> commands = new ArrayList<>();


@@ -1680,6 +1684,16 @@


                    News.info("{}任务，{}小车，小车在输送站点调度小车避让失败", wrkMast.getWrkNo(), shuttleProtocol.getShuttleNo());


                    return false;


                }


            }




            if (!basDevp.getAutoing().equals("Y")) {


                News.info("{}任务，{}站点，没有自动信号，禁止派发", wrkMast.getWrkNo(), basDevp.getDevNo());


                return false;//出库站点不可出


            }




            if (basDevp.getLoading().equals("Y")) {


                News.info("{}任务，{}站点，存在有物信号，禁止派发", wrkMast.getWrkNo(), basDevp.getDevNo());


                return false;//出库站点不可出


            }




            if (!basDevp.getOutEnable().equals("Y")) {


@@ -1766,10 +1780,13 @@


                        && liftProtocol.getTaskNo() != 0


                        && !liftProtocol.getBusy()


                ) {


                    BasLiftOpt basLiftOpt = basLiftOptService.selectByDeviceWrk(liftProtocol.getTaskNo().toString());


                    int taskNo = liftProtocol.getTaskNo().intValue();


                    if (basLiftOpt != null) {


                        taskNo = basLiftOpt.getWrkNo();


                    if (taskNo >= 20000 && taskNo <= 30000) {


                        //提升机设备工作号，需要查询对应任务号


                        BasLiftOpt basLiftOpt = basLiftOptService.selectByDeviceWrk(liftProtocol.getTaskNo().toString(), liftSlave.getId());


                        if (basLiftOpt != null) {


                            taskNo = basLiftOpt.getWrkNo();


                        }


                    }




                    //将任务档标记为完成


@@ -1794,6 +1811,7 @@


                                        wrkMast.setWrkSts(29L);


                                        wrkMast.setShuttleNo(null);//释放小车


                                        wrkMast.setLiftNo(null);//释放提升机


                                        wrkMast.setModiTime(new Date());


                                    }


                                }




@@ -2446,7 +2464,7 @@


//                        param.setLocType1(locTypeDto.getLocType1());


                            String response = new HttpHandler.Builder()


                                    .setUri(wmsUrl)


                                    .setPath("/rpc/pakin/loc/v1")


                                    .setPath("/rpc/pakin/loc/v2")


                                    .setJson(JSON.toJSONString(param))


                                    .build()


                                    .doPost();


@@ -2470,7 +2488,7 @@


                                        MessageQueue.offer(SlaveType.Led, emptyInSta.getLed(), new Task(3, errorMsg));


                                    }


                                }


                                News.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);


                                News.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v2", JSON.toJSONString(param), response);


                            }


                        } catch (Exception e) {


                            e.printStackTrace();


@@ -2817,6 +2835,7 @@


                List<LedCommand> commands = new ArrayList<>();


                // 工作档集合


                List<WrkMast> wrkMasts = new ArrayList<>();


                List<WrkMastLog> wrkMastLogs = new ArrayList<>();


                for (Integer staNo : led.getStaArr()) {


                    // 获取叉车站点


                    StaProtocol staProtocol = devpThread.getStation().get(staNo);


@@ -2827,16 +2846,41 @@


                    }


                    // 获取工作档数据


                    WrkMast wrkMast = wrkMastMapper.selectById(staProtocol.getWorkNo());


                    if (null == wrkMast || wrkMast.getWrkSts() < 14 || wrkMast.getIoType() < 100) {


                        continue;


                    Integer wrkNo = staProtocol.getWorkNo().intValue();


                    Integer ioType = null;


                    String sourceLocNo = null;


                    String locNo = null;


                    Integer wrkStaNo = null;


                    String barcode = null;


                    if (wrkMast == null) {


                        //查询历史档


                        WrkMastLog wrkMastLog = wrkMastLogMapper.selectLatestByWorkNo(staProtocol.getWorkNo().intValue());


                        if (wrkMastLog == null) {


                            continue;


                        }


                        ioType = wrkMastLog.getIoType();


                        sourceLocNo = wrkMastLog.getSourceLocNo();


                        locNo = wrkMastLog.getLocNo();


                        wrkStaNo = wrkMastLog.getStaNo();


                        barcode = wrkMastLog.getBarcode();


                        wrkMastLogs.add(wrkMastLog);


                    }else {


                        if (wrkMast.getWrkSts() < 14 || wrkMast.getIoType() < 100) {


                            continue;


                        }


                        ioType = wrkMast.getIoType();


                        sourceLocNo = wrkMast.getSourceLocNo();


                        locNo = wrkMast.getLocNo();


                        wrkStaNo = wrkMast.getStaNo();


                        barcode = wrkMast.getBarcode();


                        wrkMasts.add(wrkMast);


                    }


                    wrkMasts.add(wrkMast);


                    // 组装命令


                    LedCommand ledCommand = new LedCommand();


                    ledCommand.setWorkNo(wrkMast.getWrkNo());


                    ledCommand.setIoType(wrkMast.getIoType());


                    ledCommand.setWorkNo(wrkNo);


                    ledCommand.setIoType(ioType);


                    // 出库模式


                    switch (wrkMast.getIoType()) {


                    switch (ioType) {


                        case 101:


                            ledCommand.setTitle("全板出库");


                            break;


@@ -2854,17 +2898,17 @@


                            ledCommand.setEmptyMk(true);


                            break;


                        default:


                            News.error("任务入出库类型错误！！！[工作号：{}] [入出库类型：{}]", wrkMast.getWrkNo(), wrkMast.getIoType());


                            News.error("任务入出库类型错误！！！[工作号：{}] [入出库类型：{}]", wrkNo, ioType);


                            break;


                    }


                    ledCommand.setSourceLocNo(wrkMast.getSourceLocNo());


                    ledCommand.setLocNo(wrkMast.getLocNo());


                    ledCommand.setStaNo(wrkMast.getStaNo());


                    ledCommand.setBarcode(wrkMast.getBarcode());


                    if (wrkMast.getIoType() != 110 && wrkMast.getIoType() != 10) {


                        List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getSourceLocNo()));


                    ledCommand.setSourceLocNo(sourceLocNo);


                    ledCommand.setLocNo(locNo);


                    ledCommand.setStaNo(wrkStaNo);


                    ledCommand.setBarcode(barcode);


                    if (ioType != 110 && ioType != 10) {


                        List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", sourceLocNo));


                        locDetls.forEach(locDetl -> {


                            Wrapper<WrkDetl> wrapper = new EntityWrapper<WrkDetl>().eq("matnr", locDetl.getMatnr()).eq("wrk_no", wrkMast.getWrkNo());


                            Wrapper<WrkDetl> wrapper = new EntityWrapper<WrkDetl>().eq("matnr", locDetl.getMatnr()).eq("wrk_no", wrkNo);


                            Utils.wapperSetCondition(wrapper, "batch", locDetl.getBatch());


                            Utils.wapperSetCondition(wrapper, "three_code", locDetl.getThreeCode());


                            Utils.wapperSetCondition(wrapper, "dead_time", locDetl.getDeadTime());


@@ -2894,24 +2938,34 @@




                        });




                        if (ioType == 107) {


                            locDetls = new ArrayList<>();


                            ledCommand.setMatDtos(new ArrayList<>());


                        }




                        if (locDetls.isEmpty()) {


                            List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));


                            List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkNo));


                            wrkDetls.forEach(wrkDetl -> {


                                ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), wrkDetl.getAnfme(), wrkDetl.getSpecs(), wrkDetl.getSuppCode()));


                            });




                            if (wrkDetls.isEmpty()) {//从历史档查询


                                List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectLatestByWorkNo(wrkMast.getWrkNo());


                                wrkDetlLogs.forEach(wrkDetl -> {


                                    ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(), wrkDetl.getAnfme(), wrkDetl.getSpecs(), wrkDetl.getSuppCode()));


                                });


                                List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectLatestByWorkNo(wrkNo, barcode);


                                for (WrkDetlLog wrkDetlLog : wrkDetlLogs) {


                                    ledCommand.getMatDtos().add(new MatDto(wrkDetlLog.getMatnr(), wrkDetlLog.getMaktx(), wrkDetlLog.getAnfme(), wrkDetlLog.getAnfme(), wrkDetlLog.getSpecs(), wrkDetlLog.getSuppCode()));


                                }


                            }


                        }


                    }




                    commands.add(ledCommand);


                }


                Set<Integer> workNos = wrkMasts.stream().map(WrkMast::getWrkNo).collect(Collectors.toSet());


                Set<Integer> workNos = null;


                if (!wrkMasts.isEmpty()) {


                    workNos = wrkMasts.stream().map(WrkMast::getWrkNo).collect(Collectors.toSet());


                }else {


                    workNos = wrkMastLogs.stream().map(WrkMastLog::getWrkNo).collect(Collectors.toSet());


                }


                // 获取LED线程


                LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, led.getId());


                // 相同工作号集合则过滤


@@ -3350,6 +3404,17 @@




            //获取小车到输送站点行走命令


            NyShuttleOperaResult result = NyShuttleOperaUtils.getStartToTargetCommands(shuttleThread.getSlave().getId(), wrkMast.getWrkNo(), shuttleProtocol.getCurrentLocNo(), liftSta.getLocNo(), NavigationMapType.NORMAL.id);


            if (result == null) {


                //路径获取失败，需要解锁上面锁定的路径


                //尝试解锁目标站路径


                boolean result3 = navigateMapUtils.writeNavigateNodeToRedisMap(Utils.getLev(wrkMast.getLocNo()), targetNodes, false);//所使用的路径进行解锁


                if (!result3) {


                    News.info("{}任务，{}小车，路径解锁失败", wrkMast.getWrkNo(), shuttleProtocol.getShuttleNo());


                    return false;//路径解锁失败


                }


                News.info("{}任务，{}小车，路径计算失败", wrkMast.getWrkNo(), shuttleProtocol.getShuttleNo());


                return false;//路径解锁失败


            }


            List<NyShuttleHttpCommand> commands = result.getCommands();




            ShuttleAssignCommand assignCommand = new ShuttleAssignCommand();


@@ -3466,8 +3531,12 @@


                //获取提升机命令，调度提升机到源站位置


                NyLiftCommand liftCommand = NyLiftUtils.getLiftCommand(liftProtocol.getLiftNo().intValue(), NyLiftTaskModelType.MOVE_CAR.id, sourceLiftSta.getStaNo(), sourceLiftSta.getStaNo(), wrkMast.getWrkNo());




                Random random = new Random();


                int deviceWrk = Math.abs((liftCommand.getTaskNo().intValue() + random.nextInt(9999)));//获取设备工作号


                int deviceWrk = commonService.getWorkNo(8);//生成提升机设备工作号


                BasLiftOpt basLiftOpt = basLiftOptService.selectByDeviceWrk(String.valueOf(deviceWrk), liftThread.getSlave().getId());


                if (basLiftOpt != null) {


                    News.info("{}任务，{}号提升机，设备工作号出现重复情况，请联系技术人员支持。", wrkMast.getWrkNo(), liftProtocol.getLiftNo());


                    return false;


                }


                liftCommand.setTaskNo((short) deviceWrk);//更换随机任务号




                ArrayList<NyLiftCommand> commands = new ArrayList<>();


@@ -3828,7 +3897,7 @@




                if (wrkMast.getWrkSts() == 111) {


                    // 保存工作主档历史档


                    if (wrkMastLocMapper.save(wrkMast.getWrkNo()) <= 0) {


                    if (wrkMastLogMapper.save(wrkMast.getWrkNo()) <= 0) {


                        log.info("保存工作历史档[workNo={0}]失败", wrkMast.getWrkNo());


                    }


                    // 删除工作主档