自动化立体仓库 - WMS系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
pang.jiabao
2025-03-26 5dac37cde0205be965c2b74dd1bddefc7f9cceda 
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java


@@ -12,7 +12,10 @@


import com.zy.asrs.entity.param.FullStoreParam;


import com.zy.asrs.entity.param.LocDetlAdjustParam;


import com.zy.asrs.entity.param.StockOutParam;


import com.zy.asrs.mapper.LocMastMapper;


import com.zy.asrs.entity.result.FindLocNoAttributeVo;


import com.zy.asrs.service.*;


import com.zy.asrs.utils.OrderInAndOutUtil;


import com.zy.asrs.utils.Utils;


import com.zy.common.model.*;


import com.zy.common.model.enums.IoWorkType;


@@ -25,6 +28,7 @@


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;




import javax.annotation.Resource;


import java.util.*;


import java.util.concurrent.TimeUnit;


import java.util.stream.Collectors;


@@ -78,6 +82,18 @@


    @Autowired


    private WaitPakinService waitPakinService;




    @Autowired


    private LocOwnerService locOwnerService;




    @Autowired


    private ManLocDetlService manLocDetlService;




    @Resource


    private LocMastMapper locMastMapper;




    @Resource


    private OrderPakoutService orderPakOutService;




    @Override


    @Transactional


    public String startupFullPutStore(FullStoreParam param, Long userId) {


@@ -90,9 +106,13 @@


        BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getDevpNo(), true);


        // 检索库位


        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);


        List<String> matnrs = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatnr).distinct().collect(Collectors.toList());


        List<String> batchs = param.getList().stream().map(FullStoreParam.MatCodeStore::getBatch).distinct().collect(Collectors.toList());


        StartupDto dto = commonService.getLocNo(1, param.getDevpNo(), matnrs.get(0), batchs.get(0), null,locTypeDto);


//        List<String> matnrs = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatnr).distinct().collect(Collectors.toList());


//        List<String> batchs = param.getList().stream().map(FullStoreParam.MatCodeStore::getBatch).distinct().collect(Collectors.toList());


        FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(param.getList().get(0));


        StartupDto dto = commonService.getLocNo(1, param.getDevpNo(), findLocNoAttributeVo,locTypeDto);


        if (Cools.isEmpty(dto)){


            throw new CoolException("查询库位失败！！==》startupFullPutStore ==》 commonService.getLocNo");


        }


        // 生成工作号


        int workNo = dto.getWorkNo();


        // 生成工作档


