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

廖井涛

17 小时以前 02a346b1b78c8d2b6b3c298ed2fb8feea8ef96ee

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

@@ -567,7 +567,7 @@

                    if(value!=null && !value.equals("") && key.contains("M")) {
                        orderOtherMoneyLists.forEach(orderOtherMoney -> {
                            if (orderOtherMoney.getColumn().equals(key)) {
                            if (orderOtherMoney.getColumn()!=null&&orderOtherMoney.getColumn().equals(key)) {
                                orderOtherMoney.setQuantity(
                                        orderOtherMoney.getQuantity()+(Double.parseDouble((String) value)  * finalOrderDetail.getQuantity()));
                            }