ERP_override.git

			@@ -6,7 +6,6 @@
			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.mm.FinishedOperateLog;
			@@ -19,12 +18,12 @@
			import com.example.erp.service.mm.FinishedGoodsInventoryService;
			import com.example.erp.service.userInfo.LogService;
			import com.example.erp.service.userInfo.SysErrorService;
			import com.fasterxml.jackson.core.JsonProcessingException;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;
			import org.springframework.transaction.interceptor.TransactionAspectSupport;

			import java.lang.reflect.Field;
			import java.math.BigDecimal;
			import java.math.RoundingMode;
			import java.text.SimpleDateFormat;
			@@ -58,7 +57,7 @@
			FinishedGoodsInventoryService finishedGoodsInventoryService;


			public Map<String, Object> getSelectShippingOrder(Integer pageNum, Integer pageSize,List<String> selectDate, Delivery delivery) {
			public Map<String, Object> getSelectShippingOrder(Integer pageNum, Integer pageSize,List<String> selectDate, Delivery delivery) throws JsonProcessingException {
			Integer offset = (pageNum - 1) * pageSize;
			String endDate = LocalDate.now().toString();
			String startDate = LocalDate.now().minusDays(15).toString();
			@@ -211,7 +210,7 @@
			if (!deliveryDetaillist.isEmpty()) {
			for (DeliveryDetail deliveryDetail : deliveryDetaillist) {
			//还原库存数以及订单明细的发货数
			finishedGoodsInventoryMapper.updateInventoryquantityInt(deliveryDetail.getOrderId(), deliveryDetail.getOrderNumber(), deliveryDetail.getQuantity());
			finishedGoodsInventoryMapper.updateInventoryquantityIntBybox(deliveryDetail.getOrderId(), deliveryDetail.getOrderNumber(), deliveryDetail.getQuantity(),deliveryDetail.getBoxNo());
			deliveryDetailMapper.updateIsNotOrderDetailDeliveryNum(deliveryDetail.getOrderId(), deliveryDetail.getOrderNumber(), deliveryDetail.getQuantity());
			}
			}
			@@ -370,7 +369,7 @@
			//修改订单明细
			deliveryDetailMapper.updateOrderDetailDeliveryNum(orderDetail);
			//修改库存表出库数量
			finishedGoodsInventoryMapper.updateInventoryquantityOut(orderDetail.getOrderId(), orderDetail.getOrderNumber(), orderDetail.getDeliveryDetail().getQuantity());
			finishedGoodsInventoryMapper.updateInventoryquantityOut(orderDetail.getOrderId(), orderDetail.getOrderNumber(), orderDetail.getDeliveryDetail().getQuantity(),orderDetail.getFinishedGoodsInventory().getBoxNo());
			}else{
			TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
			return "false2";
			@@ -408,9 +407,7 @@
			sysError.setFunc("insertDelivery");
			sysErrorService.insert(sysError);
			saveState = "false4";

			}

			return saveState;
			}

			@@ -463,7 +460,6 @@
			sysError.setFunc("addDeliveryDetail");
			sysErrorService.insert(sysError);
			saveState = "false";

			}
			return saveState;

			@@ -484,7 +480,7 @@
			if (!deliveryDetaillist.isEmpty()) {
			for (DeliveryDetail deliveryDetail : deliveryDetaillist) {
			//还原库存数以及订单明细的发货数
			finishedGoodsInventoryMapper.updateInventoryquantityInt(deliveryDetail.getOrderId(), deliveryDetail.getOrderNumber(), deliveryDetail.getQuantity());
			finishedGoodsInventoryMapper.updateInventoryquantityIntBybox(deliveryDetail.getOrderId(), deliveryDetail.getOrderNumber(), deliveryDetail.getQuantity(), deliveryDetail.getBoxNo());
			deliveryDetailMapper.updateIsNotOrderDetailDeliveryNum(deliveryDetail.getOrderId(), deliveryDetail.getOrderNumber(), deliveryDetail.getQuantity());
			}
			}
			@@ -509,7 +505,6 @@
			sysError.setFunc("deleteDelivery");
			sysErrorService.insert(sysError);
			saveState = false;

			}
			return saveState;

			@@ -545,8 +540,17 @@
			orderId=detail.getOrderDetail().getOrderId();
			Map<String, Object> itemmap = new HashMap<>();

			List<Map<String, Object>> deliveryDetailList2 = deliveryDetailMapper.getSelectDeliveryDetailPrinting(detail.getDeliveryId(),
			detail.getOrderDetail().getProductId(), detail.getOrderDetail().getOrderId());
			List<Map<String, Object>> deliveryDetailList2;
			if(state==3){
			deliveryDetailList2=deliveryDetailMapper.getSelectDeliveryPrintingMoneySpecifications(detail.getDeliveryId(),
			detail.getOrderDetail().getProductId(), detail.getOrderDetail().getOrderId());
			}else if(state==4){
			deliveryDetailList2=deliveryDetailMapper.getSelectDeliveryPrintingNoMoneySpecifications(detail.getDeliveryId(),
			detail.getOrderDetail().getProductId(), detail.getOrderDetail().getOrderId());
			}else{
			deliveryDetailList2 = deliveryDetailMapper.getSelectDeliveryDetailPrinting(detail.getDeliveryId(),
			detail.getOrderDetail().getProductId(), detail.getOrderDetail().getOrderId());
			}

			for (Map<String, Object> stringObjectMap : deliveryDetailList2) {
			if(stringObjectMap.get("other_columns")!=null){
			@@ -568,7 +572,6 @@
			itemmap.put("DeliveryDetail", detail);
			itemmap.put("DeliveryDetailList", deliveryDetailList2);
			list.add(itemmap);

			}
			/*Delivery delivery=deliveryMapper.getSelectShippingOrderDetailDeliveryPrinting(deliveryDetail);
			delivery.setMoney(delivery.getMoney()+otherMoney);
			@@ -944,4 +947,6 @@

			return oddNumbers;
			}


			}