纪新园 1 год назад
Родитель
Сommit
e79bd619c9

+ 5 - 0
blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/dto/SaleDetailDto.java

@@ -176,6 +176,11 @@ public class SaleDetailDto {
 	 */
 	@ExcelIgnore
 	private BigDecimal returnsAmount;
+	/**
+	 * 单据id
+	 */
+	@ExcelIgnore
+	private Long pid;
 
 
 }

+ 1 - 0
blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/impl/BillsServiceImpl.java

@@ -811,6 +811,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 		List<Amends> amendsList = amendsMapper.selectList(new LambdaQueryWrapper<Amends>()
 			.eq(Amends::getTenantId, AuthUtil.getTenantId())
 			.eq(Amends::getIsDeleted, 0)
+			.eq(Amends::getStatus, 3)
 			.eq(Amends::getOrigId, detail.getId()));
 		if (!amendsList.isEmpty()) {
 			List<Long> ids = amendsList.stream().map(Amends::getId).distinct().collect(Collectors.toList());

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

@@ -45,6 +45,7 @@
         SELECT
         po.customer_name AS customerName,
         bu.real_name AS salerName,
+        poi.pid AS pid,
         po.business_source AS businessSource,
         psd.cname AS storageName,
         poi.goods_no AS code,
@@ -245,6 +246,7 @@
         SELECT
         po.customer_name AS customerName,
         bu.real_name AS salerName,
+        poi.pid AS pid,
         po.business_source AS businessSource,
         psd.cname AS storageName,
         poi.goods_no AS code,