2024年10月21日17:27:36

blade-service-api/blade-los-api/src/main/java/org/springblade/los/finance/fee/entity/ListAccBillVO.java

@@ -189,5 +189,9 @@ public class ListAccBillVO extends FinAccBills {
 	 * 团队
 	 */
 	private String postId;
+	/**
+	 * 费用中文名称
+	 */
+	private String feeCnName;
 
 }

blade-service-api/blade-los-api/src/main/java/org/springblade/los/finance/invoices/entity/FinInvoices.java

@@ -633,5 +633,26 @@ public class FinInvoices implements Serializable {
 	@TableField(exist = false)
 	private Dept dept;
 
+	/**
+	 * 费用 Id,用于查询费用
+	 */
+	@ApiModelProperty(value = "费用 Id,用于查询费用")
+	private Long feeId;
+	/**
+	 * 费用中文名称,用于查询费用
+	 */
+	@ApiModelProperty(value = "费用中文名称,用于查询费用")
+	private String feeCode;
+	/**
+	 * 费用中文名称,用于查询费用
+	 */
+	@ApiModelProperty(value = "费用中文名称,用于查询费用")
+	private String feeCnName;
+	/**
+	 * 费用英文名称,用于查询费用
+	 */
+	@ApiModelProperty(value = "费用英文名称,用于查询费用")
+	private String feeEnName;
+
 
 }

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/dto/SaleDetail.java

@@ -104,6 +104,11 @@ public class SaleDetail {
 	 */
 	@ExcelIgnore
 	private String dateEnd;
+	/**
+	 * 业务来源
+	 */
+	@ExcelIgnore
+	private String businessSource;
 
 
 }

blade-service/blade-los/src/main/java/org/springblade/los/basic/fees/controller/BFeesController.java

@@ -206,5 +206,33 @@ public class BFeesController extends BladeController {
 		return bFeesService.importBFees(excelList);
 	}
 
+	/**
+	 * 分页 基础资料-费用
+	 */
+	@GetMapping("/listAll")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入bFees")
+	public R<List<BFees>> listAll(BFees bFees) {
+		LambdaQueryWrapper<BFees> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(BFees::getTenantId, AuthUtil.getTenantId())
+			.eq(BFees::getIsDeleted, 0)
+			.and(ObjectUtils.isNotNull(bFees.getCnName()), i -> i.like(BFees::getCnName, bFees.getCnName()).or()
+				.like(BFees::getEnName, bFees.getCnName()).or().like(BFees::getCode, bFees.getCnName()))
+			.like(ObjectUtils.isNotNull(bFees.getStatus()), BFees::getStatus, bFees.getStatus())
+			.like(ObjectUtils.isNotNull(bFees.getCode()), BFees::getCode, bFees.getCode())
+			.like(ObjectUtils.isNotNull(bFees.getEnName()), BFees::getEnName, bFees.getEnName())
+			.like(ObjectUtils.isNotNull(bFees.getFeesTypeId()), BFees::getFeesTypeId, bFees.getFeesTypeId());
+		String status = sysClient.getParamServiceNew("basic.data.sort");
+		if ("name".equals(status)) {
+			lambdaQueryWrapper.orderByDesc(BFees::getCnName);
+		} else if ("letter".equals(status)) {
+			lambdaQueryWrapper.orderByDesc(BFees::getCode);
+		} else {
+			lambdaQueryWrapper.orderByDesc(BFees::getCreateTime);
+		}
+		List<BFees> pages = bFeesService.list( lambdaQueryWrapper);
+		return R.data(pages);
+	}
+
 
 }

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/mapper/BillsMapper.xml

@@ -328,7 +328,6 @@
         corp.account_period_type as accountPeriodType
         FROM
         los_fee_center fee
-
         LEFT JOIN los_b_corps corp ON corp.id = fee.corp_id
         LEFT JOIN los_fin_acc_bills acc ON acc.id = fee.acc_bill_id
         WHERE
@@ -388,6 +387,9 @@
         <if test="acc.isCleared != null">
             and acc.is_cleared = #{acc.isCleared}
         </if>
