出入库历史记录表名称根据DDL变更2

chen.llin

2025-12-24 3929fa30f8c98403beb886cf7a4cbf90894add02

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

@@ -15,6 +15,7 @@
import com.zy.common.web.BaseController;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

@@ -44,6 +45,8 @@
    private WrkMastLogService wrkMastLogService;
    @Autowired
    private ClientService clientService;
    @Autowired
    private InventoryReserveService inventoryReserveService;

    @RequestMapping(value = "/order/nav/list/auth")
    @ManagerAuth
@@ -76,10 +79,10 @@
    @RequestMapping(value = "/order/head/page/auth")
    @ManagerAuth
    public R head(@RequestParam(defaultValue = "1") Integer curr,
                  @RequestParam(defaultValue = "10") Integer limit,
                  @RequestParam(required = false) String orderByField,
                  @RequestParam(required = false) String orderByType,
                  @RequestParam Map<String, Object> param) {
            @RequestParam(defaultValue = "10") Integer limit,
            @RequestParam(required = false) String orderByField,
            @RequestParam(required = false) String orderByType,
            @RequestParam Map<String, Object> param) {
        EntityWrapper<OrderPakout> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
@@ -115,45 +118,45 @@
            return R.error("单据编号已存在");
        }
        Client client = clientService.selectOne(new EntityWrapper<Client>().eq("name", param.getCstmrName()));
        if (null == client){
        if (null == client) {
            return R.error("客户不存在");
        }
        Date now = new Date();
        order = new OrderPakout(
                String.valueOf(snowflakeIdWorker.nextId()),    // 编号[非空]
                param.getOrderNo(),    // 订单编号
                param.getOrderTime(),    // 单据日期
                param.getDocType(),    // 单据类型
                null,    // 项目编号
                null,    //
                null,    // 调拨项目编号
                null,    // 初始票据号
                null,    // 票据号
                client.getCode(),    // 客户编号
                client.getName(),    // 客户
                null,    // 联系方式
                null,    // 操作人员
                null,    // 合计金额
                null,    // 优惠率
                null,    // 优惠金额
                null,    // 销售或采购费用合计
                null,    // 实付金额
                null,    // 付款类型
                null,    // 业务员
                null,    // 结算天数
                null,    // 邮费支付类型
                null,    // 邮费
                null,    // 付款时间
                null,    // 发货时间
                null,    // 物流名称
                null,    // 物流单号
                1L,    // 订单状态
                1,    // 状态
                getUserId(),    // 添加人员
                now,    // 添加时间
                getUserId(),    // 修改人员
                now,    // 修改时间
                null    // 备注
                String.valueOf(snowflakeIdWorker.nextId()), // 编号[非空]
                param.getOrderNo(), // 订单编号
                param.getOrderTime(), // 单据日期
                param.getDocType(), // 单据类型
                null, // 项目编号
                null, //
                null, // 调拨项目编号
                null, // 初始票据号
                null, // 票据号
                client.getCode(), // 客户编号
                client.getName(), // 客户
                null, // 联系方式
                null, // 操作人员
                null, // 合计金额
                null, // 优惠率
                null, // 优惠金额
                null, // 销售或采购费用合计
                null, // 实付金额
                null, // 付款类型
                null, // 业务员
                null, // 结算天数
                null, // 邮费支付类型
                null, // 邮费
                null, // 付款时间
                null, // 发货时间
                null, // 物流名称
                null, // 物流单号
                1L, // 订单状态
                1, // 状态
                getUserId(), // 添加人员
                now, // 添加时间
                getUserId(), // 修改人员
                now, // 修改时间
                null // 备注
        );
        if (!orderService.insert(order)) {
            throw new CoolException("保存订单主档失败");
@@ -164,8 +167,10 @@
                    orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(),
                    orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3());
            if (DetlDto.has(list, dto)) {
                OrderDetlPakout item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(),
                        orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(), orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3());
                OrderDetlPakout item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(),
                        orderDetl.getBatch(), orderDetl.getBrand(),
                        orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(),
                        orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3());
                item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
                if (!orderDetlService.updateById(item)) {
                    throw new CoolException("保存订单明细档失败");
@@ -199,23 +204,26 @@
        Date now = new Date();
        Long userId = getUserId();
        Client client = clientService.selectOne(new EntityWrapper<Client>().eq("name", param.getCstmrName()));
        if (null == client){
        if (null == client) {
            return R.error("客户不存在");
        }
        order.setCstmr(client.getCode());
        order.setCstmrName(client.getName());
        // 修改主档
        if (!param.getDocType().equals(order.getDocType()) || !param.getOrderTime().equals(order.getOrderTime())) {
            order.setCstmr(client.getCode());
            order.setCstmrName(client.getName());

            order.setDocType(param.getDocType());
            order.setOrderTime(param.getOrderTime());
            order.setUpdateBy(userId);
            order.setUpdateTime(now);
            if (!orderService.updateById(order)) {
                throw new CoolException("修改订单类型失败");
            }

        }
        order.setUpdateBy(userId);
        order.setUpdateTime(now);
        if (!orderService.updateById(order)) {
            throw new CoolException("修改订单类型失败");
        }

        // 修改明细档
//        List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
        // List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
        // 1.清空明细档
        if (!orderDetlService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_id", order.getId()))) {
            throw new CoolException("清空订单明细失败");
@@ -227,7 +235,8 @@
                    orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(),
                    orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3());
            if (DetlDto.has(list, dto)) {
                OrderDetlPakout item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),
                OrderDetlPakout item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(),
                        orderDetl.getBatch(),
                        orderDetl.getBrand(), orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(),
                        orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3());
                item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
@@ -271,7 +280,8 @@
            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);
                List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(),
                        orderDetl.getOrigin(), null);
                for (LocDetl locDetl : locDetls) {
                    if (issued > 0) {
                        issued = issued - locDetl.getAnfme();
@@ -288,11 +298,14 @@
        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()));
            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()));
                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));
                    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();
