单据增加业务号

pang.jiabao

2025-04-14 2f73fee4e429bd57df092ab185dfee2e1306ff09

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

@@ -7,14 +7,8 @@
import com.core.annotations.ManagerAuth;
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.DocType;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.param.OrderDomainParam;
import com.zy.asrs.service.DocTypeService;
import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.service.OrderService;
import com.zy.common.model.DetlDto;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -33,6 +27,16 @@
    private SnowflakeIdWorker snowflakeIdWorker;
    @Autowired
    private DocTypeService docTypeService;
    @Autowired
    private WrkDetlService wrkDetlService;
    @Autowired
    private WaitPakinService waitPakinService;
    @Autowired
    private LocDetlService locDetlService;
    @Autowired
    private WrkMastService wrkMastService;
    @Autowired
    private WrkMastLogService wrkMastLogService;

    @RequestMapping(value = "/order/nav/list/auth")
    @ManagerAuth
@@ -71,6 +75,11 @@
                  @RequestParam Map<String, Object> param){
        EntityWrapper<Order> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        String temp = (String) param.get("temp");
        if (temp != null) {
            wrapper.where("(temp1 like '%"+temp+"%' or temp2 like '%"+temp+"%')");
            param.remove("temp");
        }
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
            wrapper.orderBy("settle").orderBy("create_time", false);
@@ -85,10 +94,18 @@
        return R.ok().add(orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_id", orderId)));
    }

    @RequestMapping(value = "/order/form/add/auth")
    /*@RequestMapping(value = "/order/form/add/auth")
    @ManagerAuth(memo = "手动添加订单")
    @Transactional
    public R formAdd(@RequestBody OrderDomainParam param){
        if(Cools.isEmpty(param.getOrderNo())){
            String prefix = "";
            DocType docType = docTypeService.selectById(param.getDocType());
            if(!Cools.isEmpty(docType)){
                prefix = docType.getPakin() == 1 ? "RK" : "CK";
            }
            param.setOrderNo(prefix + snowflakeIdWorker.nextId());
        }
        Order order = orderService.selectByNo(param.getOrderNo());
        if (order != null) {
            return R.error("单据编号已存在");
@@ -137,7 +154,7 @@
        for (OrderDetl orderDetl : param.getOrderDetlList()) {
            DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
            if (DetlDto.has(list, dto)) {
                OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch());
                OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getAnfme());
                item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
                if (!orderDetlService.updateById(item)) {
                    throw new CoolException("保存订单明细档失败");
@@ -158,64 +175,134 @@
            }
        }
        return R.ok("订单添加成功");
    }
    }*/

    @RequestMapping(value = "/order/form/modify/auth")
    @ManagerAuth(memo = "手动修改订单")
    @Transactional
    public R formModify(@RequestBody OrderDomainParam param){
        Order order = orderService.selectById(param.getOrderId());
        if (order == null || order.getStatus() == 0) {
            return R.error("订单不存在");
        }
        Date now = new Date();
        Long userId = getUserId();
        // 修改主档
        if (!param.getDocType().equals(order.getDocType())) {
            order.setDocType(param.getDocType());
            order.setUpdateBy(userId);
            order.setUpdateTime(now);
            if (!orderService.updateById(order)) {
                throw new CoolException("修改订单类型失败");
            }
        }
        // 修改明细档
//        List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
        // 1.清空明细档
        if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()))) {
            throw new CoolException("清空订单明细失败");
        }
        // 2.重组数据
        List<DetlDto> list = new ArrayList<>();
        for (OrderDetl orderDetl : param.getOrderDetlList()) {
            DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
            if (DetlDto.has(list, dto)) {
                OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch());
                item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
                if (!orderDetlService.updateById(item)) {
                    throw new CoolException("保存订单明细档失败");
                }
            } else {
                list.add(dto);
                orderDetl.setOrderId(order.getId());
                orderDetl.setOrderNo(order.getOrderNo());
                orderDetl.setCreateBy(getUserId());
                orderDetl.setCreateTime(now);
                orderDetl.setUpdateBy(getUserId());
                orderDetl.setUpdateTime(now);
                orderDetl.setStatus(1);
                orderDetl.setQty(0.0D);
                if (!orderDetlService.insert(orderDetl)) {
                    throw new CoolException("保存订单明细档失败");
                }
            }
        }
        return R.ok("订单修改成功");
    }
//    @RequestMapping(value = "/order/form/modify/auth")
//    @ManagerAuth(memo = "手动修改订单")
//    @Transactional
//    public R formModify(@RequestBody OrderDomainParam param){
//        Order order = orderService.selectById(param.getOrderId());
//        if (order == null || order.getStatus() == 0) {
//            return R.error("订单不存在");
//        }
//        Date now = new Date();
//        Long userId = getUserId();
//        // 修改主档
//        if (!param.getDocType().equals(order.getDocType())) {
//            order.setDocType(param.getDocType());
//            order.setUpdateBy(userId);
//            order.setUpdateTime(now);
//            if (!orderService.updateById(order)) {
//                throw new CoolException("修改订单类型失败");
//            }
//        }
//        // 修改明细档
////        List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
//        // 1.清空明细档
//        if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()))) {
//            throw new CoolException("清空订单明细失败");
//        }
//        // 2.重组数据
//        List<DetlDto> list = new ArrayList<>();
//        for (OrderDetl orderDetl : param.getOrderDetlList()) {
//            DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
//            if (DetlDto.has(list, dto)) {
//                OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getAnfme());
//                item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
//                if (!orderDetlService.updateById(item)) {
//                    throw new CoolException("保存订单明细档失败");
//                }
//            } else {
//                list.add(dto);
//                orderDetl.setOrderId(order.getId());
//                orderDetl.setOrderNo(order.getOrderNo());
//                orderDetl.setCreateBy(getUserId());
//                orderDetl.setCreateTime(now);
//                orderDetl.setUpdateBy(getUserId());
//                orderDetl.setUpdateTime(now);
//                orderDetl.setStatus(1);
//                orderDetl.setQty(0.0D);
//                if (!orderDetlService.insert(orderDetl)) {
//                    throw new CoolException("保存订单明细档失败");
//                }
//            }
//        }
//        return R.ok("订单修改成功");
//    }




