#检验流程

lty

16 小时以前 daac5618fc2322620a82d25603c5b4d15465c5ef

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

@@ -98,6 +98,184 @@
        return r;
    }

    @RequestMapping(value = "/order/inspect/list/auth")
    @ManagerAuth
    public R inspectList(@RequestParam(required = false) String orderNo){
        // 1. 查找包含“检验”或“Inspection”的 DocType IDs
        List<DocType> docTypes = docTypeService.selectList(new EntityWrapper<DocType>()
                .like("doc_name", "检验")
                .or()
                .like("doc_name", "Inspection"));
        
        if (Cools.isEmpty(docTypes)) {
            R r = R.ok();
            r.put("data", new ArrayList<>());
            return r;
        }

        List<Long> docTypeIds = new ArrayList<>();
        for (DocType dt : docTypes) {
            docTypeIds.add(dt.getDocId());
        }

        // 2. 查找对应类型的订单
        EntityWrapper<Order> wrapper = new EntityWrapper<>();
        if (!Cools.isEmpty(orderNo)) {
            wrapper.like("order_no", orderNo);
        }
        wrapper.in("doc_type", docTypeIds);
        wrapper.le("settle", 2); // 待处理或处理中
        wrapper.eq("status", 1);
        wrapper.orderBy("create_time", false);
        
        List<Order> orders = orderService.selectList(wrapper);
        R r = R.ok();
        r.put("data", orders);
        return r;
    }

    @RequestMapping(value = "/order/inspection/matchingLocations/auth")
    @ManagerAuth
    public R queryMatchingLocations(
            @RequestParam(required = false) String poNumber,
            @RequestParam(required = false) String style,
            @RequestParam(required = false) String color,
            @RequestParam(required = false) Integer cartonNumberFrom,
            @RequestParam(required = false) Integer cartonNumberTo) {
        if(Cools.isEmpty(poNumber)){
            return R.error("response.poNumber_no_exists");
        }

        EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
        if (!Cools.isEmpty(poNumber)) {
            wrapper.eq("sku", poNumber);
        }
        if (!Cools.isEmpty(style)) {
            wrapper.eq("specs", style);
        }
        if (!Cools.isEmpty(color)) {
            wrapper.eq("color", color);
        }
        wrapper.eq("item_num",null);

        List<LocDetl> all = locDetlService.selectList(wrapper);
        List<LocDetl> list = new ArrayList<>();

        if (cartonNumberFrom == null && cartonNumberTo == null) {
            list = all;
        } else {
            for (LocDetl item : all) {
                String batch = item.getBatch();
                if (Cools.isEmpty(batch)) {
                    continue;
                }
                String numStr = batch.replaceAll("[^0-9]", "");
                if (Cools.isEmpty(numStr)) {
                    continue;
                }
                Integer num;
                try {
                    num = Integer.parseInt(numStr);
                } catch (NumberFormatException e) {
                    continue;
                }
                if (cartonNumberFrom != null && num < cartonNumberFrom) {
                    continue;
                }
                if (cartonNumberTo != null && num > cartonNumberTo) {
                    continue;
                }
                list.add(item);
            }
        }

        Map<String, Object> data = new HashMap<>();
        data.put("records", list);
        data.put("total", list.size());

        return R.ok(data);
    }

    @RequestMapping(value = "/order/inspection/create/auth")
    @ManagerAuth(memo = "response.create_inspection_order")
    @Transactional
    public R createInspectionOrder(@RequestBody Map<String, Object> params) {
        String orderNo = (String) params.get("orderNo");
        String buyerShortCode = (String) params.get("buyerShortCode");
        List<Map<String, Object>> records = (List<Map<String, Object>>) params.get("records");

        if (Cools.isEmpty(orderNo) || Cools.isEmpty(records)) {
            return R.error("response.invalid_param");
        }

        Order orderCheck = orderService.selectByNo(orderNo);
        if (orderCheck != null) {
            return R.error("response.order_no_exists");
        }

        Date now = new Date();
        Long userId = getUserId();
        
        // 查找检验类型的单据
        DocType inspectionDocType = docTypeService.selectOne(new EntityWrapper<DocType>().like("doc_name", "检验").or().like("doc_name", "Inspection"));
        Long docTypeId = (inspectionDocType != null) ? inspectionDocType.getDocId() : null;

        // 使用与 formAdd 相同的完整构造函数确保所有必要字段都被初始化
        Order order = new Order(
                String.valueOf(snowflakeIdWorker.nextId()),    // 编号[非空]
                orderNo,    // 订单编号
                DateUtils.convert(now),    // 单据日期
                docTypeId,    // 单据类型
                null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
                1L,    // 订单状态 (待处理)
                1,    // 状态 (正常)
                userId, now, userId, now,
                "Inspection Order for Buyer: " + buyerShortCode    // 备注
        );

        if (!orderService.insert(order)) {
            throw new CoolException("response.save_order_master_failed");
        }

        // 保存所有检索到的记录作为订单明细
        for (Map<String, Object> record : records) {
            OrderDetl detl = new OrderDetl();
            detl.setOrderId(Long.valueOf(order.getId()));
            detl.setOrderNo(order.getOrderNo());
            detl.setMatnr((String) record.get("matnr"));
            detl.setMaktx((String) record.get("maktx"));
            detl.setSpecs((String) record.get("specs"));
            detl.setColor((String) record.get("color"));
            detl.setBatch((String) record.get("batch"));
            detl.setAnfme(Double.valueOf(String.valueOf(record.get("anfme"))));
            detl.setSku((String) record.get("sku"));
            detl.setOrigin((String) record.get("zpallet"));
            detl.setBarcode((String) record.get("barcode"));
            detl.setManu((String) record.get("manu"));
            detl.setManuDate((String) record.get("manuDate"));
            
            detl.setWorkQty(0.0);
            detl.setQty(0.0);
            detl.setStatus(1);
            detl.setCreateBy(userId);
            detl.setCreateTime(now);
            detl.setUpdateBy(userId);
            detl.setUpdateTime(now);

            if (!orderDetlService.insert(detl)) {
                throw new CoolException("response.save_order_detail_failed");
            }
            LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("zpallet", detl.getOrigin()).eq("batch",detl.getBatch()));
            if (locDetl != null) {
                if (!locDetlService.updateInspectNumber(detl.getOrigin(),detl.getBatch(),detl.getOrderNo())) {
                    throw new CoolException("response.save_order_detail_failed");
                }
            }
        }

        return R.ok("response.order_add_success");
    }

    @RequestMapping(value = "/order/form/add/auth")
    @ManagerAuth(memo = "response.manual_add_order")
    @Transactional
