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

guoyujie

6 小时以前 9b362b55344d0c854355eb2db1de84219b53a77e

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

@@ -209,7 +209,7 @@
                            .eq("basic_name",uniqueList.get(i).get("process"))
                            .last("limit 1")
            );

            if(basicData!=null){
            //判断夹胶和夹胶后工序
            //Objects.equals(basicData.getNickname(), "stepA") || Objects.equals(basicData.getNickname(), "stepC")
            if(Objects.equals(basicData.getNickname(), "stepA") || Objects.equals(basicData.getNickname(), "stepC")){
@@ -222,6 +222,8 @@
            }
        }

        }


        List<Map<String, Object>> getRowCount = orderProcessDetailMapper.getGlassLRow(orderId);
        HashMap<Integer,Map<String, Object>> getRowCountMap = new HashMap<>();