1

zhang

14 小时以前 25c7cdf3ea9c4e63f16bbb52ce40e28bc65dc87c

1

 src/main/java/com/zy/asrs/controller/OpenController.java

@@ -493,7 +493,7 @@
     * 退库单（出库）
     */
    @PostMapping("/returnOrder/auth/v1")
    @AppAuth(memo = "退库单单据下发")
    @AppAuth(memo = "正常退库单单据下发")
    public synchronized R returnOrder(@RequestHeader(required = false) String appkey,
                                            @RequestBody ReturnOrderConfirmParam param,
                                            HttpServletRequest request) {
@@ -502,6 +502,19 @@
        return R.ok(param);
    }

    /**
     * 退库单（出库）
     */
    @PostMapping("/unqualifiedOrder/auth/v1")
    @AppAuth(memo = "不合格品退库单单据下发")
    public synchronized R unqualifiedOrder(@RequestHeader(required = false) String appkey,
                                      @RequestBody ReturnOrderConfirmParam param,
                                      HttpServletRequest request) {
        auth(appkey, param, request);
        openService.unqualifiedOrder(param);
        return R.ok(param);
    }

    /*...........................上饶江铜..............以上.............徐工汉云...........................*/

}

 src/main/java/com/zy/asrs/controller/OutController.java

