#

Junjie

2025-05-20 08f58a6d5a2038117a1f215772f095a6e267ad9b

#

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

@@ -183,12 +183,18 @@

    @RequestMapping(value = "/order/nav/list/auth")
    @ManagerAuth
    public R navList(@RequestParam(required = false) String orderNo){
    public R navList(@RequestParam(required = false) String orderNo
            , @RequestParam(required = false) Integer settle) {
        EntityWrapper<Order> wrapper = new EntityWrapper<>();
        if (!Cools.isEmpty(orderNo)) {
            wrapper.like("order_no", orderNo);
        }
        wrapper.le("settle", 2).eq("status", 1);
        if (!Cools.isEmpty(settle)) {
            wrapper.eq("settle", settle);
        }else {
            wrapper.le("settle", 2);
        }
        wrapper.eq("status", 1);
        wrapper.orderBy("create_time", false);
        List<Order> orders = orderService.selectList(wrapper);
        // 保留出库单

 src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java

@@ -42,18 +42,18 @@
    @Transactional
    public ReturnT<String> start(WrkMast wrkMast) {
        try {
//            List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
//            // 修改订单状态 作业中 ===>> 已完成
//            if (!Cools.isEmpty(wrkDetls)) {
//                Iterator<WrkDetl> iterator = wrkDetls.iterator();
//                while (iterator.hasNext()) {
//                    WrkDetl wrkDetl = iterator.next();
//                    if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
//                        orderService.checkComplete(wrkDetl.getOrderNo());
//                        iterator.remove();
//                    }
//                }
//            }
            List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
            // 修改订单状态 作业中 ===>> 已完成
            if (!Cools.isEmpty(wrkDetls)) {
                Iterator<WrkDetl> iterator = wrkDetls.iterator();
                while (iterator.hasNext()) {
                    WrkDetl wrkDetl = iterator.next();
                    if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
                        orderService.checkComplete(wrkDetl.getOrderNo());
                        iterator.remove();
                    }
                }
            }

            // 入库 --------------------------------------------------------------------------------
            if (wrkMast.getWrkSts() == 5) {

 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java

@@ -463,19 +463,19 @@



                    Boolean finsihed = orderDetlService.checkAllDetlFinish(wrkDetls101.get(0).getOrderNo());
                    if (finsihed) {
                        Boolean mastFinished = wrkMastService.checkFinishByOrder(wrkDetls101.get(0).getOrderNo());
                        if (mastFinished) {
                            Order order = orderService.selectByNo(wrkDetls101.get(0).getOrderNo());
                            if (!Cools.isEmpty(order)) {
                                order.setMemo("0");//状态转换成开始下推
                                orderService.updateById(order);
                                orderService.updateSettle(order.getId(),4L,1L);

                            }
                        }
                    }
//                    Boolean finsihed = orderDetlService.checkAllDetlFinish(wrkDetls101.get(0).getOrderNo());
//                    if (finsihed) {
//                        Boolean mastFinished = wrkMastService.checkFinishByOrder(wrkDetls101.get(0).getOrderNo());
//                        if (mastFinished) {
//                            Order order = orderService.selectByNo(wrkDetls101.get(0).getOrderNo());
//                            if (!Cools.isEmpty(order)) {
//                                order.setMemo("0");//状态转换成开始下推
//                                orderService.updateById(order);
//                                orderService.updateSettle(order.getId(),4L,1L);
//
//                            }
//                        }
//                    }


                    break;

 src/main/resources/mapper/OrderDetlMapper.xml

@@ -87,7 +87,7 @@

    <sql id="pakOutPageCondition">
        <if test="order_id!=null and order_id!='' ">
            and mod.order_id like '%' + #{order_id} + '%'
            and mod.order_id = #{order_id}
        </if>
        <if test="matnr!=null and matnr!='' ">
            and mod.matnr like '%' + #{matnr} + '%'

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

@@ -75,6 +75,15 @@
                                <input name="orderNo" class="layui-input" placeholder="输入单据编号" autocomplete="off"/>
                            </div>
                            <div class="layui-inline">
                                <div class="layui-input-inline">
                                    <select name="settle">
                                        <option value="">选择状态</option>
                                        <option value="1">待处理</option>
                                        <option value="2">作业中</option>
                                    </select>
                                </div>
                            </div>
                            <div class="layui-inline">
                                <button class="layui-btn icon-btn" lay-filter="originTableSearch" lay-submit>
                                    <i class="layui-icon">&#xe615;</i>搜索
                                </button>