@@ -303,18 +316,21 @@
            }
            boolean exist = false;
            for (WrkTraceVo vo : wrkTraceVos) {
                if (vo.getWrkNo().equals(wrkMast.getWrkNo()) && vo.getIoTimeStr().equals(DateUtils.convert(wrkMast.getIoTime()))) {
                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);
                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()));
            wrkTraceVos.sort(
                    (o1, o2) -> (int) (o2.getWrkMast().getIoTime().getTime() - o1.getWrkMast().getIoTime().getTime()));
        }
        return R.ok().add(Cools
                .add("list", wrkTraceVos)
@@ -322,10 +338,8 @@
                .add("totalQty", totalQty)
                .add("wrkQty", wrkQty)
                .add("lackQty", lackQty)
                .add("endQty", endQty)
        );
                .add("endQty", endQty));
    }


    // ------------------------------------------------------------------------------------------------

@@ -338,10 +352,10 @@
    @RequestMapping(value = "/order/list/auth")
    @ManagerAuth
    public R list(@RequestParam(defaultValue = "1") Integer curr,
                  @RequestParam(defaultValue = "10") Integer limit,
                  @RequestParam(required = false) String orderByField,
                  @RequestParam(required = false) String orderByType,
                  @RequestParam Map<String, Object> param) {
            @RequestParam(defaultValue = "10") Integer limit,
            @RequestParam(required = false) String orderByField,
            @RequestParam(required = false) String orderByType,
            @RequestParam Map<String, Object> param) {
        EntityWrapper<OrderPakout> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
@@ -371,10 +385,11 @@
            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()));
            int pakinCount = waitPakinService
                    .selectCount(new EntityWrapper<WaitPakin>().eq("order_no", order.getOrderNo()));
            if (wrkCount > 0 || pakinCount > 0) {
                throw new CoolException("存在作业中数据，不能完结。请检查入库通知档和工作档");
            }
@@ -393,14 +408,14 @@
    @Transactional
    public R delete(@RequestParam Long orderId) {
        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);
        // 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();
    }

@@ -434,11 +449,59 @@
    @RequestMapping(value = "/order/check/column/auth")
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {
        Wrapper<OrderPakout> wrapper = new EntityWrapper<OrderPakout>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        Wrapper<OrderPakout> wrapper = new EntityWrapper<OrderPakout>().eq(humpToLine(String.valueOf(param.get("key"))),
                param.get("val"));
        if (null != orderService.selectOne(wrapper)) {
            return R.parse(BaseRes.REPEAT).add(getComment(OrderPakout.class, String.valueOf(param.get("key"))));
        }
        return R.ok();
    }

    @RequestMapping(value = "/order/reserve/auth")
    @ManagerAuth(memo = "订单库存预留")
    @Transactional
    public R reserve(@RequestParam Long orderId,
            @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date expireTime) {
        OrderPakout order = orderService.selectById(orderId);
        if (order == null) {
            return R.error("订单不存在");
        }
        // 检查是否已存在该订单的预留记录
        int existCount = inventoryReserveService.selectCount(
                new EntityWrapper<InventoryReserve>().eq("order_no", order.getOrderNo()));
        if (existCount > 0) {
            return R.error("该订单已存在预留记录，不能重复创建");
        }
        // 查询订单明细
        List<OrderDetlPakout> orderDetls = orderDetlService.selectByOrderId(orderId);
        if (Cools.isEmpty(orderDetls)) {
            return R.error("订单明细为空");
        }
        Date now = new Date();
        Long userId = getUserId();
        // 为每条明细创建库存预留记录
        for (OrderDetlPakout detl : orderDetls) {
            InventoryReserve reserve = new InventoryReserve();
            reserve.setMatnr(detl.getMatnr());
            reserve.setMaktx(detl.getMaktx());
            reserve.setOrderNo(order.getOrderNo());
            reserve.setBatch(detl.getBatch());
            reserve.setQuantity(java.math.BigDecimal.valueOf(detl.getAnfme()));
            reserve.setExpireTime(expireTime);
            reserve.setCreateTime(now);
            reserve.setCreateBy(userId);
            reserve.setUpdateTime(now);
            reserve.setUpdateBy(userId);
            reserve.setBrand(detl.getBrand());
            reserve.setStandby1(detl.getStandby1());
            reserve.setStandby2(detl.getStandby2());
            reserve.setStandby3(detl.getStandby3());
            reserve.setBoxType1(detl.getBoxType1());
            reserve.setBoxType2(detl.getBoxType2());
            reserve.setBoxType3(detl.getBoxType3());
            inventoryReserveService.insert(reserve);
        }
        return R.ok("预留成功，共创建 " + orderDetls.size() + " 条预留记录");
    }

}