Merge remote-tracking branch 'origin/master'

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/service/impl/OrderServiceImpl.java

@@ -1271,6 +1271,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 							}
 							if (history != null) {
 								reservoirAreaRecord.setBalanceQuantity(reservoirAreaRecord.getBalanceQuantity().add(history.getProfitLossNum()));
+								reservoirAreaRecord.setInQuantity(reservoirAreaRecord.getInQuantity().add(history.getProfitLossNum()));
+								reservoirAreaRecord.setQuantity(reservoirAreaRecord.getQuantity().add(history.getProfitLossNum()));
 //								reservoirAreaRecord.setBalanceQuantity(history.getQuantity());
 								reservoirAreaRecordListUpdate.add(reservoirAreaRecord);
 							}

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/ship/service/impl/ShipServiceImpl.java

@@ -3666,6 +3666,10 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 						}
 						stockOneC.setBalanceQuantityHave(stockOneC.getBalanceQuantityHave().subtract(orderItems.getGoodsNum()));
 					} else {
+						if(orderItems.getSendNumHave().compareTo(new BigDecimal("0.00")) == 0 &&
+							orderItems.getSendNumFinancing().compareTo(new BigDecimal("0.00")) == 0){
+							throw new RuntimeException("第" + count + "行，商品：" + goodsDesc.getCname() + "调拨数量有误请联系管理员");
+						}
 						if (orderItems.getSendNumFinancing().compareTo(stockOneC.getBalanceQuantityFinancing()) > 0) {
 							throw new RuntimeException("第" + count + "行，商品：" + goodsDesc.getCname() + "融资库存不足，保存失败");
 						}
@@ -3776,6 +3780,10 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 					if (!"1".equals(status)) {
 						stockOneR.setBalanceQuantityHave(stockOneR.getBalanceQuantityHave().add(orderItems.getGoodsNum()));
 					} else {
+						if(orderItems.getSendNumHave().compareTo(new BigDecimal("0.00")) == 0 &&
+							orderItems.getSendNumFinancing().compareTo(new BigDecimal("0.00")) == 0){
+							throw new RuntimeException("第" + count + "行，商品：" + goodsDesc.getCname() + "调拨数量有误请联系管理员");
+						}
 						stockOneR.setBalanceQuantityFinancing(stockOneR.getBalanceQuantityFinancing().add(orderItems.getSendNumFinancing()));
 						stockOneR.setBalanceQuantityHave(stockOneR.getBalanceQuantityHave().add(orderItems.getSendNumHave()));
 					}
@@ -4077,6 +4085,10 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 					if (!"1".equals(status)) {
 						stockOneC.setBalanceQuantityHave(stockOneC.getBalanceQuantityHave().add(orderItems.getGoodsNum()));
 					} else {
+						if(orderItems.getSendNumHave().compareTo(new BigDecimal("0.00")) == 0 &&
+							orderItems.getSendNumFinancing().compareTo(new BigDecimal("0.00")) == 0){
+							throw new RuntimeException("第" + count + "行，商品：" + goodsDesc.getCname() + "调拨数量有误请联系管理员");
+						}
 						stockOneC.setBalanceQuantityFinancing(stockOneC.getBalanceQuantityFinancing().add(orderItems.getSendNumFinancing()));
 						stockOneC.setBalanceQuantityHave(stockOneC.getBalanceQuantityHave().add(orderItems.getSendNumHave()));
 					}
@@ -4143,6 +4155,10 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 						}
 						stockOneR.setBalanceQuantityHave(stockOneR.getBalanceQuantityHave().subtract(orderItems.getGoodsNum()));
 					} else {
+						if(orderItems.getSendNumHave().compareTo(new BigDecimal("0.00")) == 0 &&
+							orderItems.getSendNumFinancing().compareTo(new BigDecimal("0.00")) == 0){
+							throw new RuntimeException("第" + count + "行，商品：" + goodsDesc.getCname() + "调拨数量有误请联系管理员");
+						}
 						if (orderItems.getSendNumFinancing().compareTo(stockOneR.getBalanceQuantityFinancing()) > 0) {
 							throw new RuntimeException("第" + count + "行，商品：" + goodsDesc.getCname() + "融资库存不足，保存失败");
 						}

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/statistics/controller/StatisticsController.java

@@ -3,6 +3,7 @@ package org.springblade.salesPart.statistics.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import io.swagger.annotations.Api;
 import lombok.AllArgsConstructor;
 import org.springblade.core.excel.util.ExcelUtil;
@@ -131,6 +132,9 @@ public class StatisticsController {
 				List<PjProductLaunch> productLaunchList = productLaunchService.list(new LambdaQueryWrapper<PjProductLaunch>()
 					.eq(PjProductLaunch::getIsDeleted, 0).eq(PjProductLaunch::getTenantId, AuthUtil.getTenantId()).in(PjProductLaunch::getGoodsId, goodsIds));
 				for (SaleDetailDto dto : saleDetailDtoList) {
+					if (ObjectUtils.isNull(dto.getGoodsId())){
+						continue;
+					}
 					PjProductLaunch nowGoodsProduct = productLaunchList.stream().filter(item -> item.getGoodsId().equals(Long.valueOf(dto.getGoodsId()))).findFirst().orElse(null);
 					if (nowGoodsProduct == null) {
 						continue;

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/statistics/service/impl/StatisticsServiceImpl.java

@@ -1217,7 +1217,9 @@ public class StatisticsServiceImpl implements IStatisticsService {
 						if (!pjOrderItemsList.isEmpty()) {
 							PjOrderItems orderItems = pjOrderItemsList.stream().filter(e -> e.getId().equals(items.getItemId())).findFirst().orElse(null);
 							if (orderItems != null) {
-								items.setGoodsId(String.valueOf(orderItems.getGoodsId()));
+								if(ObjectUtils.isNotNull(orderItems.getGoodsId())){
+									items.setGoodsId(String.valueOf(orderItems.getGoodsId()));
+								}
 								items.setItemRemarks(orderItems.getRemarks());
 								items.setGoodsNum(orderItems.getGoodsNum());
 								items.setPrice(orderItems.getPrice());

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/stock/controller/StockDescController.java

@@ -215,7 +215,11 @@ public class StockDescController extends BladeController {
 				}
 			}
 		}
-		lambdaQueryWrapper.orderByDesc(PjStockDesc::getBalanceQuantity);
+		if ("1".equals(stockDesc.getSort())){
+			lambdaQueryWrapper.orderByAsc(PjStockDesc::getCname);
+		}else{
+			lambdaQueryWrapper.orderByDesc(PjStockDesc::getBalanceQuantity);
+		}
 		IPage<PjStockDesc> iPage = Condition.getPage(query);
 		if (query.getSize() > NumberEnum.FIVE_HUNDRED.number) {
 			iPage.setSize(-1L);