2024年10月23日17:10:51

blade-service/blade-los/src/main/java/org/springblade/los/app/service/impl/IndexServiceImpl.java

@@ -8,14 +8,19 @@ import org.springblade.core.tool.api.R;
 import org.springblade.los.Util.IDeptUtils;
 import org.springblade.los.app.service.IndexService;
 import org.springblade.los.business.aea.mapper.AeaBillsMapper;
+import org.springblade.los.business.amends.entity.Amends;
 import org.springblade.los.business.amends.mapper.AmendsMapper;
 import org.springblade.los.business.customsDeclaration.mapper.CustomsDeclarationMapper;
 import org.springblade.los.business.sea.entity.Bills;
 import org.springblade.los.business.sea.mapper.BillsMapper;
+import org.springblade.los.finance.fee.entity.FeeCenter;
+import org.springblade.los.finance.fee.mapper.FeeCenterMapper;
 import org.springblade.los.finance.fee.mapper.FinAccBillsMapper;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author :jixinyuan
@@ -30,18 +35,37 @@ public class IndexServiceImpl implements IndexService {
 	private final CustomsDeclarationMapper customsDeclarationMapper;
 	private final AmendsMapper amendsMapper;
 	private final FinAccBillsMapper finAccBillsMapper;
+	private final FeeCenterMapper feeCenterMapper;
 	private final IDeptUtils deptUtils;
 
 	@Override
 	public R profit(String type, String startDate, String endDate) {
 
+		BigDecimal amountD = new BigDecimal("0.00");
+		BigDecimal amountC = new BigDecimal("0.00");
 		List<Bills> billsList = billsMapper.selectList(new LambdaQueryWrapper<Bills>()
 			.eq(Bills::getTenantId, AuthUtil.getTenantId())
 			.eq(Bills::getIsDeleted, 0)
-				.apply("find_in_set(bill_type,'DD,MM')")
-			.eq(ObjectUtils.isNotNull(type),Bills::getBranchId, type)
+			.apply("find_in_set(bill_type,'DD,MM')")
+			.eq(ObjectUtils.isNotNull(type), Bills::getBranchId, type)
 			.ge(ObjectUtils.isNotNull(startDate), Bills::getBillDate, startDate)
 			.le(ObjectUtils.isNotNull(endDate), Bills::getBillDate, endDate));
+		amountD = billsList.stream().map(Bills::getAmountDrLoc).reduce(BigDecimal.ZERO, BigDecimal::add);
+		amountC = billsList.stream().map(Bills::getAmountCrLoc).reduce(BigDecimal.ZERO, BigDecimal::add);
+		List<Amends> amendsList = amendsMapper.selectList(new LambdaQueryWrapper<Amends>()
+			.eq(Amends::getTenantId, AuthUtil.getTenantId())
+			.eq(Amends::getIsDeleted, 0)
+			.apply("find_in_set(business_type,'ASE,ASI')")
+			.eq(ObjectUtils.isNotNull(type), Amends::getBranchId, type)
+			.ge(ObjectUtils.isNotNull(startDate), Amends::getBillDate, startDate)
+			.le(ObjectUtils.isNotNull(endDate), Amends::getBillDate, endDate));
+		if (!amendsList.isEmpty()) {
+			List<Long> ids = amendsList.stream().map(Amends::getId).collect(Collectors.toList());
+			List<FeeCenter> feeCenterList = feeCenterMapper.selectList(new LambdaQueryWrapper<FeeCenter>()
+				.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
+				.eq(FeeCenter::getIsDeleted, 0)
+				.in(FeeCenter::getId, ids));
+		}
 
 		return null;
 	}

blade-service/blade-los/src/main/java/org/springblade/los/statisticAnalysis/service/impl/StatisticAnalysisServiceImpl.java

@@ -1656,7 +1656,7 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 			.eq(FeeCenter::getIsDeleted, 0)
 			.eq(ObjectUtils.isNotNull(feeSettlementExcel.getDc()), FeeCenter::getDc, feeSettlementExcel.getDc())
 			.apply(ObjectUtils.isNotNull(feeSettlementExcel.getType()), "find_in_set(business_type,'" + feeSettlementExcel.getType() + "')")
-			.like(ObjectUtils.isNotNull(feeSettlementExcel.getFeeName()), FeeCenter::getFeeId, feeSettlementExcel.getFeeName())
+			.apply(ObjectUtils.isNotNull(feeSettlementExcel.getFeeName()), "find_in_set(fee_cn_name,'" + feeSettlementExcel.getFeeName() + "')")
 			.like(ObjectUtils.isNotNull(feeSettlementExcel.getCorpName()), FeeCenter::getCorpId, feeSettlementExcel.getCorpName())
 			.like(ObjectUtils.isNotNull(feeSettlementExcel.getWhetherSettlement()), FeeCenter::getStlStatus, feeSettlementExcel.getWhetherSettlement())
 			.like(ObjectUtils.isNotNull(feeSettlementExcel.getBillNo()), FeeCenter::getBillNo, feeSettlementExcel.getBillNo())
@@ -1698,7 +1698,7 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 			feeSettlementExcel1.setCorpName(item.getCorpCnName());
 			feeSettlementExcel1.setBillNo(item.getBillNo());
 			feeSettlementExcel1.setMblno(item.getMblno());
-			feeSettlementExcel1.setSrcNo(item.getMblno());
+			feeSettlementExcel1.setSrcNo(item.getBillNo());
 			if (ObjectUtils.isNotNull(item.getBillDate())) {
 				feeSettlementExcel1.setBillDate(dateFormat.format(item.getBillDate()));
 			} else {
@@ -1724,7 +1724,7 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 			.eq(FeeCenter::getIsDeleted, 0)
 			.eq(ObjectUtils.isNotNull(feeSettlementExcel.getDc()), FeeCenter::getDc, feeSettlementExcel.getDc())
 			.apply(ObjectUtils.isNotNull(feeSettlementExcel.getType()), "find_in_set(business_type,'" + feeSettlementExcel.getType() + "')")
-			.like(ObjectUtils.isNotNull(feeSettlementExcel.getFeeName()), FeeCenter::getFeeId, feeSettlementExcel.getFeeName())
+			.apply(ObjectUtils.isNotNull(feeSettlementExcel.getFeeName()), "find_in_set(fee_cn_name,'" + feeSettlementExcel.getFeeName() + "')")
 			.like(ObjectUtils.isNotNull(feeSettlementExcel.getCorpName()), FeeCenter::getCorpId, feeSettlementExcel.getCorpName())
 			.like(ObjectUtils.isNotNull(feeSettlementExcel.getWhetherSettlement()), FeeCenter::getStlStatus, feeSettlementExcel.getWhetherSettlement())
 			.like(ObjectUtils.isNotNull(feeSettlementExcel.getBillNo()), FeeCenter::getBillNo, feeSettlementExcel.getBillNo())
@@ -1766,7 +1766,7 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 			feeSettlementExcel1.setCorpName(item.getCorpCnName());
 			feeSettlementExcel1.setBillNo(item.getBillNo());
 			feeSettlementExcel1.setMblno(item.getMblno());
-			feeSettlementExcel1.setSrcNo(item.getMblno());
+			feeSettlementExcel1.setSrcNo(item.getBillNo());
 			if (ObjectUtils.isNotNull(item.getBillDate())) {
 				feeSettlementExcel1.setBillDate(dateFormat.format(item.getBillDate()));
 			} else {

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/controller/PriceBankController.java

@@ -421,7 +421,7 @@ public class PriceBankController extends BladeController {
 
 				}
 				BeanUtil.copyProperties(item, priceBankExcel);
-				priceBankExcel.setPriceBankId(item.getItemId() + "");
+				priceBankExcel.setPriceBankId(item.getId() + "");
 				if (goodsDesc != null && goodsDesc.getData() != null) {
 					priceBankExcel.setCode(goodsDesc.getData().getCode());
 					priceBankExcel.setEname(goodsDesc.getData().getEname());

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -1872,7 +1872,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 //						throw new SecurityException("驳回失败: 更新库存失败");
 						throw new SecurityException(res.getMsg());
 					}*/
-					stockGoodsService.updateByIdNew(oneStock);
+					R res = stockGoodsService.updateByIdNew(oneStock);
+					if (!res.isSuccess()) {
+						throw new RuntimeException(res.getMsg());
+					}
 					stockGoodsLog.setBalanceQuantity(oneStock.getBalanceQuantity());
 					stockGoodsLog.setSurplusRouteQuantity(oneStock.getSurplusRouteQuantity());
 					stockGoodsLog.setLockingQuantity(oneStock.getLockingQuantity());
@@ -1982,7 +1985,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				}*/
 				R res = stockGoodsService.updateBatchById(stockGoodsArrayList);
 				if (!res.isSuccess()) {
-					throw new SecurityException(res.getMsg());
+					throw new RuntimeException(res.getMsg());
 				}
 //				stockGoodsClient.saveOrUpdateBatchListLog(stockGoodsLogList);
 				stockGoodsLogService.saveOrUpdateBatch(stockGoodsLogList);

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/productLaunch/controller/ProductLaunchController.java

@@ -49,6 +49,7 @@ import org.springblade.salesPart.excel.ProductLaunchImportExcel;
 import org.springblade.salesPart.goods.service.IGoodsDescService;
 import org.springblade.salesPart.productLaunch.service.IProductLaunchFilesService;
 import org.springblade.salesPart.productLaunch.service.IProductLaunchService;
+import org.springblade.salesPart.stock.mapper.StockDescMapper;
 import org.springblade.salesPart.vo.ProductLaunchVO;
 import org.springblade.system.entity.Dept;
 import org.springblade.system.feign.ISysClient;
@@ -83,6 +84,7 @@ public class ProductLaunchController extends BladeController {
 	private final ISysClient iSysClient;
 	private final IBrandFigureService brandFigureService;
 	private final IGoodsDescService goodsDescService;
+	private final StockDescMapper stockDescMapper;
 
 	/**
 	 * 详情
@@ -568,9 +570,24 @@ public class ProductLaunchController extends BladeController {
 				List<Long> goodsId = pjGoodsDescList.stream().map(PjGoodsDesc::getId).collect(Collectors.toList());
 				lambdaQueryWrapper.in(PjProductLaunch::getGoodsId, goodsId);
 			}
+		} else {
+			String status = iSysClient.getParamService("whether.branch.management");
+			if (ObjectUtils.isNotNull(status) && "0".equals(status)) {
+				if (ObjectUtils.isNotNull(corpsDesc.getDeliveryWarehouseId())) {
+					List<PjStockDesc> stockDescList = stockDescMapper.selectList(new LambdaQueryWrapper<PjStockDesc>()
+						.eq(PjStockDesc::getTenantId, AuthUtil.getTenantId())
+						.eq(PjStockDesc::getIsDeleted, 0)
+						.eq(PjStockDesc::getStorageId, corpsDesc.getDeliveryWarehouseId()));
+					if (!stockDescList.isEmpty()) {
+						List<Long> goodsId = stockDescList.stream().map(PjStockDesc::getGoodsId).collect(Collectors.toList());
+						lambdaQueryWrapper.in(PjProductLaunch::getGoodsId, goodsId);
+					}
+				}
+
+			}
 		}
 		String status = iSysClient.getParamService("whether.zero.inventory");
-		if (ObjectUtils.isNull(status) || "0".equals(status)){
+		if (ObjectUtils.isNull(status) || "0".equals(status)) {
 			lambdaQueryWrapper.gt(PjProductLaunch::getInventory, 0);
 		}
 		lambdaQueryWrapper.orderByAsc(PjProductLaunch::getCnameInt);

blade-service/blade-stock/src/main/java/org/springblade/stock/service/impl/StockGoodsServiceImpl.java

@@ -344,8 +344,11 @@ public class StockGoodsServiceImpl extends ServiceImpl<StockGoodsMapper, StockGo
 					stockGoodsLogList.add(stockGoodsLog);
 				}
 			}
-//			stockGoodsLogService.saveOrUpdateBatch(stockGoodsLogList);
-			this.saveOrUpdateBatch(stockGoodsList);
+			stockGoodsLogService.saveOrUpdateBatch(stockGoodsLogList);
+			R res = this.saveOrUpdateBatch(stockGoodsList);
+			if (!res.isSuccess()) {
+				throw new RuntimeException(res.getMsg());
+			}
 		}
 		String message = new String("导入成功");
 		if (StringUtils.isNotBlank(good)) {