2024年12月9日16:48:37

blade-service/blade-los/src/main/java/org/springblade/los/basic/corps/controller/BCorpsController.java

@@ -429,4 +429,57 @@ public class BCorpsController extends BladeController {
 		return R.data(pages);
 	}
 
+
+	/**
+	 * 分页 物流-基础资料-往来单位
+	 */
+	@GetMapping("/listAll")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入bCorps")
+	public R<List<BCorps>> list(BCorps bCorps) {
+		LambdaQueryWrapper<BCorps> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(BCorps::getTenantId, AuthUtil.getTenantId())
+			.eq(BCorps::getIsDeleted, 0)
+			.like(ObjectUtils.isNotNull(bCorps.getCode()), BCorps::getCode, bCorps.getCode())
+			.eq(ObjectUtils.isNotNull(bCorps.getStatus()), BCorps::getStatus, bCorps.getStatus())
+			.and(ObjectUtils.isNotNull(bCorps.getCnName()), i -> i.like(BCorps::getCnName, bCorps.getCnName()).or()
+				.like(BCorps::getEnName, bCorps.getCnName()).or().like(BCorps::getCode, bCorps.getCnName()))
+			.like(ObjectUtils.isNotNull(bCorps.getShortName()), BCorps::getShortName, bCorps.getShortName())
+			.like(ObjectUtils.isNotNull(bCorps.getEnName()), BCorps::getEnName, bCorps.getEnName())
+			.like(ObjectUtils.isNotNull(bCorps.getUscc()), BCorps::getUscc, bCorps.getUscc())
+			.like(ObjectUtils.isNotNull(bCorps.getCnAddr()), BCorps::getCnAddr, bCorps.getCnAddr())
+			.like(ObjectUtils.isNotNull(bCorps.getCnAddr()), BCorps::getCnAddr, bCorps.getCnAddr())
+			.like(ObjectUtils.isNotNull(bCorps.getEnAddr()), BCorps::getEnAddr, bCorps.getEnAddr())
+			.like(ObjectUtils.isNotNull(bCorps.getCntyCode()), BCorps::getCntyCode, bCorps.getCntyCode())
+			.like(ObjectUtils.isNotNull(bCorps.getCntyName()), BCorps::getCntyName, bCorps.getCntyName())
+			.like(ObjectUtils.isNotNull(bCorps.getCorpSource()), BCorps::getCorpSource, bCorps.getCorpSource())
+			.like(ObjectUtils.isNotNull(bCorps.getTel()), BCorps::getTel, bCorps.getTel())
+			.like(ObjectUtils.isNotNull(bCorps.getAdminProfiles()), BCorps::getAdminProfiles, bCorps.getAdminProfiles());
+		LambdaQueryWrapper<BCorpsTypeDefine> typeDefineLambdaQueryWrapper = new LambdaQueryWrapper<>();
+		typeDefineLambdaQueryWrapper.eq(BCorpsTypeDefine::getTenantId, AuthUtil.getTenantId())
+			.eq(BCorpsTypeDefine::getIsDeleted, 0);
+		typeDefineLambdaQueryWrapper.eq(BCorpsTypeDefine::getCorpType, "PS客户");
+		BCorpsTypeDefine typeDefine = bCorpsTypeDefineService.getOne(typeDefineLambdaQueryWrapper);
+		if ("1".equals(bCorps.getType())) {
+			if (typeDefine != null) {
+				lambdaQueryWrapper.apply("find_in_set('" + typeDefine.getId() + "',corp_type)");
+			}
+		} else {
+			if (typeDefine != null) {
+				lambdaQueryWrapper.ne(BCorps::getCorpType, typeDefine.getId());
+			}
+			lambdaQueryWrapper.apply(ObjectUtils.isNotNull(bCorps.getCorpType()), "find_in_set('" + bCorps.getCorpType() + "',corp_type)");
+		}
+		String status = sysClient.getParamServiceNew("basic.data.sort");
+		if ("name".equals(status)) {
+			lambdaQueryWrapper.orderByDesc(BCorps::getCnName);
+		} else if ("letter".equals(status)) {
+			lambdaQueryWrapper.orderByDesc(BCorps::getCode);
+		} else {
+			lambdaQueryWrapper.orderByDesc(BCorps::getCreateTime);
+		}
+		List<BCorps> pages = bCorpsService.list( lambdaQueryWrapper);
+		return R.data(pages);
+	}
+
 }

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

@@ -3287,7 +3287,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 			if (storageDesc == null) {
 				throw new RuntimeException("未找到仓库信息");
 			}