@@ -374,6 +552,17 @@
    @ManagerAuth(memo = "response.manual_delete_order")
    @Transactional
    public R delete(@RequestParam Long orderId){
        Order order = orderService.selectById(orderId);
        if (order != null) {
            DocType docType = docTypeService.selectById(order.getDocType());
            String docName = docType != null ? String.valueOf(docType.getDocName()) : "";
            if (!Cools.isEmpty(docName)) {
                String dn = docName.toLowerCase();
                if (dn.contains("inspection") || dn.contains("检验")) {
                    locDetlService.clearInspectNumberByOrderNo(order.getOrderNo());
                }
            }
        }
        orderService.remove(orderId);
//        Order order = orderService.selectById(orderId);
//        if (order != null) {
@@ -425,4 +614,25 @@
        return R.ok();
    }

    @RequestMapping(value = "/order/checkInspection/auth")
    @ManagerAuth
    @Transactional
    public R checkInspection(@RequestParam String orderNo, Integer inspectNumber) {
        if (orderNo == null || orderNo.isEmpty()) {
            return R.error("response.order_no_is_empty");
        }
        
        // 1. 更新库存明细中的检验状态
        locDetlService.updateInspectionStatus(orderNo, inspectNumber);
        
        // 2. 更新单据主档状态为已完成 (settle = 4)
        Order order = orderService.selectByNo(orderNo);
        if (order != null) {
            order.setSettle(4L);
            orderService.updateById(order);
        }
        
        return R.ok("response.operation_success");
    }

}