ERP_override.git

			@@ -6,6 +6,8 @@
			import com.alibaba.fastjson.JSONObject;
			import com.alibaba.fastjson.TypeReference;
			import com.baomidou.dynamic.datasource.annotation.DS;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
			import com.example.erp.dto.sd.DeliveryDetailDTO;
			import com.example.erp.dto.sd.DeliveryDetailProductDTO;
			import com.example.erp.entity.mm.FinishedOperateLog;
			@@ -181,6 +183,7 @@
			deliveryId = "";
			}
			String deliveryIdType = object.get("deliveryIdType").toString();
			Integer type = Integer.valueOf(object.get("type").toString());
			Delivery delivery = JSONObject.parseObject(JSONObject.toJSONString(object.get("title")), Delivery.class);
			List<OrderDetail> orderDetaillist = JSONArray.parseArray(JSONObject.toJSONString(object.get("delivery")), OrderDetail.class);
			List<DeliveryOtherMoney> deliveryOtherMoneyList = JSONArray.parseArray(JSONObject.toJSONString(object.get("otherMoney")), DeliveryOtherMoney.class);
			@@ -395,6 +398,18 @@
			int intMoney= (int) Math.round(money+freight+otherMoneys);
			//修改发货明细累加面积数量金额
			deliveryMapper.updatedelivery(Double.valueOf(String.format("%.2f", area)), quantity, Double.valueOf(intMoney), otherMoneys, oddNumber);


			if(type.equals(2)){
			if(Boolean.parseBoolean(object.get("deliveryOutbound").toString())){
			List<OrderDetail> orderDetaillists=finishedGoodsInventoryMapper.getSelectDeliveryDetailDeliveryId(oddNumber);
			if(!Objects.equals(finishedGoodsInventoryService.deliveryDetailLogic(orderDetaillists,savePoint,delivery.getCreator()), "true")){
			return finishedGoodsInventoryService.deliveryDetailLogic(orderDetaillists,savePoint,delivery.getCreator());
			}
			}

			deliveryMapper.updateDeliveryToExamine(oddNumber,2);
			}
			logService.saveLog(log);
			} else {
			return "false3";
			@@ -407,11 +422,13 @@
			sysError.setFunc("insertDelivery");
			sysErrorService.insert(sysError);
			saveState = "false4";

			}

			return saveState;
			}






			public String updateDeliveryToExamine(Map<String,Object> object) {
			@@ -462,7 +479,6 @@
			sysError.setFunc("addDeliveryDetail");
			sysErrorService.insert(sysError);
			saveState = "false";

			}
			return saveState;

			@@ -508,7 +524,6 @@
			sysError.setFunc("deleteDelivery");
			sysErrorService.insert(sysError);
			saveState = false;

			}
			return saveState;

			@@ -576,7 +591,6 @@
			itemmap.put("DeliveryDetail", detail);
			itemmap.put("DeliveryDetailList", deliveryDetailList2);
			list.add(itemmap);

			}
			/*Delivery delivery=deliveryMapper.getSelectShippingOrderDetailDeliveryPrinting(deliveryDetail);
			delivery.setMoney(delivery.getMoney()+otherMoney);