#

luxiaotao1123

2022-10-17 44e60ad34936374153468bce802d2f2f52feb983

#

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

@@ -497,9 +497,9 @@
                        null,    // 物流单号
                        1L,    // 订单状态
                        1,    // 状态
                        9527L,    // 添加人员
                        userId,    // 添加人员
                        now,    // 添加时间
                        9527L,    // 修改人员
                        userId,    // 修改人员
                        now,    // 修改时间
                        null    // 备注
                );
@@ -516,9 +516,9 @@
                orderDetl.setAnfme(anfme);
                orderDetl.setOrderId(order.getId());
                orderDetl.setOrderNo(order.getOrderNo());
                orderDetl.setCreateBy(9527L);
                orderDetl.setCreateBy(userId);
                orderDetl.setCreateTime(now);
                orderDetl.setUpdateBy(9527L);
                orderDetl.setUpdateBy(userId);
                orderDetl.setUpdateTime(now);
                orderDetl.setStatus(1);
                orderDetl.setQty(0.0D);

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

@@ -8,14 +8,12 @@
import com.zy.asrs.service.*;
import com.zy.common.model.LocDto;
import com.zy.common.model.OrderDto;
import com.zy.common.model.OrderMergeVo;
import com.zy.common.model.TaskDto;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import java.util.*;
import java.util.stream.Collectors;
@@ -160,4 +158,15 @@
        return R.ok();
    }


    /**
     * 合并订单汇总预览
     */
    @RequestMapping(value = "/order/merge/preview/auth")
    @ManagerAuth
    public R mergePreview(@RequestParam(value = "orderIds[]") List<Long> orderIds){
        OrderMergeVo merge = orderService.mergePreview(orderIds);
        return R.ok().add(merge);
    }

}

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

@@ -1,10 +1,11 @@
package com.zy.asrs.service;

import com.zy.asrs.entity.Order;
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;
import com.zy.common.model.OrderMergeVo;

import java.util.List;

@@ -24,4 +25,9 @@

    List<Order> selectComplete();

    /**
     * 订单合并预览
     */
    OrderMergeVo mergePreview(List<Long> ids);

}

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

@@ -13,6 +13,7 @@
import com.zy.asrs.service.*;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.common.model.DetlDto;
import com.zy.common.model.OrderMergeVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -165,4 +166,15 @@
        return this.baseMapper.selectComplete();
    }

    @Override
    public OrderMergeVo mergePreview(List<Long> ids) {
        OrderMergeVo vo = new OrderMergeVo();
        for (Long orderId : ids) {
            Order order = this.selectById(orderId);
            // 获取所有未作业的明细

        }
        return vo;
    }

}

 src/main/java/com/zy/common/model/OrderMergeVo.java

New file
@@ -0,0 +1,10 @@
package com.zy.common.model;

import lombok.Data;

/**
 * Created by vincent on 2022/10/17
 */
@Data
public class OrderMergeVo {
}

 src/main/webapp/static/js/order/out.js

@@ -349,7 +349,7 @@
    function showMerge(orderIds) {
        let loadIndex = layer.load(2);
        $.ajax({
            url: baseUrl+"/delivery/merge/preview/auth",
            url: baseUrl+"/order/merge/preview/auth",
            headers: {'token': localStorage.getItem('token')},
            method: 'GET',
            data: {

 src/main/webapp/views/order/out.html

@@ -84,7 +84,7 @@
                            </div>
                        </div>
                    </form>
                    <button style="margin-bottom: 5px" class="layui-btn icon-btn layui-btn-danger" lay-filter="mergeOut" lay-submit>
                    <button style="margin-bottom: 5px;line-height: 28px;height: 28px" class="layui-btn icon-btn layui-btn-danger" lay-filter="mergeOut" lay-submit>
                        <i class="layui-icon">&#xe656;</i>&nbsp;合并出库
                    </button>
                    <table id="originTable" lay-filter="originTable"></table>