@@ -123,9 +143,9 @@


        // 生成工作档明细


        List<DetlDto> detlDtos = new ArrayList<>();


        param.getList().forEach(elem -> {


            DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());


            DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(),elem.getBrand(),elem.getStandby1(),elem.getStandby2(),elem.getStandby3(),elem.getBoxType1(),elem.getBoxType2(),elem.getBoxType3(), elem.getAnfme());


            if (DetlDto.has(detlDtos, detlDto)) {


                DetlDto detlDto1 = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());


                DetlDto detlDto1 = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch(),detlDto.getBrand(),detlDto.getStandby1(),detlDto.getStandby2(),detlDto.getStandby3(),detlDto.getBoxType1(),detlDto.getBoxType2(),detlDto.getBoxType3());


                assert detlDto1 != null;


                detlDto1.setAnfme(detlDto1.getAnfme() + detlDto.getAnfme());


            } else {


@@ -164,11 +184,18 @@


        List<LocDetlDto> locDetlDtos = new ArrayList<>();


        for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {


            if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getCount())) {


                LocDetl one = locDetlService.selectItem(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getBatch());


                LocDetl one = locDetlService.selectItem(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getBatch(),paramLocDetl.getBrand()


                        ,paramLocDetl.getStandby1(),paramLocDetl.getStandby2(),paramLocDetl.getStandby3(),paramLocDetl.getBoxType1(),paramLocDetl.getBoxType2(),paramLocDetl.getBoxType3());


                if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount()));


            }


        }


        if (!locDetlDtos.isEmpty()) {


            // 库位号集合


            List<String> locNoList = param.getLocDetls().stream().map(StockOutParam.LocDetl::getLocNo).distinct().collect(Collectors.toList());


            String firstFrozenLocNo = locMastMapper.findFirstFrozenLocNo(locNoList);


            if (firstFrozenLocNo != null) {


                throw new CoolException(firstFrozenLocNo + "库位已被冻结!");


            }


            LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetlDtos.get(0).getLocDetl().getLocNo()));


            if (locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D") ){


                // 启动出库开始 101.出库


@@ -178,6 +205,84 @@


            }


        } else {


            throw new CoolException("库存不存在");


        }


    }




    @Override


    @Transactional


    public void turnOverOut(EmptyPlateOutParam param, Long userId) {


        try {


            if (Cools.isEmpty(param.getOwnerId())) {


                throw new CoolException("客户名称不能为空");


            }else if (param.getLocDetls().size()<=0){


                throw new CoolException("请提取明细");


            }


            ArrayList<String> locNos = new ArrayList<>();


            String[][] locNos2 =new String[param.getLocDetls().size()][4];


            int i=0;


            for (EmptyPlateOutParam.LocDetl locDetl : param.getLocDetls()){


                if (!locNos.contains(locDetl.getLoc_no())){


                    locNos.add(locDetl.getLoc_no());


                    locNos2[i][0]=locDetl.getLoc_no();


                    locNos2[i][1]=locDetl.getManu();


                    locNos2[i][2] = locDetl.getMatnr();


                    locNos2[i][3] = locDetl.getBatch();


                    i++;


                }


            }


            LocOwner locOwner = locOwnerService.selectById(param.getOwnerId());


            param.setOwner(locOwner.getOwner());


            String lgort = "";


            String owner="";


            List<DetlDto> detlDtos = new ArrayList<>();


            for (String[] locNo1 : locNos2) {


                String locNo = locNo1[0];


                if (locNo1[1].equals("平库")){


                    List<ManLocDetl> manLocDetls = new ArrayList<>();


                    if (locNo1[3] == null){


                        manLocDetls = manLocDetlService.selectList(new EntityWrapper<ManLocDetl>().eq("loc_no", locNo).eq("matnr",locNo1[2]));


                    }else {


                        manLocDetls = manLocDetlService.selectList(new EntityWrapper<ManLocDetl>().eq("loc_no", locNo).eq("matnr",locNo1[2]).eq("batch",locNo1[3]));


                    }


                    for (ManLocDetl manLocDetl:manLocDetls){


                        if (Cools.isEmpty(owner)) {


                            owner = manLocDetl.getOwner$();


                        }


//                        detlDtos.add(new DetlDto(manLocDetl.getMatnr(), manLocDetl.getBatch(),manLocDetl.getBrand(),


//                                manLocDetl.getStandby1(),manLocDetl.getStandby2(),manLocDetl.getStandby3(),


//                                manLocDetl.getBoxType1(),manLocDetl.getBoxType2(),manLocDetl.getBoxType3(), manLocDetl.getAnfme()));


                        manLocDetl.setOwner(param.getOwnerId());


                        try{


                            manLocDetlService.update(manLocDetl,new EntityWrapper<ManLocDetl>().eq("loc_no", locNo).eq("matnr",manLocDetl.getMatnr()));


                        }catch (Exception e){


                            throw new Exception("更新库存明细拥有者字段信息出错了");


                        }


                    }


                }else if (locNo1[1].equals("立库")){


                    List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locNo).eq("matnr",locNo1[2]).eq("batch",locNo1[3]));


                    for (LocDetl locDetl:locDetls){


                        if (Cools.isEmpty(lgort)) {


                            lgort = locDetl.getOrigin();


                        }


                        if (Cools.isEmpty(owner)) {


                            owner = locDetl.getOwner$();


                        }


                        detlDtos.add(new DetlDto(locDetl.getMatnr(), locDetl.getBatch(),locDetl.getBrand(),


                                locDetl.getStandby1(),locDetl.getStandby2(),locDetl.getStandby3(),


                                locDetl.getBoxType1(),locDetl.getBoxType2(),locDetl.getBoxType3(), locDetl.getAnfme()));


                        locDetl.setOwner(param.getOwnerId());


                        try{


                            locDetlService.update(locDetl,new EntityWrapper<LocDetl>().eq("loc_no", locNo).eq("matnr",locDetl.getMatnr()));


                        }catch (Exception e){


                            throw new Exception("更新库存明细拥有者字段信息出错了");


                        }


                    }


                }else {


                    throw new Exception("更新库位拥有者字段信息出错了");


                }


            }


        }catch (Exception e){


            throw new CoolException("移交作业出错了："+e);


        }


    }




