ERP_override.git

			@@ -160,9 +160,9 @@
			return map;
			}

			public Boolean insertDelivery(Map<String,Object> object) {
			public String insertDelivery(Map<String,Object> object) {

			boolean saveState = true;
			String saveState = "true";
			//设置回滚点
			Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();

			@@ -239,6 +239,11 @@
			//获取对象集合循环进行新增修改
			if (!orderDetaillist.isEmpty()) {
			for (OrderDetail orderDetail : orderDetaillist) {
			OrderDetail orderDetails =deliveryDetailMapper.selectOrderDetailDeliveryCount(orderDetail);
			Boolean aBoolean1 =orderDetails.getQuantity()>= orderDetail.getDeliveryDetail().getQuantity()+orderDetails.getDeliveryNum();
			Boolean aBoolean2 = !Integer.valueOf(orderDetails.getQuantity().toString()).equals(orderDetails.getDeliveryNum());
			//判断是否已经发货
			if(aBoolean1 && aBoolean2){
			double deliveryDetailotherMoneys=0.0;
			Integer calculateType=0;

			@@ -307,7 +312,7 @@
			moneryList.add(moneryItemmap);
			}else{
			TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
			return false;
			return "false1";
			}
			}
			}
			@@ -343,6 +348,11 @@
			deliveryDetailMapper.updateOrderDetailDeliveryNum(orderDetail);
			//修改库存表出库数量
			finishedGoodsInventoryMapper.updateInventoryquantityOut(orderDetail.getOrderId(), orderDetail.getOrderNumber(), orderDetail.getDeliveryDetail().getQuantity());
			}else{
			TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
			return "false2";
			}


			}
			//往订单其他金额副表传入数据
			@@ -365,7 +375,7 @@
			deliveryMapper.updatedelivery(Double.valueOf(String.format("%.2f", area)), quantity, Double.valueOf(intMoney), otherMoney.get(), oddNumber);
			logService.saveLog(log);
			} else {
			return false;
			return "false3";
			}
			}catch (Exception e) {
			TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
			@@ -374,7 +384,7 @@
			sysError.setError(e+Arrays.toString(e.getStackTrace()));
			sysError.setFunc("insertDelivery");
			sysErrorService.insert(sysError);
			saveState = false;
			saveState = "false4";

			}