@@ -56,12 +56,14 @@
        Thread.sleep(200);
        return R.ok().add(orderDetlService.selectByOrderId(orderId).stream().map(OrderDetl::getId).distinct().collect(Collectors.toList()));
    }

    @PostMapping("/getMesOrder/auth")
    @ManagerAuth
    public R getMesOrder() {
        List<String> orderNoList = orderService.getOrderNosByDocType(25L);
        return R.ok().add(orderNoList);
    }

    @PostMapping("/out/pakout/preview/auth")
    @ManagerAuth
    public R pakoutPreview(@RequestBody List<Long> ids) {
@@ -105,11 +107,14 @@
            // 获取出库口
            List<Integer> staNos = new ArrayList<>();
            if (order.getDocType() == 21) {
                staNos.add(3077); staNos.add(3106);
                staNos.add(3077);
                staNos.add(3106);
            } else if (order.getDocType() == 22) {
                staNos.add(2041);
            } else if (order.getDocType() == 23) {
                staNos.add(3092); staNos.add(3102); staNos.add(3095);
                staNos.add(3092);
                staNos.add(3102);
                staNos.add(3095);
            }

            // 去重 key，避免相同 loc+unit+model 重复显示
@@ -147,13 +152,13 @@
            return R.parse(BaseRes.PARAM);
        }
        List<LocDto> locDtos = new ArrayList<>();
        for (Long id : ids){
        for (Long id : ids) {
            Order order = orderService.selectById(id);
            List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());

            for (OrderDetl orderDetl : orderDetls) {
                LocDto locDto = new LocDto(orderDetl.getManu(), orderDetl.getMatnr(), orderDetl.getMaktx(),orderDetl.getModel(),orderDetl.getSpecs(),
                        orderDetl.getBatch(),orderDetl.getBrand(),orderDetl.getBarcode(), orderDetl.getOrderNo(),orderDetl.getAnfme());
                LocDto locDto = new LocDto(orderDetl.getManu(), orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getModel(), orderDetl.getSpecs(),
                        orderDetl.getBatch(), orderDetl.getBrand(), orderDetl.getBarcode(), orderDetl.getOrderNo(), orderDetl.getAnfme());
                locDto.setOrderDetlId(orderDetl.getId());
                locDto.setTkType(orderDetl.getTkType());
                locDtos.add(locDto);
@@ -235,9 +240,15 @@
                if (one != null) {
                    // 判断是否为盘点单（docType == 23），如果不是则校验合格性
                    Order order = orderService.selectByNo(stockOutParam.getOrderNo());
                    if ( order.getDocType() != 23) {
                        if (!"合格".equals(one.getThreeCode())) {
                            throw new CoolException(one.getModel() + "卷不合格: " + one.getThreeCode());
                    if (order.getDocType() != 23) {
                        if (order.getDocType() == 26 || order.getDocType() == 27) {
                            if ("合格".equals(one.getThreeCode())) {
                                throw new CoolException(one.getModel() + "卷是合格: " + one.getThreeCode());
                            }
                        } else {
                            if (!"合格".equals(one.getThreeCode())) {
                                throw new CoolException(one.getModel() + "卷不合格: " + one.getThreeCode());
                            }
                        }
                    }

@@ -251,10 +262,16 @@
                        .eq("loc_no", locDetlDtos.get(0).getLocDetl().getLocNo()));
                if ("F".equals(locMast.getLocSts()) || "D".equals(locMast.getLocSts())) {
                    Order order = orderService.selectByNo(stockOutParam.getOrderNo());
                    IoWorkType ioWorkType = (order.getDocType() != null && order.getDocType() == 23)
                            ? IoWorkType.CHECK_OUT : null;
                    if (order.getDocType() != null) {
                        if (order.getDocType() == 26 || order.getDocType() == 27) {
                            ioWorkType = IoWorkType.ALL_OUT;
                        }
                    }
                    workService.stockOut(staNo, locDetlDtos,
                            order.getDocType() != null && order.getDocType() == 23
                                    ? IoWorkType.CHECK_OUT : null,
                            getUserId(),optionValue);
                            ioWorkType,
                            getUserId(), optionValue);
                } else {
                    throw new CoolException("所选库位状态不为F/D，库位号：" +
                            locMast.getLocNo() + "，当前状态：" +
@@ -269,7 +286,6 @@
    }



    @PostMapping("/out/refund/loc/auth")
    @ManagerAuth(memo = "订单出库")
    public synchronized R refundLoc(@RequestBody List<LocDto> locDtos) throws InterruptedException {
@@ -279,7 +295,7 @@
        long nowOrderNo = System.currentTimeMillis();
        Order order = new Order(
                String.valueOf(snowflakeIdWorker.nextId()),    // 编号[非空]
                "TK"+nowOrderNo,    // 订单编号
                "TK" + nowOrderNo,    // 订单编号
                DateUtils.convert(now),    // 单据日期
                docType.getDocId(),    // 单据类型
                null,    // 项目编号
@@ -318,11 +334,11 @@
            throw new CoolException("保存订单主档失败");
        }
        // 单据明细档
        int i=0;
        int i = 0;
        List<LocDto> locDtosList = new ArrayList<>();
        List<String> batchList = new ArrayList<>();
        for (LocDto locDto : locDtos) {
            if (!batchList.contains(locDto.getBatch())){
            if (!batchList.contains(locDto.getBatch())) {
                batchList.add(locDto.getBatch());
                locDtosList.add(locDto);
            }

 src/main/java/com/zy/asrs/service/OpenService.java

@@ -11,6 +11,7 @@

    /**
     * GWMS请求ZWMS生成入库任务
     *
     * @return 目标信息
     */
    R gwmsGenerateInventory(GwmsGenerateInventoryDto param);
@@ -41,7 +42,7 @@
    R dd(TbParam param);

    /**
     *GWMS到达目标站点请求ZWCS执行入库
     * GWMS到达目标站点请求ZWCS执行入库
     */
    String crnExecute(CrnExecuteParam param);

@@ -132,6 +133,7 @@

    /**
     * 同步商品信息
     *
     * @param param
     */
    void syncMat(MatSyncParam param);
@@ -143,6 +145,7 @@
    void balconyComplete(LabellerMatParam param);

    void PalletizingCompleteTwoFloorParam(PalletizingCompleteTwoFloorParam param);

    void palletizingCompleteS(PalletizingCompleteParam param);

    void singleUnstackingComplete(SingleUnstackingCompleteParam param);
@@ -158,5 +161,5 @@

    R returnOrder(ReturnOrderConfirmParam param);


    R unqualifiedOrder(ReturnOrderConfirmParam param);
}

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

@@ -2346,7 +2346,7 @@
    @Transactional
    public R returnOrder(ReturnOrderConfirmParam param) {
        if (Cools.isEmpty(param.getOrderNumber())) {
            param.setOrderNumber("THCK" + snowflakeIdWorker.nextId() + "");
            param.setOrderNumber("THCK" + DateUtils.convert(new Date(), DateUtils.yyyyMMdd));
        }
        // 1. 查询单据是否存在
        Order order = orderMapper.selectOrderByOrderNo(param.getOrderNumber());
@@ -2364,12 +2364,63 @@
            orderMapper.insert(order);
        } else {
            // 1.2 存在，更新单据状态
            order.setStatus(1);
            order.setStatus(2);
            orderMapper.updateById(order);
        }
        orderDetlMapper.delete(
                new EntityWrapper<OrderDetl>().eq("order_no", param.getOrderNumber())
        );


        // 2. 一一对应遍历
        List<ReturnOrderConfirmParam.VolumeNumber> volList = param.getVolumeNumbers();

        for (int i = 0; i < volList.size(); i++) {
            ReturnOrderConfirmParam.VolumeNumber vn = volList.get(i);

            // 查询是否已存在该 detl
            OrderDetl detl = orderDetlMapper.selectByOrderNoAndPkgGroupNoAndVolumeNo(
                    param.getOrderNumber(), param.getPackageGroupNo(), vn.getVolumeNumber()
            );

            if (detl == null) {
                detl = new OrderDetl();
                detl.setOrderId(order.getId());
                detl.setOrderNo(param.getOrderNumber());
                detl.setCreateTime(new Date());
                detl.setAnfme(1.0);
                detl.setBrand(param.getPackageGroupNo());   // 包装组号
                detl.setModel(vn.getVolumeNumber());     // 卷号
                orderDetlMapper.insert(detl);
            }
        }

        return R.ok("组货确认成功");
    }

    @Override
    @Transactional
    public R unqualifiedOrder(ReturnOrderConfirmParam param) {
        if (Cools.isEmpty(param.getOrderNumber())) {
            param.setOrderNumber("UQCK" + DateUtils.convert(new Date(), DateUtils.yyyyMMdd));
        }
        // 1. 查询单据是否存在
        Order order = orderMapper.selectOrderByOrderNo(param.getOrderNumber());
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

        if (order == null) {
            // 1.1 不存在，新建单据
            order = new Order();
            order.setOrderNo(param.getOrderNumber());
            order.setStatus(1);
            order.setOrderTime(sdf.format(new Date()));
            order.setCreateTime(new Date());
            order.setSettle(1L);
            order.setDocType(27L);
            orderMapper.insert(order);
        } else {
            // 1.2 存在，更新单据状态
            order.setStatus(2);
            orderMapper.updateById(order);
        }


        // 2. 一一对应遍历
        List<ReturnOrderConfirmParam.VolumeNumber> volList = param.getVolumeNumbers();

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

@@ -44,16 +44,34 @@
    private static final int DEFAULT_ROW_NO_TYPE = 1;

    // 堆垛机映射一楼的入库出库站点
    private static final Map<Integer,List<Integer>> crnMapNo;
    private static final Map<Integer, List<Integer>> crnMapNo;

    static {
        crnMapNo = new HashMap<>();
        crnMapNo.put(1,new ArrayList<Integer>(){{add(3001);add(3002);}});
        crnMapNo.put(2,new ArrayList<Integer>(){{add(3004);add(3003);}});
        crnMapNo.put(3,new ArrayList<Integer>(){{add(3005);add(3006);}});
        crnMapNo.put(4,new ArrayList<Integer>(){{add(3007);add(3008);}});
        crnMapNo.put(5,new ArrayList<Integer>(){{add(3010);add(3009);}});
        crnMapNo.put(6,new ArrayList<Integer>(){{add(3011);add(3012);}});
        crnMapNo.put(1, new ArrayList<Integer>() {{
            add(3001);
            add(3002);
        }});
        crnMapNo.put(2, new ArrayList<Integer>() {{
            add(3004);
            add(3003);
        }});
        crnMapNo.put(3, new ArrayList<Integer>() {{
            add(3005);
            add(3006);
        }});
        crnMapNo.put(4, new ArrayList<Integer>() {{
            add(3007);
            add(3008);
        }});
        crnMapNo.put(5, new ArrayList<Integer>() {{
            add(3010);
            add(3009);
        }});
        crnMapNo.put(6, new ArrayList<Integer>() {{
            add(3011);
            add(3012);
        }});
    }

    @Autowired
@@ -112,7 +130,7 @@
        // 检索库位
        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
//        List<String> matnrs = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatnr).distinct().collect(Collectors.toList());
        StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), param.getList().get(0).getMatnr(),null,null, locTypeDto);
        StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), param.getList().get(0).getMatnr(), null, null, locTypeDto);
        // 生成工作号
        int workNo = dto.getWorkNo();
        // 生成工作档
@@ -157,20 +175,20 @@
        sourceStaNo.setWrkNo(workNo);
        sourceStaNo.setModiUser(userId);
        sourceStaNo.setModiTime(now);
        if (!basDevpService.updateById(sourceStaNo)){
        if (!basDevpService.updateById(sourceStaNo)) {
            throw new CoolException("更新源站失败");
        }
        // 更新目标库位状态
        LocMast locMast = locMastService.selectById(dto.getLocNo());
        if (locMast.getLocSts().equals("O")){
        if (locMast.getLocSts().equals("O")) {
            locMast.setLocSts("S"); // S.入库预约
            locMast.setModiUser(userId);
            locMast.setModiTime(now);
            if (!locMastService.updateById(locMast)){
            if (!locMastService.updateById(locMast)) {
                throw new CoolException("改变库位状态失败");
            }
        } else {
            throw new CoolException(dto.getLocNo()+"目标库位已被占用");
            throw new CoolException(dto.getLocNo() + "目标库位已被占用");
        }
        return dto.getLocNo();
    }
@@ -185,46 +203,47 @@
        for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
            LocDetl one = new LocDetl();
//            if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getCount())) {
                one = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no",paramLocDetl.getLocNo())
                        .eq("brand",paramLocDetl.getBrand()).eq("model",paramLocDetl.getModel()));
            one = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", paramLocDetl.getLocNo())
                    .eq("brand", paramLocDetl.getBrand()).eq("model", paramLocDetl.getModel()));
//                        selectItem(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getBatch());
            if(paramLocDetl.getMatnr().equals("空箱")){
                one= locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no",paramLocDetl.getLocNo()));
            if (paramLocDetl.getMatnr().equals("空箱")) {
                one = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", paramLocDetl.getLocNo()));
            }
                if (null != one && !paramLocDetl.getMatnr().equals("空箱")) {
                    if(!"合格".equals(one.getThreeCode())) {
                        throw new CoolException(one.getModel() + "卷不合格:" + one.getThreeCode() );
                    }
                    locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount(), param.getOrderNo()));
                }else{
                    locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount(), param.getOrderNo()));
            if (null != one && !paramLocDetl.getMatnr().equals("空箱")) {
                if (!"合格".equals(one.getThreeCode())) {
                    throw new CoolException(one.getModel() + "卷不合格:" + one.getThreeCode());
                }
                locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount(), param.getOrderNo()));
            } else {
                locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount(), param.getOrderNo()));
            }