-			/*if ("1".equals(storageDesc.getWhetherFinancing())){
+			if ("1".equals(storageDesc.getWhetherFinancing())){
 				LambdaQueryWrapper<PjOrderItems> itemsLambdaQueryWrapper = new LambdaQueryWrapper<>();
 				itemsLambdaQueryWrapper.eq(PjOrderItems::getTenantId, AuthUtil.getTenantId())
 					.eq(PjOrderItems::getIsDeleted, 0)
@@ -3315,7 +3315,14 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 					if (pjpfFunding == null) {
 						throw new RuntimeException("未找到融资总账");
 					}
-					List<Long> goodsIds = itemsList.stream().map(PjOrderItems::getGoodsId).distinct().collect(Collectors.toList());
+					if (pjpfFunding.getBondAmount().compareTo(pjpfFunding.getPaidAlreadyBondAmount()) > 0) {
+						throw new RuntimeException("已缴保证金不足，生成任务失败");
+					}
+					BigDecimal amount = itemsList.stream().map(PjOrderItems::getCostprie).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+					if (pjpfFunding.getAvailableAmount().subtract(pjpfFunding.getInterest()).compareTo(amount) < 0) {
+						throw new RuntimeException("可用资金：" + pjpfFunding.getAvailableAmount() + ";资金占用：" + pjpfFunding.getInterest() + ";   出库资金：" + amount + ";    请充值后,在生成任务");
+					}
+					/*List<Long> goodsIds = itemsList.stream().map(PjOrderItems::getGoodsId).distinct().collect(Collectors.toList());
 					List<PjOrderItems> itemsListRZCG = orderItemsService.list(new LambdaQueryWrapper<PjOrderItems>()
 						.eq(PjOrderItems::getTenantId, AuthUtil.getTenantId())
 						.eq(PjOrderItems::getIsDeleted, 0)
@@ -3331,22 +3338,16 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 						.in(PjOrder::getId, idList));
 					List<PjOrder> orders = orderList.stream().filter(e -> e.getWhetherRedeem().equals("0")).distinct().collect(Collectors.toList());
 					if (!orders.isEmpty()) {
-						if (pjpfFunding.getBondAmount().compareTo(pjpfFunding.getPaidAlreadyBondAmount()) > 0) {
-							throw new RuntimeException("已缴保证金不足，生成任务失败");
-						}
-						BigDecimal amount = itemsList.stream().map(PjOrderItems::getCostprie).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
-						if (pjpfFunding.getAvailableAmount().subtract(pjpfFunding.getInterest()).compareTo(amount) < 0) {
-							throw new RuntimeException("可用资金：" + pjpfFunding.getAvailableAmount() + ";资金占用：" + pjpfFunding.getInterest() + ";   出库资金：" + amount + ";    请充值后,在生成任务");
-						}
+
 					}
-					return R.data("该订单明细商品存在融资货物，是否提交出库任务审批？");
+					return R.data("该订单明细商品存在融资货物，是否提交出库任务审批？");*/
+					return R.data(true);
 				} else {
 					return R.data(true);
 				}
 			}else{
 				return R.data(true);
-			}*/
-			return R.data(true);
+			}
 		} else {
 			return R.data(true);
 		}

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

@@ -831,28 +831,32 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 				if (stockOne != null) {
 					if (stockOne.getBalanceQuantity().compareTo(item.getSendNum()) < 0) {
 						msg += goodsDesc.getCname() + ",";
-					}
-					stockOne.setBalanceQuantity(stockOne.getBalanceQuantity().subtract(item.getSendNum()));
-					if (ObjectUtils.isNotNull(status) && "1".equals(status)) {
-						BigDecimal sendNum = item.getSendNum();
-						if (stockOne.getBalanceQuantityHave().compareTo(sendNum) >= 0) {
+					}else{
+						stockOne.setBalanceQuantity(stockOne.getBalanceQuantity().subtract(item.getSendNum()));
+						if (ObjectUtils.isNotNull(status) && "1".equals(status)) {
+							BigDecimal sendNum = item.getSendNum();
+							if (stockOne.getBalanceQuantityHave().compareTo(sendNum) >= 0) {
+								stockOne.setBalanceQuantityHave(stockOne.getBalanceQuantityHave().subtract(item.getSendNum()));
+								item.setSendNumHave(item.getSendNum());
+							} else {
+								item.setSendNumHave(stockOne.getBalanceQuantityHave());
+								sendNum = sendNum.subtract(stockOne.getBalanceQuantityHave());
+								item.setSendNumFinancing(sendNum);
+								if (stockOne.getBalanceQuantityFinancing().compareTo(sendNum) < 0) {
+									throw new RuntimeException("商品：" + goodsDesc.getCname() + "融资库存不足，出库失败");
+								}
+								stockOne.setBalanceQuantityHave(new BigDecimal("0"));
+								stockOne.setBalanceQuantityFinancing(stockOne.getBalanceQuantityFinancing().subtract(sendNum));
+							}
+						}else{
 							stockOne.setBalanceQuantityHave(stockOne.getBalanceQuantityHave().subtract(item.getSendNum()));
 							item.setSendNumHave(item.getSendNum());
-						} else {
-							item.setSendNumHave(stockOne.getBalanceQuantityHave());
-							sendNum = sendNum.subtract(stockOne.getBalanceQuantityHave());
-							item.setSendNumFinancing(sendNum);
-							if (stockOne.getBalanceQuantityFinancing().compareTo(sendNum) < 0) {
-								throw new RuntimeException("商品：" + goodsDesc.getCname() + "融资库存不足，出库失败");
-							}
-							stockOne.setBalanceQuantityHave(new BigDecimal("0"));
-							stockOne.setBalanceQuantityFinancing(stockOne.getBalanceQuantityFinancing().subtract(sendNum));
 						}
+						stockOne.setStoreInventory(stockOne.getBalanceQuantity());
+						stockOne.setInventoryAmount(stockOne.getInventoryAmount().subtract(item.getSendNum().multiply(stockOne.getInventoryCostPrice())));
+						stockOne.setRebateInventoryAmount(stockOne.getRebateInventoryAmount().subtract(item.getSendNum().multiply(stockOne.getRebatePrice())));
+						stockOne.setVersion(stockOne.getVersion());
 					}
-					stockOne.setStoreInventory(stockOne.getBalanceQuantity());
-					stockOne.setInventoryAmount(stockOne.getInventoryAmount().subtract(item.getSendNum().multiply(stockOne.getInventoryCostPrice())));
-					stockOne.setRebateInventoryAmount(stockOne.getRebateInventoryAmount().subtract(item.getSendNum().multiply(stockOne.getRebatePrice())));
-					stockOne.setVersion(stockOne.getVersion());
 					pjStockDescArrayList.add(stockOne);
 				} else {
 					throw new RuntimeException("商品：" + goodsDesc.getCname() + "未查到库存账");