@@ -294,8 +399,10 @@


        }


        // 获取库位


        LocMast locMast = locMastService.selectById(taskDto.getLocNo());


        // 获取路径


        int ioType = taskDto.isAll() ? 101 : 103;


        // 判断是否是盘点单


        String orderNo = taskDto.getLocDtos().get(0).getOrderNo();


        OrderPakout orderPakout = orderPakOutService.selectByNo(orderNo);


        int ioType = orderPakout.getDocType() == 8 ? 107 : (taskDto.isAll() ? 101 : 103);


        StaDesc staDesc = staDescService.queryCrnStnAuto(ioType, locMast.getCrnNo(), staNo.getDevNo());


        // 生成工作号


        int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));


@@ -326,10 +433,14 @@


        // 生成工作档明细


        for (LocDto locDto : taskDto.getLocDtos()) {


            if (locDto.getAnfme()==null || locDto.getAnfme() <= 0.0D) { continue; }


            OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch());


            if (orderDetl == null) {


                orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null);


            }


//            OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch());


            OrderDetl orderDetl = OrderInAndOutUtil.selectItem(Boolean.FALSE, locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(),locDto.getBrand()


                    ,locDto.getStandby1(),locDto.getStandby2(),locDto.getStandby3(),locDto.getBoxType1(),locDto.getBoxType2(),locDto.getBoxType3());


//            if (orderDetl == null) {


////                orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null);


//                orderDetl = OrderInAndOutUtil.selectItem(Boolean.FALSE, locDto.getOrderNo(), locDto.getMatnr(), null);


//


//            }


            WrkDetl wrkDetl = new WrkDetl();


            wrkDetl.sync(orderDetl);


            wrkDetl.setZpallet(wrkMast.getBarcode());


@@ -345,11 +456,16 @@


            if (!wrkDetlService.insert(wrkDetl)) {


                throw new CoolException("保存工作档明细失败");


            }


            // 修改订单明细


            if (!orderDetlService.increaseWorkQty(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), locDto.getAnfme())) {


                throw new CoolException("修改订单明细数量失败");


            }


            orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);


//            // 修改订单明细


//            if (!orderDetlService.increaseWorkQty(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), locDto.getAnfme())) {


//                throw new CoolException("修改订单明细数量失败");


//            }


//            orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);


            OrderInAndOutUtil.increaseWorkQty(Boolean.FALSE,orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(),


                    orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),


                    orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3()


                    , locDto.getAnfme());


            OrderInAndOutUtil.updateOrder(Boolean.FALSE,orderDetl.getOrderId(), 2L, userId);


        }


        // 修改库位状态:   F.在库 ====>>> R.出库预约/P.拣料/盘点/并板出库中


        locMast = locMastService.selectById(taskDto.getLocNo());


@@ -372,7 +488,9 @@


        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);


        // 检索库位


        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);


        StartupDto dto = commonService.getLocNo( 10, devpNo, null,null,null, locTypeDto);


        FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();




        StartupDto dto = commonService.getLocNo( 10, devpNo, findLocNoAttributeVo, locTypeDto);


        int workNo = dto.getWorkNo();


        Date now = new Date();


        // 生成工作档


