ERP_override.git

			@@ -6,6 +6,9 @@
			import com.alibaba.fastjson.JSONObject;
			import com.alibaba.fastjson.TypeReference;
			import com.baomidou.dynamic.datasource.annotation.DS;
			import com.example.erp.dto.mm.FinishedOperateLogDTO;
			import com.example.erp.dto.sd.DeliveryDetailDTO;
			import com.example.erp.dto.sd.DeliveryDetailProductDTO;
			import com.example.erp.entity.sd.*;
			import com.example.erp.entity.userInfo.SysError;
			import com.example.erp.mapper.mm.FinishedGoodsInventoryMapper;
			@@ -184,7 +187,7 @@
			}
			}

			List<DeliveryDetail> deliveryDetaillist = deliveryDetailMapper.getIsNotDeliveryDetail(deliveryDetailNumber, deliveryId);
			List<DeliveryDetail> deliveryDetaillist = deliveryDetailMapper.getIsNotDeliveryDetail(deliveryId);
			if (!deliveryDetaillist.isEmpty()) {
			for (DeliveryDetail deliveryDetail : deliveryDetaillist) {
			//还原库存数以及订单明细的发货数
			@@ -297,6 +300,16 @@
			if (object.get("deliveryId") != null) {
			deliveryId = object.get("deliveryId").toString();
			}
			List<DeliveryDetail> deliveryDetaillist = deliveryDetailMapper.getIsNotDeliveryDetail(deliveryId);
			if (!deliveryDetaillist.isEmpty()) {
			for (DeliveryDetail deliveryDetail : deliveryDetaillist) {
			//还原库存数以及订单明细的发货数
			finishedGoodsInventoryMapper.updateInventoryquantityInt(deliveryDetail.getOrderId(), deliveryDetail.getOrderNumber(), deliveryDetail.getQuantity());
			deliveryDetailMapper.updateIsNotOrderDetailDeliveryNum(deliveryDetail.getOrderId(), deliveryDetail.getOrderNumber(), deliveryDetail.getQuantity());
			}
			}
			//删除订单额外金额的数据
			deliveryOtherMoneyMapper.deleteDeliveryOtherMoney(deliveryId);
			deliveryDetailMapper.deleteDeliveryDetail(deliveryId);
			deliveryMapper.deleteDelivery(deliveryId);

			@@ -338,6 +351,17 @@

			}

			public List<DeliveryDetailDTO> exportDeliveryDetailReport(List<LocalDate> dates) {
			return deliveryDetailMapper.exportDeliveryDetailReport(dates);
			}

			public List<DeliveryDetailProductDTO> exportDeliveryDetailProductReport(List<LocalDate> dates) {
			return deliveryDetailMapper.exportDeliveryDetailProductReport(dates);
			}




			private static final String[] NUMBERS = {"零", "壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖"};

			private static final String[] IUNIT = {"元", "拾", "佰", "仟", "万", "拾", "佰", "仟", "亿", "拾", "佰", "仟"};