+        <if test="acc.feeCnName != null and acc.feeCnName != ''">
+            and find_in_set (fee.fee_cn_name,#{acc.feeCnName})
+        </if>
         <if test="acc.billNo != null and acc.billNo != ''">
             and fee.bill_no like concat('%', #{acc.billNo}, '%')
         </if>

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/controller/FinAccBillsController.java

@@ -366,9 +366,11 @@ public class FinAccBillsController extends BladeController {
 				} else {
 					if (new BigDecimal("0.00").compareTo(item.getAppliedInvoiceCurrentStlAmount()) != 0) {
 						finAccBillsVOList.add(item);
+						continue;
 					}
 					if (new BigDecimal("0.00").compareTo(item.getAppliedCurrentStlAmount()) != 0) {
 						finAccBillsVOList.add(item);
+						continue;
 					}
 //					finAccBillsVOList.add(item);
 				}

blade-service/blade-los/src/main/java/org/springblade/los/finance/invoices/controller/FinInvoicesController.java

@@ -34,6 +34,7 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.los.finance.invoices.entity.FinInvoices;
 import org.springblade.los.finance.invoices.service.IFinInvoicesService;
 import org.springblade.los.finance.invoices.vo.FinInvoicesVO;
+import org.springblade.los.finance.stl.entity.FinStlBills;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -76,6 +77,7 @@ public class FinInvoicesController extends BladeController {
 			.eq(ObjectUtils.isNotNull(finInvoices.getBillNo()), FinInvoices::getBillNo, finInvoices.getBillNo())
 			.eq(ObjectUtils.isNotNull(finInvoices.getType()), FinInvoices::getType, finInvoices.getType())
 			.eq(ObjectUtils.isNotNull(finInvoices.getStatus()), FinInvoices::getStatus, finInvoices.getStatus())
+			.like(ObjectUtils.isNotNull(finInvoices.getFeeCnName()), FinInvoices::getFeeCnName, finInvoices.getFeeCnName())
 			.eq(ObjectUtils.isNotNull(finInvoices.getBillStatus()), FinInvoices::getBillStatus, finInvoices.getBillStatus())
 			.ge(ObjectUtils.isNotNull(finInvoices.getInvoiceDateStart()), FinInvoices::getBillDate, finInvoices.getInvoiceDateStart())
 			.le(ObjectUtils.isNotNull(finInvoices.getInvoiceDateEnd()), FinInvoices::getBillDate, finInvoices.getInvoiceDateEnd())

blade-service/blade-los/src/main/java/org/springblade/los/finance/stl/controller/FinStlBillsController.java

@@ -102,7 +102,7 @@ public class FinStlBillsController extends BladeController {
 			.like(ObjectUtils.isNotNull(finStlBills.getVoucherNo()), FinStlBills::getVoucherNo, finStlBills.getVoucherNo())
 			.and(ObjectUtils.isNotNull(finStlBills.getCorpCnName()), i -> i.like(FinStlBills::getCorpCnName, finStlBills.getCorpCnName()).or()
 				.like(FinStlBills::getCorpEnName, finStlBills.getCorpCnName()))
-			.eq(ObjectUtils.isNotNull(finStlBills.getFeeCnName()), FinStlBills::getFeeCnName, finStlBills.getFeeCnName())
+			.like(ObjectUtils.isNotNull(finStlBills.getFeeCnName()), FinStlBills::getFeeCnName, finStlBills.getFeeCnName())
 			.eq(ObjectUtils.isNotNull(finStlBills.getVoucherDate()), FinStlBills::getVoucherDate, finStlBills.getVoucherDate());
 		lambdaQueryWrapper.ge(ObjectUtils.isNotNull(finStlBills.getBillDateStart()), FinStlBills::getBillDate, finStlBills.getBillDateStart());
 		lambdaQueryWrapper.le(ObjectUtils.isNotNull(finStlBills.getBillDateEnd()), FinStlBills::getBillDate, finStlBills.getBillDateEnd());

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/goods/controller/GoodsDescController.java

@@ -213,7 +213,7 @@ public class GoodsDescController extends BladeController {
 		}
 		goodsDesc.setCname(goodsDesc.getCname().trim());
 		goodsDesc.setSpecificationAndModel(goodsDesc.getSpecificationAndModel().trim());
-		goodsDesc.setSpecificationAndModel(goodsDesc.getCode().trim());
+		goodsDesc.setCode(goodsDesc.getCode().trim());
 		goodsDesc.setBrandItem(goodsDesc.getBrandItem().trim());
 		goodsDesc.setGoodsSize(goodsDesc.getGoodsSize().trim());
 		PjGoodsDesc goodsDesc1 = goodsDescService.saveMessage(goodsDesc);

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/goods/service/impl/GoodsDescServiceImpl.java

@@ -136,14 +136,14 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, PjGoodsDe
 				throw new RuntimeException("品牌名称错误或品牌不存在");
 			}
 		}
-		Integer count = baseMapper.selectCount(Wrappers.<PjGoodsDesc>lambdaQuery()
+		List<PjGoodsDesc> count = baseMapper.selectList(Wrappers.<PjGoodsDesc>lambdaQuery()
 			.eq(PjGoodsDesc::getCode, goodsDesc.getCode())
 			.eq(PjGoodsDesc::getSalesCompanyId, goodsDesc.getSalesCompanyId())
 			.eq(PjGoodsDesc::getTenantId, AuthUtil.getTenantId())
 			.eq(PjGoodsDesc::getIsDeleted, 0)
 		);
 
-		Integer countName = baseMapper.selectCount(Wrappers.<PjGoodsDesc>lambdaQuery()
+		List<PjGoodsDesc> countName = baseMapper.selectList(Wrappers.<PjGoodsDesc>lambdaQuery()
 			.eq(PjGoodsDesc::getCname, goodsDesc.getCname())
 			.eq(PjGoodsDesc::getSalesCompanyId, goodsDesc.getSalesCompanyId())
 			.eq(PjGoodsDesc::getTenantId, AuthUtil.getTenantId())
@@ -154,10 +154,10 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, PjGoodsDe
 			goodsDesc.setCnameInt(getCnameInt(goodsDesc.getCname()));
 		}
 		if (goodsDesc.getId() == null) {
-			if (count > 0) {
+			if (!count.isEmpty()) {
 				throw new ServiceException("编码已存在");
 			}
-			if (countName > 0) {
+			if (!countName.isEmpty()) {
 				throw new ServiceException("名称已存在");
 			}
 			goodsDesc.setCreateUser(AuthUtil.getUserId());
@@ -172,10 +172,10 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, PjGoodsDe
 			goodsDesc.setEnableOrNot(1);
 			baseMapper.insert(goodsDesc);
 		} else {
-			if (count > 1) {
+			if (count.stream().filter(e-> !e.getId().equals(goodsDesc.getId())).count() > 1) {
 				throw new ServiceException("编码已存在");
 			}
-			if (countName > 1) {
+			if (countName.stream().filter(e-> !e.getId().equals(goodsDesc.getId())).count() > 1) {
 				throw new ServiceException("名称已存在");
 			}
 			if (1 == goodsDesc.getEnableOrNot()) {

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/mapper/OrderItemsMapper.xml

@@ -191,6 +191,9 @@
         <if test="saleDetailDto.storageId !=null and saleDetailDto.storageId != ''">
             and po.storage_id=#{saleDetailDto.storageId}
         </if>
+        <if test="saleDetailDto.businessSource !=null and saleDetailDto.businessSource != ''">
+            and po.business_source=#{saleDetailDto.businessSource}
+        </if>
         <if test="saleDetailDto.customerName !=null and saleDetailDto.customerName != ''">
             and po.customer_name like concat('%', #{saleDetailDto.customerName}, '%')
         </if>
@@ -271,7 +274,6 @@
         END AS actualPaymentStatus,
         poi.brand_name AS brandName,
         poi.goods_name AS goodsName,
-        poi.goods_id AS goodsId,
         poi.property_name AS propertyName,
         poi.pattern AS pattern,
         CASE
@@ -299,10 +301,10 @@
         IF
         ( poi.goods_num, poi.goods_num, 0 )
         WHEN 'TKXS' THEN
-        IF
+        0 -IF
         ( poi.returns_number, poi.returns_number, 0 )
         WHEN 'TKCG' THEN
-        IF
+        0 -IF
         ( poi.returns_number, poi.returns_number, 0 ) ELSE 0
         END AS goodsNum,
         IF
@@ -319,10 +321,10 @@
         IF
         ( poi.sub_total_money, poi.sub_total_money, 0 )
         WHEN 'TKXS' THEN
-        IF
+        0 - IF
         ( poi.returns_amount, poi.returns_amount, 0 )
         WHEN 'TKCG' THEN
-        IF
+        0 - IF
         ( poi.returns_amount, poi.returns_amount, 0 ) ELSE 0
         END AS subTotalMoney,
         CASE
@@ -337,9 +339,11 @@
         IF
         ( poi.costprie, poi.costprie, 0 )
         WHEN 'TKXS' THEN
+        0 -
         IF
         ( poi.costprie, poi.costprie, 0 )
         WHEN 'TKCG' THEN
+        0 -
         IF
         ( poi.costprie, poi.costprie, 0 ) ELSE 0
         END AS costprie,
@@ -361,13 +365,13 @@
         IF
         ( poi.costprie, poi.costprie, 0 )
         WHEN 'TKXS' THEN
-        (
+        0 - (
         IF
         ( poi.returns_amount, poi.returns_amount, 0 ) -
         IF
         ( poi.costprie, poi.costprie, 0 ))
         WHEN 'TKCG' THEN
-        (
+        0 - (
         IF
         ( poi.returns_amount, poi.returns_amount, 0 ) -
         IF
@@ -395,6 +399,9 @@
         <if test="customerName !=null and customerName != ''">
             and po.customer_name like concat('%', #{customerName}, '%')
         </if>
+        <if test="businessSource !=null and businessSource != ''">
+            and po.business_source=#{businessSource}
+        </if>
         <if test="code !=null and code != ''">
             and poi.goods_no like concat('%', #{code}, '%')
         </if>

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

@@ -4151,10 +4151,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 									System.err.println("操作成功");
 									return R.data(pjOrder);
 								} else {
-									throw new RuntimeException("发送失败");
+									System.err.println(status);
+//									throw new RuntimeException("发送失败");
 								}
 							} else {
-								throw new RuntimeException("发送失败");
+								System.err.println("发送失败");
 							}
 						} catch (IOException e) {
 							e.printStackTrace();