no message

skyouc

6 天以前 e046dba174365eb8934ee1e4206f09821145e876

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java

@@ -45,16 +45,16 @@


    @Override

    @Transactional

    public boolean createOrder(List<CreateOrderParam> list) {

    public boolean createOrder(List<CreateOrderParam> list, Long userId) {

        for (CreateOrderParam orderParam : list) {

            createOrder(orderParam);

            createOrder(orderParam, userId);

        }

        return true;

    }



    @Override

    @Transactional

    public boolean createOrder(CreateOrderParam param) {

    public boolean createOrder(CreateOrderParam param, Long userId) {

        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");



        List<Order> orderList = this.list(new LambdaQueryWrapper<Order>().eq(Order::getOrderNo, param.getOrderNo()));

@@ -77,7 +77,8 @@
        order.setIoPri(orderUtils.getIoPri());

        order.setOrderTime(format.format(new Date()));

        order.setCreateTime(new Date());

        order.setCreateBy(9527L);

        order.setCreateBy(userId);

        order.setUpdateBy(userId);

        boolean result = this.save(order);

        if (!result) {

            throw new CoolException("生成订单失败");

@@ -125,7 +126,8 @@
            orderDetl.setMatId(mat.getId());

            orderDetl.setMemo(memo);

            orderDetl.setCreateTime(new Date());

            orderDetl.setCreateBy(9527L);

            orderDetl.setCreateBy(userId);

            orderDetl.setUpdateBy(userId);

            boolean save = orderDetlService.save(orderDetl);

            if (!save) {

                throw new CoolException("订单明细创建失败");

@@ -323,8 +325,6 @@
    @Override

    public List<OrderInfoDto> getDetlForOrderId(Long id, String matnr) {

        if (!Objects.isNull(matnr)) {

//            Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>()

//                    .eq(StringUtils.isNotBlank(matnr), Mat::getMatnr, matnr), false);

            if (Objects.isNull(matnr)) {

                return this.baseMapper.getDetlForOrderId(id, null);

            } else {

@@ -334,4 +334,14 @@
            return this.baseMapper.getDetlForOrderId(id, null);

        }

    }



    /**

     * 提交完结订单

     * @param id

     * @return

     */

    @Override

    public Order doneOrder(Long id) {

        return null;

    }

}