#

Junjie

2024-01-11 901b2ab3e0e7c592602848cfa256f34c5b0c7bb8

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

@@ -95,6 +95,10 @@
        if (!Cools.isEmpty(param.get("doc_type"))) {
            wrapper.eq(Order::getDocType, param.get("doc_type"));
        }
        if (!Cools.isEmpty(param.get("docName"))) {
            DocType docType = docTypeService.getOne(new LambdaQueryWrapper<DocType>().eq(DocType::getDocName, param.get("docName")));
            wrapper.eq(Order::getDocType, docType.getDocId());
        }
        if (!Cools.isEmpty(param.get("settle"))) {
            wrapper.eq(Order::getSettle, param.get("settle"));
        }
@@ -186,7 +190,7 @@
            wrkQty = wrkQty + orderDetl.getQty();
            double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getQty()).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(), hostId);
                for (LocDetl locDetl : locDetls) {
                    if (issued > 0) {
                        issued = issued - locDetl.getAnfme();
@@ -241,7 +245,7 @@
    @ManagerAuth(memo = "手动添加订单")
    @Transactional
    public R formAdd(@RequestBody OrderDomainParam param){
        Order order = orderService.selectByNo(param.getOrderNo());
        Order order = orderService.selectByNo(param.getOrderNo(), getHostId());
        if (order != null) {
            return R.error("单据编号已存在");
        }