轮胎：app统计bug修改

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/controller/OrderController.java

@@ -982,7 +982,6 @@ public class OrderController extends BladeController {
 			.eq(PjOrder::getSalesCompanyId, AuthUtil.getDeptId())
 			.ge(ObjectUtils.isNotNull(statusDate), PjOrder::getBusinesDate, statusDate)
 			.le(ObjectUtils.isNotNull(endDate), PjOrder::getBusinesDate, endDate)
-			.eq(PjOrder::getStatus, "已发货")
 			.apply("find_in_set(status,'已发货,已收货')")
 			.eq(PjOrder::getBsType, "XS");
 		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {

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

@@ -3776,10 +3776,10 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 					stockOne.setInventoryAmount(stockOne.getInventoryAmount().subtract(inventoryAmount));
 					stockOne.setRebateInventoryAmount(stockOne.getRebateInventoryAmount().subtract(rebateInventoryAmount));
 					stockOne.setVersion(stockOne.getVersion());
-					/*if (stockOne.getBalanceQuantity().compareTo(new BigDecimal("0")) != 0) {
+					if (stockOne.getBalanceQuantity().compareTo(new BigDecimal("0")) != 0) {
 						stockOne.setInventoryCostPrice(stockOne.getInventoryAmount().divide(stockOne.getBalanceQuantity(), MathContext.DECIMAL32).setScale(2, RoundingMode.HALF_UP));
 						stockOne.setRebatePrice(stockOne.getRebateInventoryAmount().divide(stockOne.getBalanceQuantity(), MathContext.DECIMAL32).setScale(2, RoundingMode.HALF_UP));
-					}*/
+					}
 					pjStockDescArrayList.add(stockOne);
 				} else {
 					System.err.println("商品：" + goodsDesc.getCname());