ERP_override.git

			@@ -25,6 +25,7 @@

			import java.math.BigDecimal;
			import java.math.RoundingMode;
			import java.sql.SQLOutput;
			import java.text.SimpleDateFormat;
			import java.time.LocalDate;
			import java.util.*;
			@@ -87,7 +88,7 @@
			TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
			//将异常传入数据库
			SysError sysError = new SysError();
			sysError.setError(e.toString());
			sysError.setError(e.toString()+Arrays.toString(e.getStackTrace()));
			sysError.setFunc("saveOrder");
			sysErrorService.insert(sysError);
			saveState = false;
			@@ -232,21 +233,26 @@

			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));

			otherColumns.forEach((key, value) ->{
			if(value!=null && key.contains("M")) {

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

			});
			}else if(OrderDetails.get(i).getOtherColumns()==null){
			}else{
			OrderDetails.get(i).setOtherColumns("{}");
			}

			}