完善訂單，添加出库订单

cp

2024-11-19 676cbdde86ae8ea598be6e9f6776ae5bf67478f6

完善訂單，添加出库订单

 zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java

@@ -124,83 +124,106 @@
    public void generateOrderPakOut(GenerateOrderPakOutParam param) {
        Order order = orderService.selectByNo(param.getOrderNo(), param.getHostId());
        // 如果单据不存在则添加；如果单据存在，作业中无法修改，反之则修改单据
        boolean boo = false;
        if (!Cools.isEmpty(order)) {
            List<OrderDetl> orderDetls = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>()
                    .eq(OrderDetl::getOrderId, order.getId()).eq(OrderDetl::getHostId, param.getHostId()));

            if (orderDetls.size() == param.getMats().size()) {
                for (OrderDetl o : orderDetls
                ) {
                    for (GenerateOrderMatParam matParam : param.getMats()
                    ) {
                        if (o.getMatnr().equals(matParam.getMatnr()) && !o.getAnfme().equals(matParam.getAnfme())) {
                            boo = true;
                            break;
                        }
                    }
                    if (boo) {
                        break;
                    }
                }
            } else {
                boo = true;
            }
        }
        if (boo) {
            if (order.getSettle() > 1L) {
                throw new CoolException(param.getOrderNo() + "正在出库，无法修改单据");
            }
            orderService.removeById(order.getId());
        }
        DocType docType = docTypeService.getOne(new LambdaQueryWrapper<DocType>().eq(DocType::getDocId, param.getOrderType()));
        if (docType == null) {
            throw new CoolException("订单类型不存在");
        }
        Date now = new Date();
        // 单据主档
        order = new Order(
                String.valueOf(snowflakeIdWorker.nextId()),    // 编号[非空]
                param.getOrderNo(),    // 订单编号
                DateUtils.convert(now),    // 单据日期
                docType.getDocId(),    // 单据类型
                null,    // 项目编号
                null,    //
                null,    // 调拨项目编号
                null,    // 初始票据号
                null,    // 票据号
                null,    // 客户编号
                null,    // 客户
                null,    // 联系方式
                null,    // 操作人员
                null,    // 合计金额
                null,    // 优惠率
                null,    // 优惠金额
                null,    // 销售或采购费用合计
                null,    // 实付金额
                null,    // 付款类型
                null,    // 业务员
                null,    // 结算天数
                null,    // 邮费支付类型
                null,    // 邮费
                null,    // 付款时间
                null,    // 发货时间
                null,    // 物流名称
                null,    // 物流单号
                1L,    // 订单状态
                1,    // 状态
                9527L,    // 添加人员
                now,    // 添加时间
                9527L,    // 修改人员
                now,    // 修改时间
                null,    // 备注
                param.getHostId() //仓库ID
        );
        if (!orderService.save(order)) {
            throw new CoolException("生成单据主档失败，请联系管理员");
        }
        List<GenerateOrderMatParam> mats = param.getMats();
        orderDetlService.remove(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderNo, order.getOrderNo()));
        for (GenerateOrderMatParam matParam : mats) {
            Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, matParam.getMatnr()).eq(Mat::getHostId, param.getHostId()));
            if (Cools.isEmpty(mat)) {
                throw new CoolException(matParam.getMatnr() + "编号商品检索失败，请先添加商品");
            DocType docType = docTypeService.getOne(new LambdaQueryWrapper<DocType>().eq(DocType::getDocId, param.getOrderType()));
            if (docType == null) {
                throw new CoolException("订单类型不存在");
            }
            OrderDetl orderDetl = new OrderDetl();
            orderDetl.sync(mat);
            orderDetl.setBatch(matParam.getBatch());
            orderDetl.setAnfme(matParam.getAnfme());
            orderDetl.setOrderId(order.getId());
            orderDetl.setOrderNo(order.getOrderNo());
            orderDetl.setThreeCode(matParam.getWarehouse());//仓库号
            orderDetl.setSupp(matParam.getOrigin());//来源单号
            orderDetl.setSuppCode(matParam.getOriginNo());//来源序号
            orderDetl.setCreateBy(9527L);
            orderDetl.setCreateTime(now);
            orderDetl.setUpdateBy(9527L);
            orderDetl.setUpdateTime(now);
            orderDetl.setStatus(1);
            orderDetl.setQty(0.0D);
            orderDetl.setHostId(param.getHostId());
            if (!orderDetlService.save(orderDetl)) {
                throw new CoolException("生成单据明细失败，请联系管理员");
            Date now = new Date();
            // 单据主档
            order = new Order(
                    String.valueOf(snowflakeIdWorker.nextId()),    // 编号[非空]
                    param.getOrderNo(),    // 订单编号
                    DateUtils.convert(now),    // 单据日期
                    docType.getDocId(),    // 单据类型
                    null,    // 项目编号
                    null,    //
                    null,    // 调拨项目编号
                    null,    // 初始票据号
                    null,    // 票据号
                    null,    // 客户编号
                    null,    // 客户
                    null,    // 联系方式
                    null,    // 操作人员
                    null,    // 合计金额
                    null,    // 优惠率
                    null,    // 优惠金额
                    null,    // 销售或采购费用合计
                    null,    // 实付金额
                    null,    // 付款类型
                    null,    // 业务员
                    null,    // 结算天数
                    null,    // 邮费支付类型
                    null,    // 邮费
                    null,    // 付款时间
                    null,    // 发货时间
                    null,    // 物流名称
                    null,    // 物流单号
                    1L,    // 订单状态
                    1,    // 状态
                    9527L,    // 添加人员
                    now,    // 添加时间
                    9527L,    // 修改人员
                    now,    // 修改时间
                    null,    // 备注
                    param.getHostId() //仓库ID
            );
            if (!orderService.save(order)) {
                throw new CoolException("生成单据主档失败，请联系管理员");
            }
            List<GenerateOrderMatParam> mats = param.getMats();
            orderDetlService.remove(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderNo, order.getOrderNo()));
            for (GenerateOrderMatParam matParam : mats) {
                Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, matParam.getMatnr()).eq(Mat::getHostId, param.getHostId()));
                if (Cools.isEmpty(mat)) {
                    throw new CoolException(matParam.getMatnr() + "编号商品检索失败，请先添加商品");
                }
                OrderDetl orderDetl = new OrderDetl();
                orderDetl.sync(mat);
                orderDetl.setBatch(matParam.getBatch());
                orderDetl.setAnfme(matParam.getAnfme());
                orderDetl.setOrderId(order.getId());
                orderDetl.setOrderNo(order.getOrderNo());
                orderDetl.setThreeCode(matParam.getWarehouse());//仓库号
                orderDetl.setSupp(matParam.getOrigin());//来源单号
                orderDetl.setSuppCode(matParam.getOriginNo());//来源序号
                orderDetl.setCreateBy(9527L);
                orderDetl.setCreateTime(now);
                orderDetl.setUpdateBy(9527L);
                orderDetl.setUpdateTime(now);
                orderDetl.setStatus(1);
                orderDetl.setQty(0.0D);
                orderDetl.setHostId(param.getHostId());
                if (!orderDetlService.save(orderDetl)) {
                    throw new CoolException("生成单据明细失败，请联系管理员");
                }
            }
        }
    }