//    @PostMapping(value = "/order/wrk/trace/auth")
//    @ManagerAuth
//    public R orderWrkTrace(@RequestParam("orderId") Long orderId) {
//        Order order = orderService.selectById(orderId);
//        if (null == order) {
//            return R.error("单据不存在");
//        }
//        // 数量统计
//        List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(orderId);
//        double totalQty = 0;
//        double wrkQty = 0;
//        double lackQty = 0;
//        double endQty = 0;
//        for (OrderDetl orderDetl : orderDetls) {
//            totalQty = totalQty + orderDetl.getAnfme();
//            wrkQty = wrkQty + orderDetl.getWorkQty();
//            endQty = endQty + orderDetl.getQty();
//            double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
//            if (issued > 0.0) {
//                List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrigin(), null);
//                for (LocDetl locDetl : locDetls) {
//                    if (issued > 0) {
//                        issued = issued - locDetl.getAnfme();
//                    } else {
//                        break;
//                    }
//                }
//            }
//            if (issued > 0.0) {
//                lackQty = lackQty + issued;
//            }
//        }
//        // 任务追溯
//        List<WrkTraceVo> wrkTraceVos = new ArrayList<>();
//        List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNoGroupByMatnrOfSum(order.getOrderNo());
//        for (WrkDetl wrkDetl : wrkDetls) {
//            WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()));
//            if (wrkMast == null) {
//                WrkMastLog wrkMastLog = wrkMastLogService.selectOne(new EntityWrapper<WrkMastLog>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()));
//                if (wrkMastLog.getIoType()==103){
//                    wrkMastLog = wrkMastLogService.selectOne(new EntityWrapper<WrkMastLog>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()).eq("io_type",53));
//                }
//                if (wrkMastLog != null) {
//                    wrkMast = new WrkMast();
//                    BeanUtils.copyProperties(wrkMastLog, wrkMast);
//                } else {
//                    continue;
//                }
//            }
//            boolean exist = false;
//            for (WrkTraceVo vo : wrkTraceVos) {
//                if (vo.getWrkNo().equals(wrkMast.getWrkNo()) && vo.getIoTimeStr().equals(DateUtils.convert(wrkMast.getIoTime()))) {
//                    vo.getWrkDetls().add(wrkDetl);
//                    exist = true;
//                }
//            }
//            if (!exist) {
//                WrkTraceVo vo = new WrkTraceVo(wrkMast.getWrkNo(), DateUtils.convert(wrkMast.getIoTime()), wrkMast, wrkDetl);
//                wrkTraceVos.add(vo);
//            }
//        }
//        if (!Cools.isEmpty(wrkTraceVos) && wrkTraceVos.size() > 1) {
//            wrkTraceVos.sort((o1, o2) -> (int) (o2.getWrkMast().getIoTime().getTime() - o1.getWrkMast().getIoTime().getTime()));
//        }
//        return R.ok().add(Cools
//                .add("list", wrkTraceVos)
//                .add("orderNo", order.getOrderNo())
//                .add("totalQty", totalQty)
//                .add("wrkQty", wrkQty+endQty)
//                .add("lackQty", lackQty)
//                .add("endQty",endQty)
//        );
//    }


    // ------------------------------------------------------------------------------------------------
@@ -259,6 +346,16 @@
        if (Cools.isEmpty(order) || null == order.getId()){
            return R.error();
        }

        //订单完结前，判断是否存在作业中数据，存在则不能完结
        if(order.getSettle() == 4){
            int wrkCount = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no",order.getOrderNo()));
            int pakinCount = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("order_no",order.getOrderNo()));
            if (wrkCount > 0 || pakinCount > 0) {
                throw new CoolException("存在作业中数据，不能完结。请检查入库通知档和工作档");
            }
        }

        order.setUpdateBy(getUserId());
        order.setUpdateTime(new Date());
        if (!orderService.updateById(order)) {
@@ -271,14 +368,15 @@
    @ManagerAuth(memo = "手动删除订单")
    @Transactional
    public R delete(@RequestParam Long orderId){
        Order order = orderService.selectById(orderId);
        if (order != null) {
            order.setStatus(0);
        }
        if (!orderService.updateById(order)) {
            throw new CoolException("删除订单失败");
        }
        orderDetlService.modifyStatus(orderId, 0);
        orderService.remove(orderId);
//        Order order = orderService.selectById(orderId);
//        if (order != null) {
//            order.setStatus(0);
//        }
//        if (!orderService.updateById(order)) {
//            throw new CoolException("删除订单失败");
//        }
//        orderDetlService.modifyStatus(orderId, 0);
        return R.ok();
    }