Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyujie

2025-09-05 b0c60452329a61c32db74a1c7d7753d383d6310a

 north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java

@@ -1214,26 +1214,29 @@
    }

    public Boolean updateProcessSv(String processId,String orderNumber, String technologyNumber, String orderId, String Orderprocess, Map<String, Object> object) {
        List<OrderProcessDetail> resultList = new ArrayList<>();
        //获取已报工工艺流程
        String processOk = flowCardMapper.getProcessOk(processId,orderNumber,technologyNumber);
        List<String> okList = Arrays.asList(processOk.split("->"));
        List<String> orderList = Arrays.asList(Orderprocess.split("->"));
        if (processOk != null && !processOk.isEmpty()){
            List<String> okList = Arrays.asList(processOk.split("->"));
            List<String> orderList = Arrays.asList(Orderprocess.split("->"));

        // 判断 processOk 的每个工序是否都包含在 orderProcess 中
        for (String p : okList) {
            if (!orderList.contains(p)) {
                return false;
            // 判断 processOk 的每个工序是否都包含在 orderProcess 中
            for (String p : okList) {
                if (!orderList.contains(p)) {
                    return false;
                }
            }
        }

        List<OrderProcessDetail> resultList = new ArrayList<>();

        for (String process : okList) {
            List<OrderProcessDetail> details =
                    flowCardMapper.getProcessDetail(processId,orderNumber, technologyNumber, process);

            if (details != null && !details.isEmpty()) {
                resultList.addAll(details);
            for (String process : okList) {
                List<OrderProcessDetail> details =
                        flowCardMapper.getProcessDetail(processId,orderNumber, technologyNumber, process);

                if (details != null && !details.isEmpty()) {
                    resultList.addAll(details);
                }
            }
        }