@@ -429,6 +547,13 @@


        if (Cools.isEmpty(param.getOutSite())) {


            throw new CoolException("站点不存在");


        }




        // 库位冻结不能出库


        String firstFrozenLocNo = locMastMapper.findFirstFrozenLocNo(param.getLocNos());


        if (firstFrozenLocNo != null) {


            throw new CoolException(firstFrozenLocNo + "库位已被冻结!");


        }




        for (String locNo : param.getLocNos()) {


            // 获取工作号


            int workNo = commonService.getWorkNo(WorkNoType.PAKOUT.type);


@@ -496,7 +621,7 @@


        }


        for (String locNo : param.getLocNos()) {


            // 获取工作号


            int workNo = commonService.getWorkNo(0);


            int workNo = commonService.getWorkNo(2);


            // 获取库位


            LocMast locMast = locMastService.selectById(locNo);


            if (Cools.isEmpty(locMast)) {


@@ -560,11 +685,18 @@


        List<LocDetlDto> locDetlDtos = new ArrayList<>();


        for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {


            if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getCount())) {


                LocDetl one = locDetlService.selectItem(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getBatch());


                LocDetl one = locDetlService.selectItem(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getBatch(),paramLocDetl.getBrand()


                        ,paramLocDetl.getStandby1(),paramLocDetl.getStandby2(),paramLocDetl.getStandby3(),paramLocDetl.getBoxType1(),paramLocDetl.getBoxType2(),paramLocDetl.getBoxType3());


                if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount()));


            }


        }


        if (!locDetlDtos.isEmpty()) {


            // 库位号集合


            List<String> locNoList = param.getLocDetls().stream().map(StockOutParam.LocDetl::getLocNo).distinct().collect(Collectors.toList());


            String firstFrozenLocNo = locMastMapper.findFirstFrozenLocNo(locNoList);


            if (firstFrozenLocNo != null) {


                throw new CoolException(firstFrozenLocNo + "库位已被冻结!");


            }


            LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetlDtos.get(0).getLocDetl().getLocNo()));


            if (locMast.getLocSts().equals("F")){


                // 启动出库开始 107.盘点出库


@@ -589,6 +721,19 @@


        if (Cools.isEmpty(loc)){


            throw new CoolException("未找到库位");


        }


        // 判断库位是否冻结


        String sourceLocFrozen = locMastMapper.findFirstFrozenLocNo(Arrays.asList(sourceLoc.getLocNo(),loc.getLocNo()));


        if (sourceLocFrozen != null) {


            throw new CoolException(sourceLocFrozen + "库位已被冻结!");


        }




        // 判断库存是否冻结


        Optional<LocDetl> first = locDetls.stream().filter(locDetl -> locDetl.getFrozen() == 1).findFirst();


        if (first.isPresent()) {


            LocDetl locDetl = first.get();


            throw new CoolException(locDetl.getLocNo() + "," + locDetl.getMatnr() + "," + locDetl.getBatch() + "库存明细已被冻结!");


        }




        if (!loc.getLocSts().equals("O") || (!sourceLoc.getLocSts().equals("F") && !sourceLoc.getLocSts().equals("D"))){


            throw new CoolException("库位状态已改变");


        }


@@ -707,6 +852,31 @@




        List<LocDetlAdjustParam.LocDetlAdjust> list = param.getList();




        // 添加历史工作主档


        WrkMastLog wrkMast = new WrkMastLog();


        wrkMast.setIoTime(now);


        wrkMast.setWrkSts(5);


        wrkMast.setIoPri(13D); // 优先级


        wrkMast.setCrnNo(locMast.getCrnNo());


        wrkMast.setSourceLocNo(locMast.getLocNo());


        wrkMast.setLocNo(locMast.getLocNo());


        wrkMast.setBarcode(locMast.getBarcode()); // 托盘码


        wrkMast.setFullPlt("Y"); // 满板：Y


        wrkMast.setPicking("N"); // 拣料


        wrkMast.setExitMk("N"); // 退出


        wrkMast.setEmptyMk("N"); // 空板


        wrkMast.setLinkMis("Y");


        // 操作人员数据


        wrkMast.setAppeTime(now);


        wrkMast.setModiTime(now);


        wrkMast.setAppeUser(userId);


        wrkMast.setModiUser(userId);




        // 增删改只创建一次工作主档


        boolean updateFlag = true;


        boolean deleteFlag = true;


        boolean addFlag = true;




        // 修改数量


        Iterator<LocDetl> iterator = locDetls.iterator();


        while (iterator.hasNext()) {


@@ -720,7 +890,8 @@


                    if (!locDetl.getAnfme().equals(adjust.getCount())) {


                        // todo 盘点记录


                        // 修改库存


                        if (!locDetlService.updateAnfme(adjust.getCount(), locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch())) {


                        if (!locDetlService.updateAnfme(adjust.getCount(), locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(),locDetl.getBrand(),


                                locDetl.getStandby1(),locDetl.getStandby2(),locDetl.getStandby3(),locDetl.getBoxType1(),locDetl.getBoxType2(),locDetl.getBoxType3())) {


                            throw new CoolException(locDetl.getLocNo() + "库位，" + locDetl.getMatnr() + "商品，" + locDetl.getBatch() + "批号修改数量失败");


                        }


                        // 保存调整记录


@@ -735,6 +906,30 @@


                        adjDetl.setAppeTime(now);


                        adjDetl.setAppeUser(userId);


                        adjDetlService.save(adjDetl, userId);




                        if (updateFlag) {


                            wrkMast.setWrkNo(commonService.getWorkNo(3));


                            wrkMast.setIoType(23);


                            boolean res = wrkMastLogService.insert(wrkMast);


                            if (!res) {


                                throw new CoolException("库存调整-修改 保存工作档失败");


                            }


                            updateFlag = false;


                        }




                        // 添加历史工作明细


                        WrkDetlLog wrkDetl = new WrkDetlLog();


                        wrkDetl.sync(locDetl);


                        wrkDetl.setWrkNo(wrkMast.getWrkNo());


                        wrkDetl.setIoTime(wrkMast.getIoTime());


                        wrkDetl.setAnfme(adjust.getCount());


                        wrkDetl.setAppeTime(now);


                        wrkDetl.setModiTime(now);


                        wrkMast.setAppeUser(userId);


                        wrkMast.setModiUser(userId);


                        if (!wrkDetlLogService.insert(wrkDetl)) {


                            throw new CoolException("保存工作明细失败");


                        }


                    }


                    iterator.remove();


                    iterator1.remove();


@@ -745,7 +940,8 @@


        // 删除库存


        for (LocDetl locDetl : locDetls) {


            // todo 盘点记录


            if (!locDetlService.updateAnfme(-1.0D, locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch())) {


            if (!locDetlService.updateAnfme(-1.0D, locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(),locDetl.getBrand(),


                    locDetl.getStandby1(),locDetl.getStandby2(),locDetl.getStandby3(),locDetl.getBoxType1(),locDetl.getBoxType2(),locDetl.getBoxType3())) {


                throw new CoolException("删除" + locDetl.getLocNo() + "库位，" + locDetl.getMatnr() + "商品，" + locDetl.getBatch() + "批号库存明细失败");


            }


            // 保存调整记录


@@ -760,6 +956,30 @@


            adjDetl.setAppeTime(now);


            adjDetl.setAppeUser(userId);


            adjDetlService.save(adjDetl, userId);




            if (deleteFlag) {


                wrkMast.setWrkNo(commonService.getWorkNo(3));


                wrkMast.setIoType(22);


                boolean res = wrkMastLogService.insert(wrkMast);


                if (!res) {


                    throw new CoolException("库存调整-删除 保存工作档失败");


                }


                deleteFlag = false;


            }




            // 添加历史工作明细


            WrkDetlLog wrkDetl = new WrkDetlLog();


            wrkDetl.sync(locDetl);


            wrkDetl.setWrkNo(wrkMast.getWrkNo());


            wrkDetl.setIoTime(wrkMast.getIoTime());


            wrkDetl.setAnfme(0.0);


            wrkDetl.setAppeTime(now);


            wrkDetl.setModiTime(now);


            wrkMast.setAppeUser(userId);


            wrkMast.setModiUser(userId);


            if (!wrkDetlLogService.insert(wrkDetl)) {


                throw new CoolException("保存工作明细失败");


            }


        }




        // 添加库存


@@ -770,6 +990,7 @@


            locDetl.sync(mat);


            locDetl.setBatch(adjust.getBatch());


            locDetl.setLocNo(locMast.getLocNo());


            locDetl.setZpallet(locMast.getBarcode());


            locDetl.setAnfme(adjust.getCount()); // 数量


            locDetl.setModiUser(userId); // 操作人员信息


            locDetl.setModiTime(now);


@@ -790,6 +1011,30 @@


            adjDetl.setAppeTime(now);


            adjDetl.setAppeUser(userId);


            adjDetlService.save(adjDetl, userId);




            if (addFlag) {


                wrkMast.setWrkNo(commonService.getWorkNo(3));


                wrkMast.setIoType(21);


                boolean res = wrkMastLogService.insert(wrkMast);


                if (!res) {


                    throw new CoolException("库存调整-新增 保存工作档失败");


                }


                addFlag = false;


            }




            // 添加历史工作明细


            WrkDetlLog wrkDetl = new WrkDetlLog();


            wrkDetl.sync(locDetl);


            wrkDetl.setWrkNo(wrkMast.getWrkNo());


            wrkDetl.setIoTime(wrkMast.getIoTime());


            wrkDetl.setAnfme(adjust.getCount());


            wrkDetl.setAppeTime(now);


            wrkDetl.setModiTime(now);


            wrkMast.setAppeUser(userId);


            wrkMast.setModiUser(userId);


            if (!wrkDetlLogService.insert(wrkDetl)) {


                throw new CoolException("保存工作明细失败");


            }


        }


        // 修改库位状态


        int count = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));


@@ -885,28 +1130,34 @@


            List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());


            for (WrkDetl wrkDetl : wrkDetls) {


                if (!Cools.isEmpty(wrkDetl.getOrderNo())) {


                    if (!orderDetlService.decrease(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme())) {


                        throw new CoolException("订单数据回滚失败");


                    }


//                    if (!orderDetlService.decrease(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme())) {


//                        throw new CoolException("订单数据回滚失败");


//                    }


                    OrderInAndOutUtil.decrease(Boolean.FALSE,wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getBrand(),


                            wrkDetl.getStandby1(),wrkDetl.getStandby2(),wrkDetl.getStandby3(),


                            wrkDetl.getBoxType1(),wrkDetl.getBoxType2(),wrkDetl.getBoxType3(), wrkDetl.getAnfme());




                    //修改订单主表状态,没有作业数量时才可以修改


                    boolean flag = true;


                    List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no",wrkDetl.getOrderNo()));


//                    List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no",wrkDetl.getOrderNo()));


                    Order order = OrderInAndOutUtil.selectByNo(Boolean.FALSE, wrkDetl.getOrderNo());


                    List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(Boolean.FALSE, order.getId());


                    for(OrderDetl orderDetl : orderDetls){


                        if(orderDetl.getWorkQty() > 0){


                            flag = false;


                        }


                    }


                    if(flag){


                        Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no",wrkDetl.getOrderNo()));


//                        Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no",wrkDetl.getOrderNo()));


                        if(!Cools.isEmpty(order) && order.getSettle()==2){


                            order.setSettle(1L);


                            order.setUpdateBy(userId);


                            order.setUpdateTime(now);


                        }


                        if(!orderService.update(order,new EntityWrapper<Order>().eq("order_no",wrkDetl.getOrderNo()))){


                            throw new CoolException("修改订单状态失败");


                        }


//                        if(!orderService.update(order,new EntityWrapper<Order>().eq("order_no",wrkDetl.getOrderNo()))){


//                            throw new CoolException("修改订单状态失败");


//                        }


                        OrderInAndOutUtil.updateOrder(Boolean.FALSE,order.getId(),order.getSettle(),userId);


                    }


                }


            }