//            }
        }
        if (!locDetlDtos.isEmpty()) {
            LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetlDtos.get(0).getLocDetl().getLocNo()));
            if (locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D") ){
            if (locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D")) {
                // 启动出库开始 101.出库
                stockOut(staNo, locDetlDtos, null, userId);
            }else {
                throw new CoolException("所选库位存在状态不为F、D的库位，库位号："+locMast.getLocNo()+" 、当前状态："+locMast.getLocSts()+"-"+locMast.getLocSts$());
            } else {
                throw new CoolException("所选库位存在状态不为F、D的库位，库位号：" + locMast.getLocNo() + " 、当前状态：" + locMast.getLocSts() + "-" + locMast.getLocSts$());
            }
        } else {
            throw new CoolException("库存不存在");
        }
    }

    @Override
    @Transactional
    public void startupFullTakeStoreOrder(StockOutParam param, Long userId) {
        if (Cools.isEmpty(param) || Cools.isEmpty(param.getLocDetls())){
        if (Cools.isEmpty(param) || Cools.isEmpty(param.getLocDetls())) {
            throw new CoolException("参数为空");
        }
        if (Cools.isEmpty(param.getOrderNo())){
        if (Cools.isEmpty(param.getOrderNo())) {
            throw new CoolException("订单号参数为空");
        }
        DocType docType = docTypeService.selectOrAdd("手动出库单", Boolean.FALSE);
        Order order = orderService.selectByNo(param.getOrderNo());
        if (Cools.isEmpty(order)){
        if (Cools.isEmpty(order)) {
            Date now = new Date();
            order = new Order(
                    String.valueOf(snowflakeIdWorker.nextId()),    // 编号[非空]
@@ -269,7 +288,7 @@
            // 单据明细档
            List<DetlDto> list = new ArrayList<>();
            List<StockOutParam.LocDetl> locDetls = param.getLocDetls();
            int i=0;
            int i = 0;
            for (StockOutParam.LocDetl locDetl : locDetls) {
                i++;
                Mat mat = matService.selectByMatnr(locDetl.getMatnr());
@@ -309,10 +328,11 @@
//            }

        } else {
            throw new CoolException("订单号重复，订单"+param.getOrderNo()+"已存在！！！");
            throw new CoolException("订单号重复，订单" + param.getOrderNo() + "已存在！！！");
        }

    }

    @Transactional
    @Override
    public void stockOut(BasDevp staNo, List<LocDetlDto> locDetlDtos, IoWorkType ioWorkType, Long userId) {
@@ -375,7 +395,7 @@
            wrkMast.setLinkMis("N");
            wrkMast.setSheetNo("0");
//            wrkMast.setMemo(groupOrderNumber);
            if (staDesc.getStnNo()<118 || staDesc.getStnNo()>121){
            if (staDesc.getStnNo() < 118 || staDesc.getStnNo() > 121) {
                wrkMast.setSheetNo("3");
            }
            wrkMast.setBarcode(locMast.getBarcode());
@@ -384,26 +404,28 @@
            wrkMast.setModiUser(userId);
            wrkMast.setModiTime(now);
            if (!wrkMastService.insert(wrkMast)) {
                throw new CoolException("保存工作档失败，出库库位号："+dto.getLocNo());
                throw new CoolException("保存工作档失败，出库库位号：" + dto.getLocNo());
            }
            // 生成工作档明细
            for (LocDetlDto detlDto : dto.getLocDetlDtos()) {
                if (detlDto.getCount()==null || detlDto.getCount() <= 0.0D) {continue;}
                if (detlDto.getCount() == null || detlDto.getCount() <= 0.0D) {
                    continue;
                }
                WrkDetl wrkDetl = new WrkDetl();
                List<OrderDetl> orderDetl = orderDetlService.selectByBrand(detlDto.getLocDetl().getBrand());
                wrkDetl.sync(detlDto.getLocDetl());
                for (OrderDetl orderDetlDto : orderDetl) {
                    if(orderDetlDto.getSupp() != null){
                    if (orderDetlDto.getSupp() != null) {
                        wrkDetl.setSupp(orderDetlDto.getSupp());
                    }
                    if(orderDetlDto.getMemo() != null){
                    if (orderDetlDto.getMemo() != null) {
                        wrkDetl.setMemo(orderDetlDto.getMemo());
                    }
                }
                wrkDetl.setOrderNo(detlDto.getOrderNo()); // 手动出库不需要带出库存中的单据编号
                wrkDetl.setWrkNo(workNo);
                wrkDetl.setIoTime(now);
                Double anfme = ioType==101?detlDto.getLocDetl().getAnfme():detlDto.getCount();
                Double anfme = ioType == 101 ? detlDto.getLocDetl().getAnfme() : detlDto.getCount();
                wrkDetl.setAnfme(anfme); // 数量
                wrkDetl.setAppeTime(now);
                wrkDetl.setAppeUser(userId);
@@ -415,17 +437,17 @@
                // 修改订单明细
                orderDetlMapper.updateOrderDetlByGroupNo(detlDto.getOrderNo(), detlDto.getLocDetl().getBrand(), 1);
                // 修改订单状态
                orderMapper.updateSettleByOrderNo(detlDto.getOrderNo(),2L, userId);
                orderMapper.updateSettleByOrderNo(detlDto.getOrderNo(), 2L, userId);
            }

            // 修改库位状态:   F.在库 ====>>> R.出库预约/P.拣料/盘点/并板出库中
            locMast = locMastService.selectById(dto.getLocNo());
            if (locMast.getLocSts().equals("F")) {
                locMast.setLocSts(ioType==101?"R":"P");
                locMast.setLocSts(ioType == 101 ? "R" : "P");
                locMast.setModiUser(userId);
                locMast.setModiTime(now);
                if (!locMastService.updateById(locMast)) {
                    throw new CoolException("预约库位状态失败，库位号："+dto.getLocNo());
                    throw new CoolException("预约库位状态失败，库位号：" + dto.getLocNo());
                }
            } else {
                throw new CoolException(dto.getLocNo() + "库位不是在库状态");
@@ -436,7 +458,7 @@

    @Override
    @Transactional
    public void stockOut(BasDevp staNo, List<LocDetlDto> locDetlDtos, IoWorkType ioWorkType, Long userId,String groupOrderNumber) {
    public void stockOut(BasDevp staNo, List<LocDetlDto> locDetlDtos, IoWorkType ioWorkType, Long userId, String groupOrderNumber) {
        Date now = new Date();
        // 合并同类项
        Set<String> locNos = new HashSet<>();
@@ -463,6 +485,8 @@
                ioType = dto.isAll() ? 101 : 103;
            } else if (ioWorkType.equals(IoWorkType.CHECK_OUT)) {
                ioType = 107;
            } else if (ioWorkType.equals(IoWorkType.ALL_OUT)) {
                ioType = 101;
            }
            assert ioType != null;
            // 获取库位
@@ -496,7 +520,7 @@
            wrkMast.setLinkMis("N");
            wrkMast.setSheetNo("0");
            wrkMast.setMemo(groupOrderNumber);
            if (staDesc.getStnNo()<118 || staDesc.getStnNo()>121){
            if (staDesc.getStnNo() < 118 || staDesc.getStnNo() > 121) {
                wrkMast.setSheetNo("3");
            }
            wrkMast.setBarcode(locMast.getBarcode());
@@ -505,26 +529,28 @@
            wrkMast.setModiUser(userId);
            wrkMast.setModiTime(now);
            if (!wrkMastService.insert(wrkMast)) {
                throw new CoolException("保存工作档失败，出库库位号："+dto.getLocNo());
                throw new CoolException("保存工作档失败，出库库位号：" + dto.getLocNo());
            }
            // 生成工作档明细
            for (LocDetlDto detlDto : dto.getLocDetlDtos()) {
                if (detlDto.getCount()==null || detlDto.getCount() <= 0.0D) {continue;}
                if (detlDto.getCount() == null || detlDto.getCount() <= 0.0D) {
                    continue;
                }
                WrkDetl wrkDetl = new WrkDetl();
                List<OrderDetl> orderDetl = orderDetlService.selectByBrand(detlDto.getLocDetl().getBrand());
                wrkDetl.sync(detlDto.getLocDetl());
                for (OrderDetl orderDetlDto : orderDetl) {
                    if(orderDetlDto.getSupp() != null){
                    if (orderDetlDto.getSupp() != null) {
                        wrkDetl.setSupp(orderDetlDto.getSupp());
                    }
                    if(orderDetlDto.getMemo() != null){
                    if (orderDetlDto.getMemo() != null) {
                        wrkDetl.setMemo(orderDetlDto.getMemo());
                    }
                }
                wrkDetl.setOrderNo(detlDto.getOrderNo()); // 手动出库不需要带出库存中的单据编号
                wrkDetl.setWrkNo(workNo);
                wrkDetl.setIoTime(now);
                Double anfme = ioType==101?detlDto.getLocDetl().getAnfme():detlDto.getCount();
                Double anfme = ioType == 101 ? detlDto.getLocDetl().getAnfme() : detlDto.getCount();
                wrkDetl.setAnfme(anfme); // 数量
                wrkDetl.setAppeTime(now);
                wrkDetl.setAppeUser(userId);
@@ -536,17 +562,17 @@
                // 修改订单明细
                orderDetlMapper.updateOrderDetlByGroupNo(detlDto.getOrderNo(), detlDto.getLocDetl().getBrand(), 1);
                // 修改订单状态
                orderMapper.updateSettleByOrderNo(detlDto.getOrderNo(),2L, userId);
                orderMapper.updateSettleByOrderNo(detlDto.getOrderNo(), 2L, userId);
            }

            // 修改库位状态:   F.在库 ====>>> R.出库预约/P.拣料/盘点/并板出库中
            locMast = locMastService.selectById(dto.getLocNo());
            if (locMast.getLocSts().equals("F")) {
                locMast.setLocSts(ioType==101?"R":"P");
                locMast.setLocSts(ioType == 101 ? "R" : "P");
                locMast.setModiUser(userId);
                locMast.setModiTime(now);
                if (!locMastService.updateById(locMast)) {
                    throw new CoolException("预约库位状态失败，库位号："+dto.getLocNo());
                    throw new CoolException("预约库位状态失败，库位号：" + dto.getLocNo());
                }
            } else {
                throw new CoolException(dto.getLocNo() + "库位不是在库状态");
@@ -574,34 +600,82 @@
        int souresStaNo = 0;
        if (taskDto.getStaNo() < 3000) { // 二楼
            switch (row) {
                case 1: case 2: case 3:
                case 4: souresStaNo = 2062; break;
                case 5: case 6: case 7:
                case 8: souresStaNo = 2065; break;
                case 9: case 10: case 11:
                case 12: souresStaNo = 2068; break;
                case 13: case 14: case 15:
                case 16: souresStaNo = 2070; break;
                case 17: case 18: case 19:
                case 20: souresStaNo = 2073; break;
                case 21: case 22: case 23:
                case 24: souresStaNo = 2076; break;
                case 1:
                case 2:
                case 3:
                case 4:
                    souresStaNo = 2062;
                    break;
                case 5:
                case 6:
                case 7:
                case 8:
                    souresStaNo = 2065;
                    break;
                case 9:
                case 10:
                case 11:
                case 12:
                    souresStaNo = 2068;
                    break;
                case 13:
                case 14:
                case 15:
                case 16:
                    souresStaNo = 2070;
                    break;
                case 17:
                case 18:
                case 19:
                case 20:
                    souresStaNo = 2073;
                    break;
                case 21:
                case 22:
                case 23:
                case 24:
                    souresStaNo = 2076;
                    break;
                default:
            }
        } else { // 一楼
            switch (row) {
                case 1: case 2: case 3:
                case 4: souresStaNo = 3002; break;
                case 5: case 6: case 7:
                case 8: souresStaNo = 3003; break;
                case 9: case 10: case 11:
                case 12: souresStaNo = 3006; break;
                case 13: case 14: case 15:
                case 16: souresStaNo = 3008; break;
                case 17: case 18: case 19:
                case 20: souresStaNo = 3009; break;
                case 21: case 22: case 23:
                case 24: souresStaNo = 3012; break;
                case 1:
                case 2:
                case 3:
                case 4:
                    souresStaNo = 3002;
                    break;
                case 5:
                case 6:
                case 7:
                case 8:
                    souresStaNo = 3003;
                    break;
                case 9:
                case 10:
                case 11:
                case 12:
                    souresStaNo = 3006;
                    break;
                case 13:
                case 14:
                case 15:
                case 16:
                    souresStaNo = 3008;
                    break;
                case 17:
                case 18:
                case 19:
                case 20:
                    souresStaNo = 3009;
                    break;
                case 21:
                case 22:
                case 23:
                case 24:
                    souresStaNo = 3012;
                    break;
                default:
            }
        }
@@ -634,11 +708,13 @@
        wrkMast.setModiUser(userId);
        wrkMast.setModiTime(now);
        if (!wrkMastService.insert(wrkMast)) {
            throw new CoolException("保存工作档失败，出库库位号："+taskDto.getLocNo());
            throw new CoolException("保存工作档失败，出库库位号：" + taskDto.getLocNo());
        }
        // 生成工作档明细
        for (LocDto locDto : taskDto.getLocDtos()) {
            if (locDto.getAnfme()==null || locDto.getAnfme() <= 0.0D) { continue; }
            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);
@@ -675,11 +751,11 @@
        // 修改库位状态:   F.在库 ====>>> R.出库预约/P.拣料/盘点/并板出库中
        locMast = locMastService.selectById(taskDto.getLocNo());
        if (locMast.getLocSts().equals("F")) {
            locMast.setLocSts(ioType==101?"R":"P");
            locMast.setLocSts(ioType == 101 ? "R" : "P");
            locMast.setModiUser(userId);
            locMast.setModiTime(now);
            if (!locMastService.updateById(locMast)) {
                throw new CoolException("预约库位状态失败，库位号："+taskDto.getLocNo());
                throw new CoolException("预约库位状态失败，库位号：" + taskDto.getLocNo());
            }
        } else {
            throw new CoolException(taskDto.getLocNo() + "库位不是在库状态");
@@ -693,7 +769,7 @@
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
        // 检索库位
        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
        StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 10, devpNo, null,null,null, locTypeDto);
        StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 10, devpNo, null, null, null, locTypeDto);
        int workNo = dto.getWorkNo();
        Date now = new Date();
        // 生成工作档
@@ -726,20 +802,20 @@
        sourceStaNo.setWrkNo(workNo);
        sourceStaNo.setModiUser(userId);
        sourceStaNo.setModiTime(now);
        if (!basDevpService.updateById(sourceStaNo)){
        if (!basDevpService.updateById(sourceStaNo)) {
            throw new CoolException("更新源站失败");
        }
        // 更新目标库位状态
        LocMast locMast = locMastService.selectById(dto.getLocNo());
        if (locMast.getLocSts().equals("O")){
        if (locMast.getLocSts().equals("O")) {
            locMast.setLocSts("S"); // S.入库预约
            locMast.setModiUser(userId);
            locMast.setModiTime(now);
            if (!locMastService.updateById(locMast)){
            if (!locMastService.updateById(locMast)) {
                throw new CoolException("改变库位状态失败");
            }
        } else {
            throw new CoolException(dto.getLocNo()+"目标库位已被占用");
            throw new CoolException(dto.getLocNo() + "目标库位已被占用");
        }
        return dto.getLocNo();
    }
@@ -756,10 +832,10 @@
            // 获取库位
            LocMast locMast = locMastService.selectById(locNo);
            if (Cools.isEmpty(locMast)) {
                throw new CoolException(locNo+"库位不存在");
                throw new CoolException(locNo + "库位不存在");
            }
            if (!locMast.getLocSts().equals("D")){
                throw new CoolException("所选库位存在状态不为D的库位，库位号："+locMast.getLocNo()+" 、当前状态："+locMast.getLocSts()+"-"+locMast.getLocSts$());
            if (!locMast.getLocSts().equals("D")) {
                throw new CoolException("所选库位存在状态不为D的库位，库位号：" + locMast.getLocNo() + " 、当前状态：" + locMast.getLocSts() + "-" + locMast.getLocSts$());
            }
            // 获取源站
            Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
@@ -797,7 +873,7 @@
                throw new CoolException("保存工作档失败");
            }
            // 更新库位状态 D.空板 -> R.出库预约
            if (locMast.getLocSts().equals("D")){
            if (locMast.getLocSts().equals("D")) {
                locMast.setLocSts("R");
                locMast.setModiUser(userId);
                locMast.setModiTime(now);
@@ -821,7 +897,7 @@
            // 获取库位
            LocMast locMast = locMastService.selectById(locNo);
            if (Cools.isEmpty(locMast)) {
                throw new CoolException(locNo+"库位不存在");
                throw new CoolException(locNo + "库位不存在");
            }
            // 获取源站
            Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
@@ -860,7 +936,7 @@
                throw new CoolException("保存工作档失败");
            }
            // 更新库位状态 D.空板 -> R.出库预约
            if (locMast.getLocSts().equals("D")){
            if (locMast.getLocSts().equals("D")) {
                locMast.setLocSts("R");
                locMast.setModiUser(1L);
                locMast.setModiTime(now);
@@ -880,17 +956,17 @@
        // 获取库位明细
        List<LocDetlDto> locDetlDtos = new ArrayList<>();
        for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
            LocDetl one = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no",paramLocDetl.getLocNo())
                    .eq("brand",paramLocDetl.getBrand()).eq("model",paramLocDetl.getModel()));
            LocDetl one = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", paramLocDetl.getLocNo())
                    .eq("brand", paramLocDetl.getBrand()).eq("model", paramLocDetl.getModel()));
            if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount(), param.getOrderNo()));
        }
        if (!locDetlDtos.isEmpty()) {
            LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetlDtos.get(0).getLocDetl().getLocNo()));
            if (locMast.getLocSts().equals("F")){
            if (locMast.getLocSts().equals("F")) {
                // 启动出库开始 107.盘点出库
                stockOut(staNo, locDetlDtos, IoWorkType.CHECK_OUT, userId);
            }else {
                throw new CoolException("所选库位存在状态不为F的库位，库位号："+locMast.getLocNo()+" 、当前状态："+locMast.getLocSts()+"-"+locMast.getLocSts$());
            } else {
                throw new CoolException("所选库位存在状态不为F的库位，库位号：" + locMast.getLocNo() + " 、当前状态：" + locMast.getLocSts() + "-" + locMast.getLocSts$());
            }
        } else {
            throw new CoolException("库位物料不存在");
@@ -902,14 +978,14 @@
    public void locMove(String sourceLocNo, String locNo, Long userId) {
        LocMast sourceLoc = locMastService.selectById(sourceLocNo);
        List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", sourceLocNo));
        if (Cools.isEmpty(sourceLoc)){
        if (Cools.isEmpty(sourceLoc)) {
            throw new CoolException("未找到库位");
        }
        LocMast loc = locMastService.selectById(locNo);
        if (Cools.isEmpty(loc)){
        if (Cools.isEmpty(loc)) {
            throw new CoolException("未找到库位");
        }
        if (!loc.getLocSts().equals("O") || (!sourceLoc.getLocSts().equals("F") && !sourceLoc.getLocSts().equals("D"))){
        if (!loc.getLocSts().equals("O") || (!sourceLoc.getLocSts().equals("F") && !sourceLoc.getLocSts().equals("D"))) {
            throw new CoolException("库位状态已改变");
        }
        if (!sourceLoc.getCrnNo().equals(loc.getCrnNo())) {
@@ -928,10 +1004,10 @@
        wrkMast.setCrnNo(sourceLoc.getCrnNo());
        wrkMast.setSourceLocNo(sourceLocNo); // 源库位
        wrkMast.setLocNo(locNo); // 目标库位
        wrkMast.setFullPlt(Cools.isEmpty(locDetls)?"N":"Y"); // 满板：Y
        wrkMast.setFullPlt(Cools.isEmpty(locDetls) ? "N" : "Y"); // 满板：Y
        wrkMast.setPicking("N"); // 拣料
        wrkMast.setExitMk("N"); // 退出
        wrkMast.setEmptyMk(sourceLoc.getLocSts().equals("D")?"Y":"N"); // 空板
        wrkMast.setEmptyMk(sourceLoc.getLocSts().equals("D") ? "Y" : "N"); // 空板
        wrkMast.setBarcode(sourceLoc.getBarcode()); // 托盘码
        wrkMast.setLinkMis("N");
        wrkMast.setAppeUser(userId);
@@ -962,11 +1038,11 @@
            sourceLoc.setLocSts("R"); // R.出库预约
            sourceLoc.setModiUser(userId);
            sourceLoc.setModiTime(now);
            if (!locMastService.updateById(sourceLoc)){
            if (!locMastService.updateById(sourceLoc)) {
                throw new CoolException("更新源库位状态失败");
            }
        } else {
            throw new CoolException("源库位出库失败，状态："+sourceLoc.getLocSts$());
            throw new CoolException("源库位出库失败，状态：" + sourceLoc.getLocSts$());
        }
        // 修改目标库位状态
        if (loc.getLocSts().equals("O")) {
@@ -977,20 +1053,20 @@
                throw new CoolException("更新目标库位状态失败");
            }
        } else {
            throw new CoolException("移转失败，目标库位状态："+loc.getLocSts$());
            throw new CoolException("移转失败，目标库位状态：" + loc.getLocSts$());
        }
    }

    @Override
    @Transactional
    public void autoLocMove(String orderNo,String sourceLocNo, String locNo, Long userId) {
    public void autoLocMove(String orderNo, String sourceLocNo, String locNo, Long userId) {
        LocMast sourceLoc = locMastService.selectById(sourceLocNo);
        List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", sourceLocNo));
        if (Cools.isEmpty(sourceLoc)){
        if (Cools.isEmpty(sourceLoc)) {
            throw new CoolException("未找到库位");
        }
        LocMast loc = locMastService.selectById(locNo);
        if (Cools.isEmpty(loc)){
        if (Cools.isEmpty(loc)) {
            throw new CoolException("未找到库位");
        }

@@ -1009,10 +1085,10 @@
        wrkMast.setLocNo(locNo); // 目标库位
        wrkMast.setSourceStaNo(crnMapNo.get(sourceLoc.getCrnNo()).get(1)); // 出库源站点
        wrkMast.setStaNo(crnMapNo.get(loc.getCrnNo()).get(0)); // 入库目标站点
        wrkMast.setFullPlt(Cools.isEmpty(locDetls)?"N":"Y"); // 满板：Y
        wrkMast.setFullPlt(Cools.isEmpty(locDetls) ? "N" : "Y"); // 满板：Y
        wrkMast.setPicking("N"); // 拣料
        wrkMast.setExitMk("N"); // 退出
        wrkMast.setEmptyMk(sourceLoc.getLocSts().equals("D")?"Y":"N"); // 空板
        wrkMast.setEmptyMk(sourceLoc.getLocSts().equals("D") ? "Y" : "N"); // 空板
        wrkMast.setBarcode(sourceLoc.getBarcode()); // 托盘码
        wrkMast.setLinkMis("N");
        wrkMast.setAppeUser(userId);
@@ -1045,11 +1121,11 @@
            sourceLoc.setLocSts("R"); // R.出库预约
            sourceLoc.setModiUser(userId);
            sourceLoc.setModiTime(now);
            if (!locMastService.updateById(sourceLoc)){
            if (!locMastService.updateById(sourceLoc)) {
                throw new CoolException("更新源库位状态失败");
            }
        } else {
            throw new CoolException("源库位出库失败，状态："+sourceLoc.getLocSts$());
            throw new CoolException("源库位出库失败，状态：" + sourceLoc.getLocSts$());
        }
        // 修改目标库位状态
        if (loc.getLocSts().equals("O")) {
@@ -1060,7 +1136,7 @@
                throw new CoolException("更新目标库位状态失败");
            }
        } else {
            throw new CoolException("移转失败，目标库位状态："+loc.getLocSts$());
            throw new CoolException("移转失败，目标库位状态：" + loc.getLocSts$());
        }
    }

@@ -1068,8 +1144,8 @@
    @Transactional
    public void completeWrkMast(String workNo, Long userId) {
        WrkMast wrkMast = wrkMastService.selectById(workNo);
        if (Cools.isEmpty(wrkMast)){
            throw new CoolException(workNo+"工作档不存在");
        if (Cools.isEmpty(wrkMast)) {
            throw new CoolException(workNo + "工作档不存在");
        }
        if (wrkMast.getWrkSts() == 5 || wrkMast.getWrkSts() == 14 || wrkMast.getWrkSts() == 15) {
            throw new CoolException("当前工作档已完成");
@@ -1077,10 +1153,10 @@
        // 入库 + 库位转移
        if (wrkMast.getIoType() < 60) {
            wrkMast.setWrkSts(4L);
        // 出库
            // 出库
        } else if (wrkMast.getIoType() > 100 && wrkMast.getIoType() != 103 && wrkMast.getIoType() != 107 && wrkMast.getIoType() != 109) {
            wrkMast.setWrkSts(14L);
        }else{
        } else {
            throw new CoolException("当前工作类型或状态无法完成");
        }
        Date now = new Date();
@@ -1121,7 +1197,9 @@
            Iterator<LocDetlAdjustParam.LocDetlAdjust> iterator1 = list.iterator();
            while (iterator1.hasNext()) {
                LocDetlAdjustParam.LocDetlAdjust adjust = iterator1.next();
                if (adjust.getCount() == 0) { continue; }
                if (adjust.getCount() == 0) {
                    continue;
                }
                if (locDetl.getMatnr().equals(adjust.getMatnr()) && Cools.eq(locDetl.getBatch(), adjust.getBatch())) {
                    if (!locDetl.getAnfme().equals(adjust.getCount())) {
                        // todo 盘点记录
@@ -1170,7 +1248,9 @@

        // 添加库存
        for (LocDetlAdjustParam.LocDetlAdjust adjust : list) {
            if (adjust.getCount() == 0.0D) { continue; }
            if (adjust.getCount() == 0.0D) {
                continue;
            }
            Mat mat = matService.selectByMatnr(adjust.getMatnr());
            LocDetl locDetl = new LocDetl();
            locDetl.sync(mat);
@@ -1222,8 +1302,8 @@
    public void cancelWrkMast(String workNo, Long userId) {
        Date now = new Date();
        WrkMast wrkMast = wrkMastService.selectById(workNo);
        if (Cools.isEmpty(wrkMast)){
            throw new CoolException(workNo+"工作档不存在");
        if (Cools.isEmpty(wrkMast)) {
            throw new CoolException(workNo + "工作档不存在");
        }
        String locNo = ""; // 待修改目标库位
        String locSts = ""; // 待修改目标库位状态
@@ -1237,49 +1317,49 @@
                // 库位转移：源库位
                LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());
                if (Cools.isEmpty(locMast)) {
                    throw new CoolException("取消库位转移失败，源库位不存在:"+ wrkMast.getSourceLocNo());
                    throw new CoolException("取消库位转移失败，源库位不存在:" + wrkMast.getSourceLocNo());
                }
                locMast.setLocSts(wrkMast.getFullPlt().equalsIgnoreCase("N")?"D":"F");
                locMast.setLocSts(wrkMast.getFullPlt().equalsIgnoreCase("N") ? "D" : "F");
                locMast.setModiTime(now);
                locMast.setModiUser(userId);
                locMastService.updateById(locMast);
            }
        // 出库取消（修改源库位）
            // 出库取消（修改源库位）
        } else if (wrkMast.getWrkSts() == 11) {
            locNo = wrkMast.getSourceLocNo();
            // 出库 ===>> F.在库
            if (wrkMast.getIoType() > 100 && wrkMast.getIoType() != 110) {
                locSts = "F";
            // 空板出库 ===>> D.空桶/空栈板
                // 空板出库 ===>> D.空桶/空栈板
            } else if (wrkMast.getIoType() == 110) {
                locSts = "D";
            // 库位转移 ===>> D.空桶/空栈板
                // 库位转移 ===>> D.空桶/空栈板
            } else if (wrkMast.getIoType() == 11 || wrkMast.getIoType() == 12) {
                locSts = wrkMast.getFullPlt().equalsIgnoreCase("N")?"D":"F";
                locSts = wrkMast.getFullPlt().equalsIgnoreCase("N") ? "D" : "F";
                // 库位转移：目标库位
                LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
                if (Cools.isEmpty(locMast)) {
                    throw new CoolException("取消库位转移失败，目标库位不存在:"+ wrkMast.getSourceLocNo());
                    throw new CoolException("取消库位转移失败，目标库位不存在:" + wrkMast.getSourceLocNo());
                }
                locMast.setLocSts("O");
                locMast.setModiTime(now);
                locMast.setModiUser(userId);
                locMastService.updateById(locMast);
            }
        }else {
        } else {
            throw new CoolException("当前工作状态无法取消");
        }

        //取消入库工作档时，查询组托表，如果有将状态改为待处理
        if(wrkMast.getIoType() == 1) {
            List<WaitPakin> waitPakins=waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()));
            for (WaitPakin waitPakin:waitPakins){
        if (wrkMast.getIoType() == 1) {
            List<WaitPakin> waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()));
            for (WaitPakin waitPakin : waitPakins) {
                if (!Cools.isEmpty(waitPakin)) {
                    waitPakin.setIoStatus("N");
                    waitPakin.setLocNo("");
                    waitPakinService.update(waitPakin, new EntityWrapper<WaitPakin>()
//                            .eq("order_no", waitPakin.getOrderNo())
                            .eq("zpallet",waitPakin.getZpallet())
                            .eq("zpallet", waitPakin.getZpallet())
                            .eq("matnr", waitPakin.getMatnr())
                            .eq("batch", waitPakin.getBatch()));
                }
@@ -1293,7 +1373,7 @@
                Order order = orderList.get(0);
                // 回滚单据明细的移库状态
                List<OrderDetl> orderDetlList1 = orderDetlMapper.selectList(new EntityWrapper<OrderDetl>().eq("order_no", order.getOrderNo()).eq("specs", wrkMast.getSourceLocNo()));
                for (OrderDetl orderDetl:orderDetlList1) {
                for (OrderDetl orderDetl : orderDetlList1) {
                    if (orderDetl.getBeBatch() != null) {
                        orderDetl.setModel("");
                    }
@@ -1308,7 +1388,7 @@
                    orderMapper.updateById(order);
                }
            } else {
                log.error("回滚移库单据异常，无源库位数据：{}",wrkMast.getSourceLocNo());
                log.error("回滚移库单据异常，无源库位数据：{}", wrkMast.getSourceLocNo());
            }
        }

@@ -1319,31 +1399,31 @@
//        }

        //取消出库工作档时，查询单据管理表，回滚作业中数量
        if(wrkMast.getIoType() == 101 || wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107) {
        if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107) {
            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("订单数据回滚失败");
//                    }
                    orderDetlMapper.updateOrderDetlByGroupNo(wrkDetl.getOrderNo(),wrkDetl.getBrand(),0);
                    orderDetlMapper.updateOrderDetlByGroupNo(wrkDetl.getOrderNo(), wrkDetl.getBrand(), 0);

                    //修改订单主表状态,没有作业数量时才可以修改
                    boolean flag = true;
                    List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no",wrkDetl.getOrderNo()));
                    for(OrderDetl orderDetl : orderDetls){
                        if(orderDetl.getWorkQty() > 0){
                    List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", wrkDetl.getOrderNo()));
                    for (OrderDetl orderDetl : orderDetls) {
                        if (orderDetl.getWorkQty() > 0) {
                            flag = false;
                        }
                    }
                    if(flag){
                        Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no",wrkDetl.getOrderNo()));
                        if(!Cools.isEmpty(order) && order.getSettle()==2){
                    if (flag) {
                        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()))){
                        if (!orderService.update(order, new EntityWrapper<Order>().eq("order_no", wrkDetl.getOrderNo()))) {
                            throw new CoolException("修改订单状态失败");
                        }
                    }
@@ -1386,14 +1466,14 @@
            // 删除工作档明细
            boolean wrkDetlRes = wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", workNo));
        }
        if (wrkMast.getIoType()==202 || wrkMast.getIoType()==212){
        if (wrkMast.getIoType() == 202 || wrkMast.getIoType() == 212) {
            return;
        }

        // 修改库位状态
        LocMast locMast = locMastService.selectById(locNo);
        if (Cools.isEmpty(locMast)) {
            throw new CoolException("取消工作档失败，库位不存在:"+ locNo);
            throw new CoolException("取消工作档失败，库位不存在:" + locNo);
        }
        locMast.setLocSts(locSts);
        locMast.setModiTime(now);
@@ -1408,8 +1488,8 @@
    @Transactional
    public void pickWrkMast(String workNo, Long userId) {
        WrkMast wrkMast = wrkMastService.selectById(workNo);
        if (Cools.isEmpty(wrkMast)){
            throw new CoolException(workNo+"工作档不存在");
        if (Cools.isEmpty(wrkMast)) {
            throw new CoolException(workNo + "工作档不存在");
        }
        // 入出库类型判断
        if (wrkMast.getIoType() != 103 && wrkMast.getIoType() != 104 && wrkMast.getIoType() != 107) {
@@ -1487,7 +1567,7 @@
        // 目标库位
        LocMast targetLoc = null;

        for (int curRow = rowLastno.getsRow(); curRow<=rowLastno.geteRow(); curRow++) {
        for (int curRow = rowLastno.getsRow(); curRow <= rowLastno.geteRow(); curRow++) {

            if (Utils.isShallowLoc(slaveProperties, curRow)) {
                Integer deepRow = Utils.getDeepRow(slaveProperties, curRow);
@@ -1546,15 +1626,15 @@
            throw new CoolException("修改工作档失败");
        }
        // 修改库位状态 O ===>>> S
        if (targetLoc.getLocSts().equals("O")){
        if (targetLoc.getLocSts().equals("O")) {
            targetLoc.setLocSts("S"); // S.入库预约
            targetLoc.setModiUser(userId);
            targetLoc.setModiTime(now);
            if (!locMastService.updateById(targetLoc)){
            if (!locMastService.updateById(targetLoc)) {
                throw new CoolException("改变库位状态失败");
            }
        } else {
            throw new CoolException(targetLoc.getLocNo()+"目标库位已被占用");
            throw new CoolException(targetLoc.getLocNo() + "目标库位已被占用");
        }
        // 禁用异常库位
//        locMast.setLocSts("X"); // X.禁用
@@ -1570,19 +1650,19 @@
    @Transactional
    public void turnMatLocDetl(EmptyPlateOutParam param, Long userId) {
        Mat mat = matService.selectOne(new EntityWrapper<Mat>().eq("id", param.getMatId()));
        if (Cools.isEmpty(mat)){
        if (Cools.isEmpty(mat)) {
            throw new CoolException("目标库位商品编码有误！");
        }
        List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("matnr", param.getLocDetls().get(0).getMatnr()));
        if (Cools.isEmpty(locDetls) || locDetls.size()<1){
            throw new CoolException("待修改商品无库存，无需修改！  规格："+param.getLocDetls().get(0).getMatnr());
        if (Cools.isEmpty(locDetls) || locDetls.size() < 1) {
            throw new CoolException("待修改商品无库存，无需修改！  规格：" + param.getLocDetls().get(0).getMatnr());
        }
        try {
            locDetlService.updateMatTurn(param.getLocDetls().get(0).getMatnr(),mat.getMatnr());
        }catch (Exception e){
            locDetlService.updateMatTurn(param.getLocDetls().get(0).getMatnr(), mat.getMatnr());
        } catch (Exception e) {
            throw new CoolException("对数据库修改出错！");
        }
        for (LocDetl locDetl:locDetls){
        for (LocDetl locDetl : locDetls) {
            // 保存调整记录
            AdjDetl adjDetl = new AdjDetl();
            adjDetl.setLocNo(locDetl.getLocNo());

 src/main/resources/application.yml

@@ -10,8 +10,8 @@
    enabled: false
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    #url: jdbc:sqlserver://127.0.0.1:1433;databasename=ghjtasrs
    url: jdbc:sqlserver://192.168.14.137:1433;databasename=ghjtasrs
    url: jdbc:sqlserver://127.0.0.1:1433;databasename=ghjtasrs
    #url: jdbc:sqlserver://192.168.14.137:1433;databasename=ghjtasrs
    username: sa
    password: sa@123
  mvc:

 src/main/resources/license.lic

Binary files differ