导入重复单据后，修改单据状态

zyx

2024-04-07 7a326ec05e656413e7d78eb40cb974cc72f08e62

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

@@ -98,6 +98,30 @@
        return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper));
    }

    //  所有入库订单
    @RequestMapping(value = "/order/detls/in/page/auth")
    @ManagerAuth
    public R orderDetls(@RequestParam(defaultValue = "1")Integer curr,
                  @RequestParam(defaultValue = "10000")Integer limit,
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam Map<String, Object> param){
        EntityWrapper<Order> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
            wrapper.orderBy("settle").orderBy("create_time", false);
        }
        wrapper.eq("status", 1);
        List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
        List<Long> docIds = new ArrayList<>();
        for (DocType pakin : pakins) {
            docIds.add(pakin.getDocId());
        }
        wrapper.in("doc_type",docIds);
        return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper));
    }

    @RequestMapping(value = "/order/detl/all/auth")
    @ManagerAuth
    public R head(@RequestParam Long orderId){
@@ -510,6 +534,9 @@
                if (!orderService.insert(order)) {
                    throw new CoolException("生成单据主档失败，请重新导入！");
                }
            }else {
                order.setSettle(order.getSettle() == 1L ? 1L : 2L );
                orderService.updateById(order);
            }

            OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), matnr, null,csocode,isocode);