@@ -293,7 +316,7 @@
            }
            if (!Cools.isEmpty(matParam.getStatus())) {
                mat.setStatus(matParam.getStatus());
            }else {
            } else {
                mat.setStatus(1);
            }


 zy-asrs-common/src/main/java/com/zy/asrs/common/utils/WaitPakingExcelListener.java

@@ -93,10 +93,17 @@
            waitPakin.setModiTime(new Date());
            waitPakin.setAppeUser(userId);
            waitPakin.setHostId(hostId);

            if(hostId==1){
                waitPakin.setOwner("宁波仓");
            }else{
                waitPakin.setOwner("新昌仓");
            }
            waitPakin.setIoStatus("N");     // 入出状态
            waitPakin.setStatus("Y");    // 状态
            waitPakinService.save(waitPakin);
            total ++;


        }else {
            waitPakinOld.setAnfme(waitPakinOld.getAnfme() + excel.getAnfme());
            waitPakinOld.setModiTime(new Date());

 zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiController.java

@@ -185,6 +185,7 @@
            }

            ArrayList<GenerateOrderMatParam> mats = new ArrayList<>();
            String matnr=null;
            for (MatParam matParam : orderParam.getList()) {
                GenerateOrderMatParam mat = new GenerateOrderMatParam();
                mat.setMatnr(matParam.getMatnr());
@@ -194,7 +195,17 @@
                mat.setWarehouse(matParam.getWarehouse());
                mat.setOrigin(matParam.getOrigin());
                mat.setOriginNo(matParam.getOriginNo());
                mats.add(mat);
                if(Cools.isEmpty(mats)){
                    mats.add(mat);
                }else{
                    for (GenerateOrderMatParam m:mats
                         ) {
                        if(m.getMatnr().equals(matParam.getMatnr())){
                            return R.error("同一订单不允许有相同物料");
                        }
                    }
                    mats.add(mat);
                }
            }

            if (orderParam.getInOut() == 1) {

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java

@@ -1,6 +1,7 @@
package com.zy.asrs.wms.controller;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.sun.org.apache.xpath.internal.operations.Or;
import com.zy.asrs.common.domain.dto.LocDetlDto;
import com.zy.asrs.common.domain.dto.WrkDto;
import com.zy.asrs.common.domain.entity.MobileAdjustResult;
@@ -850,4 +851,38 @@
        return R.ok(locDetlList);
    }

    @PostMapping("/pda/OutOrder")
    @ManagerAuth(memo = "获得出库单")
    @Transactional
    public R OutOrder(@RequestParam String orderNo) {
        List<Order> orders=new ArrayList<Order>();
        List<Order> OrderList=new ArrayList<Order>();
        if(Cools.isEmpty(orderNo)){
            orders= orderService.list(new LambdaQueryWrapper<Order>()
                    .between(Order::getSettle,1,2)
                    .eq(Order::getHostId, getHostId())
            );
        }else{
            orders= orderService.list(new LambdaQueryWrapper<Order>()
                    .like(Order::getOrderNo, orderNo)
                    .between(Order::getSettle,1,2)
                    .eq(Order::getHostId, getHostId())
            );
        }
        if(Cools.isEmpty(orders)){
            return R.ok();
        }
        for (Order o:orders
             ) {
            DocType docType=docTypeService.getOne(new LambdaQueryWrapper<DocType>()
                    .eq(DocType::getDocId,o.getDocType()));
            if(docType.getPakout()==1){
                OrderList.add(o);
            }
        }


        return R.ok(OrderList);
    }

}

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

