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

guoyuji

2024-08-26 d3dfcd3e96cb0f2b04cfe973e4f348ee5fe96032

 north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java

@@ -232,10 +232,11 @@
            }

            Map<String,Object> otherColumns = JSON.parseObject(OrderDetails.get(i).getOtherColumns(), new TypeReference<Map<String, Object>>(){});
            int finalI = i;
            if(otherColumns!=null){
            otherColumns.values().removeIf(value -> value == null || value.equals(""));
            OrderDetails.get(i).setOtherColumns(JSON.toJSONString(otherColumns));

            int finalI = i;
            otherColumns.forEach((key, value) ->{

                if(value!=null && !value.equals("") && key.contains("M")) {
@@ -248,6 +249,10 @@
                }

            });
            }else{
                OrderDetails.get(i).setOtherColumns("{}");
            }

        }