ERP_override.git

			@@ -269,7 +269,8 @@
			deliveryDetailArea=getComputeArea.multiply(getQuantity).doubleValue();

			}else if (calculateType==2){
			if(Objects.equals(orderDetail.getArea(), orderDetail.getComputeArea())){
			//判断实际单片面积跟结算单片面积是否相等结算总面积跟实际总面积是否相等
			if(Objects.equals(orderDetail.getArea(), orderDetail.getComputeArea())&&Objects.equals(orderDetail.getGrossArea(), orderDetail.getComputeGrossArea())){
			deliveryDetailMoney=getWidth.multiply(getHeight).multiply(getQuantity).divide(BigDecimal.valueOf(1000000), 2, RoundingMode.HALF_UP)
			.multiply(getPrice).setScale(2, RoundingMode.HALF_UP).doubleValue();
			deliveryDetailArea=getWidth.multiply(getHeight).multiply(getQuantity).divide(BigDecimal.valueOf(1000000), 2, RoundingMode.HALF_UP).doubleValue();
			@@ -309,7 +310,8 @@
			boolean isnull = key.contains("M");
			if(isnull) {
			Map<String, Object> moneryItemmap = new HashMap<>();
			Map<String, Object> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectOrderotherMoney(orderDetail.getOrderId(),orderDetail.getOrderNumber(), key, jsonObject.get(key).toString());
			Map<String, Object> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectOrderotherMoney(orderDetail.getOrderId(),orderDetail.getOrderNumber(),
			key, Double.valueOf(jsonObject.get(key).toString()));
			if(deliveryDetailOtherMoney.get("monery")!=null){
			otherMoneys=otherMoneys+Double.valueOf(deliveryDetailOtherMoney.get("monery").toString());
			deliveryDetailotherMoneys=Double.valueOf(deliveryDetailOtherMoney.get("monery").toString());
			@@ -376,7 +378,7 @@

			int intMoney= (int) Math.round(money+freight+otherMoneys);
			//修改发货明细累加面积数量金额
			deliveryMapper.updatedelivery(Double.valueOf(String.format("%.2f", area)), quantity, Double.valueOf(intMoney), otherMoney.get(), oddNumber);
			deliveryMapper.updatedelivery(Double.valueOf(String.format("%.2f", area)), quantity, Double.valueOf(intMoney), otherMoneys, oddNumber);
			logService.saveLog(log);
			} else {
			return "false3";
			@@ -488,8 +490,8 @@
			if(isnull) {
			Map<String, Object> moneryItemmap = new HashMap<>();
			Map<String, Object> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectotherMoney(detail.getOrderDetail().getOrderId(),
			detail.getDeliveryId(),Integer.parseInt(stringObjectMap.get("order_number").toString()), key, jsonObject.get(key).toString());

			detail.getDeliveryId(),Integer.parseInt(stringObjectMap.get("order_number").toString()), key,Double.valueOf(jsonObject.get(key).toString()));
			Double sss= Double.valueOf(jsonObject.get(key).toString());
			moneryItemmap.put("DeliveryDetailOtherMoney", deliveryDetailOtherMoney);
			moneryList.add(moneryItemmap);
			}
			@@ -544,7 +546,8 @@
			boolean isnull = key.contains("M");
			if(isnull){
			Map<String, Object> moneryItemmap = new HashMap<>();
			Map<String, Object> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectOrderotherMoney(detail.getOrderId(),Integer.parseInt(stringObjectMap.get("order_number").toString()),key,jsonObject.get(key).toString());
			Map<String, Object> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectOrderotherMoney(detail.getOrderId(),Integer.parseInt(stringObjectMap.get("order_number").toString())
			,key,Double.valueOf(jsonObject.get(key).toString()));
			grossAmount=grossAmount.add(BigDecimal.valueOf(Double.parseDouble(deliveryDetailOtherMoney.get("monery").toString())));
			moneryItemmap.put("DeliveryDetailOtherMoney", deliveryDetailOtherMoney);
			moneryList.add(moneryItemmap);