@@ -55,7 +55,9 @@

        for (OrderDetl orderDetl : orderDetls) {
            double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
            if (issued <= 0.0D) { continue; }
            if (issued <= 0.0D) {
                continue;
            }
            List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), hostId);
            for (LocDetl locDetl : locDetls) {
                List<LocDetl> locMats = locDetlService.list(new LambdaQueryWrapper<LocDetl>()
@@ -75,9 +77,31 @@
                }
            }
            if (issued > 0) {
                LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
                locDto.setLack(Boolean.TRUE);
                locDtos.add(locDto);
                List<LocDetl> locDetls1 = locDetlService.list(new LambdaQueryWrapper<LocDetl>()
                        .eq(LocDetl::getMatnr, orderDetl.getMatnr()).eq(LocDetl::getHostId, hostId));
                boolean boo = false;
                if (Cools.isEmpty(locDetls1)) {
                    LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
                    locDto.setLack(Boolean.TRUE);
                    locDtos.add(locDto);
                } else {
                    for (LocDetl locDetl : locDetls1
                    ) {
                        String locNo = locDetl.getLocNo().substring(1, 2);
                        if (Integer.valueOf(locNo) > 4) {
                            boo = true;
                            LocDto locDto = new LocDto("在平库", orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
                            locDto.setLack(Boolean.TRUE);
                            locDtos.add(locDto);
                            break;
                        }
                    }
                    if (!boo) {
                        LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
                        locDto.setLack(Boolean.TRUE);
                        locDtos.add(locDto);
                    }
                }
            }
        }
        return R.ok().add(locDtos);
@@ -106,7 +130,9 @@
        // 订单预校验  ===>> 1.订单状态； 2.订单带出数量
        List<OrderDto> orderDtos = new ArrayList<>();
        for (LocDto locDto : locDtos) {
            if (Cools.isEmpty(locDto.getOrderNo())) { continue; }
            if (Cools.isEmpty(locDto.getOrderNo())) {
                continue;
            }
            OrderDto orderDto = new OrderDto(locDto.getOrderNo(), locDto.getMatnr(), locDto.getAnfme());
            if (OrderDto.has(orderDtos, orderDto)) {
                OrderDto dto = OrderDto.find(orderDtos, orderDto);
@@ -121,7 +147,7 @@
            if (order.getSettle() > 2) {
                return R.error(orderDto.getOrderNo() + "订单已失效，请及时刷新页面");
            }
            OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), orderDto.getMatnr(), null,getHostId());
            OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), orderDto.getMatnr(), null, getHostId());
            if (orderDetl.getAnfme() - orderDetl.getQty() < orderDto.getAnfme()) {
                return R.ok(orderDto.getOrderNo() + "订单已作业，请及时刷新页面");
            }
@@ -130,15 +156,17 @@
        List<TaskDto> taskDtos = new ArrayList<>();
        // 根据 （库位 & 出库站） 分组； 理想状态：一组为一次出库任务
        for (LocDto locDto : locDtos) {
            if (locDto.isLack()) { continue; }
            if (locDto.isLack()) {
                continue;
            }
            //2022-08-04 Add，防止前端页面提取库位信息后，在其他地方对该库位生成了出库任务(库位状态非F状态)
            LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>()
                    .eq(LocMast::getLocNo, locDto.getLocNo())
                    .eq(LocMast::getHostId, hostId));
            if (locMast.getWhsType()!=0){
            if (locMast.getWhsType() != 0) {
                continue;
            }
            if(!Cools.isEmpty(locMast) && !locMast.getLocSts().equals("F")){
            if (!Cools.isEmpty(locMast) && !locMast.getLocSts().equals("F")) {
                return R.error("库位号非在库状态，请重新选择出库库位===>>" + locDto.getLocNo());
            }


 zy-asrs-wms/src/main/webapp/views/order/out.html

@@ -196,6 +196,9 @@
    <span name="locNo"
    {{# if( d.lack === false){ }}
    class="layui-badge layui-badge-green" >{{d.locNo}}</span>
    {{# else if( d.locNo === '在平库'){ }}
    class="layui-badge layui-badge-green" >{{d.locNo}}</span>
    {{# } }}
        {{# } else { }}
        class="layui-badge layui-badge-red" >库存不足</span>
    {{# } }}