2025年1月2日18:10:21

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

@@ -183,6 +183,12 @@ public class SaleDetailDto {
 	private Long pid;
 
 	/**
+	 * 明细id
+	 */
+	@ExcelIgnore
+	private Long itemId;
+
+	/**
 	 * 已卖数量
 	 */
 	@ExcelIgnore

blade-service/blade-los/src/main/java/org/springblade/los/basic/packages/controller/BPackagesController.java

@@ -196,6 +196,7 @@ public class BPackagesController extends BladeController {
 			.like(ObjectUtils.isNotNull(bPackages.getCnName()), BPackages::getCnName, bPackages.getCnName())
 			.like(ObjectUtils.isNotNull(bPackages.getEnName()), BPackages::getEnName, bPackages.getEnName())
 			.like(ObjectUtils.isNotNull(bPackages.getStatus()), BPackages::getStatus, bPackages.getStatus())
+			.like(ObjectUtils.isNotNull(bPackages.getWhetherDg()), BPackages::getWhetherDg, bPackages.getWhetherDg())
 			.orderByDesc(BPackages::getCreateTime);
 		List<BPackages> bPackagesList = bPackagesService.list(lambdaQueryWrapper);
 		ExcelUtil.export(response, "包装单位", "包装单位", BeanUtil.copy(bPackagesList, BPackagesExcel.class), BPackagesExcel.class);
@@ -220,13 +221,13 @@ public class BPackagesController extends BladeController {
 	@ApiOperationSupport(order = 13)
 	@ApiOperation(value = "导入 基础资料-包装单位", notes = "传入excel")
 	@RepeatSubmit
-	public R<List<BPackages>> importBPackages(@RequestParam("file") MultipartFile file) {
+	public R<List<BPackages>> importBPackages(@RequestParam("file") MultipartFile file,@RequestParam(value = "whetherDg",required = false) String whetherDg) {
 		//导入数据
 		List<BPackagesExcel> excelList = ExcelUtil.read(file, BPackagesExcel.class);
 		if (CollectionUtils.isEmpty(excelList)) {
 			throw new SecurityException("数据不能为空");
 		}
-		return bPackagesService.importBPackages(excelList);
+		return bPackagesService.importBPackages(excelList,whetherDg);
 	}
 
 

blade-service/blade-los/src/main/java/org/springblade/los/basic/packages/service/IBPackagesService.java

@@ -54,5 +54,5 @@ public interface IBPackagesService extends IService<BPackages> {
 	 * @param excelList
 	 * @return
 	 */
-	R<List<BPackages>> importBPackages(List<BPackagesExcel> excelList);
+	R<List<BPackages>> importBPackages(List<BPackagesExcel> excelList,String whetherDg);
 }

blade-service/blade-los/src/main/java/org/springblade/los/basic/packages/service/impl/BPackagesServiceImpl.java

@@ -91,7 +91,7 @@ public class BPackagesServiceImpl extends ServiceImpl<PackagesMapper, BPackages>
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public R<List<BPackages>> importBPackages(List<BPackagesExcel> excelList) {
+	public R<List<BPackages>> importBPackages(List<BPackagesExcel> excelList,String whetherDg) {
 		List<BPackages> bPackagesList = new ArrayList<>();
 		for (BPackagesExcel item : excelList) {
 			BPackages bPackages = new BPackages();
@@ -101,9 +101,11 @@ public class BPackagesServiceImpl extends ServiceImpl<PackagesMapper, BPackages>
 			BPackages detail = baseMapper.selectOne(new LambdaQueryWrapper<BPackages>()
 				.eq(BPackages::getTenantId, AuthUtil.getTenantId())
 				.eq(BPackages::getIsDeleted, 0)
+				.eq(ObjectUtils.isNotNull(whetherDg),BPackages::getWhetherDg, whetherDg)
 				.eq(BPackages::getCnName, item.getCnName()));
 			if (detail == null) {
 				BeanUtil.copy(item, bPackages);
+				bPackages.setWhetherDg(whetherDg);
 				bPackages.setCreateTime(new Date());
 				bPackages.setCreateUser(AuthUtil.getUserId());
 				bPackages.setCreateUserName(AuthUtil.getUserName());

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

@@ -86,7 +86,7 @@ public class ReturnsController {
 			.eq(ObjectUtils.isNotEmpty(order.getCustomerId()), PjOrder::getCustomerId, order.getCustomerId())//客户
 			.eq(ObjectUtils.isNotEmpty(order.getGenerateTask()), PjOrder::getGenerateTask, order.getGenerateTask())//客户
 			.eq(ObjectUtils.isNotEmpty(order.getSalerId()), PjOrder::getSalerId, order.getSalerId())//业务员
-			.eq(ObjectUtils.isNotEmpty(order.getSalerName()), PjOrder::getSalerName, order.getSalerName())//业务员
+			.eq(ObjectUtils.isNotEmpty(order.getSalerName()), PjOrder::getSalerId, order.getSalerName())//业务员
 			.like(ObjectUtils.isNotEmpty(order.getCustomerName()), PjOrder::getCustomerName, order.getCustomerName())
 			.like(ObjectUtils.isNotEmpty(order.getSrcOrdNo()), PjOrder::getSrcOrdNo, order.getSrcOrdNo())//来源单号
 			.like(ObjectUtils.isNotEmpty(order.getOrdNo()), PjOrder::getOrdNo, order.getOrdNo())//来源单号

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

@@ -46,6 +46,7 @@
         po.customer_name AS customerName,
         bu.real_name AS salerName,
         poi.pid AS pid,
+        poi.id AS itemId,
         po.business_source AS businessSource,
         psd.cname AS storageName,
         poi.goods_no AS code,
@@ -259,6 +260,7 @@
         po.customer_name AS customerName,
         bu.real_name AS salerName,
         poi.pid AS pid,
+        poi.id AS itemId,
         po.business_source AS businessSource,
         psd.cname AS storageName,
         poi.goods_no AS code,
@@ -513,17 +515,12 @@
         `pjpf_order_items` poi
         LEFT JOIN pjpf_goods_desc pgd ON poi.goods_id = pgd.id
         LEFT JOIN pjpf_order po ON poi.pid = po.id
-        LEFT JOIN blade_user bu ON po.saler_id = bu.id
-        LEFT JOIN pjpf_storage_desc psd on  po.storage_id = psd.id
         WHERE
         poi.is_deleted = '0'
         AND po.is_deleted = '0'
-        AND find_in_set(po.bs_type,#{saleDetailDto.bsType})
+        AND po.bs_type = 'XS'
         AND poi.tenant_id = #{saleDetailDto.tenantId}
         AND po.tenant_id = #{saleDetailDto.tenantId}
-        <if test="saleDetailDto.salesCompanyId !=null and saleDetailDto.salesCompanyId != ''">
-            and find_in_set(po.sales_company_id,#{saleDetailDto.salesCompanyId})
-        </if>
         <if test="saleDetailDto.storageId !=null and saleDetailDto.storageId != ''">
             and po.storage_id=#{saleDetailDto.storageId}
         </if>
@@ -563,9 +560,6 @@
         <if test="saleDetailDto.dateEnd !=null and saleDetailDto.dateEnd !=''">
             and DATE_FORMAT(po.delivery_busines_date,'%Y-%m-%d') &lt;= #{saleDetailDto.dateEnd}
         </if>
-        <if test='saleDetailDto.bsType !=null and saleDetailDto.bsType !="" and saleDetailDto.bsType == "XS"'>
-            and not FIND_IN_SET(po.`status`,'退款请核,已取消,已退款,售后中')
-        </if>
         <if test='saleDetailDto.isContain !=null and saleDetailDto.isContain !="" and saleDetailDto.isContain == "1"'>
             and ( (FIND_IN_SET(po.bs_type,'XS,CG,RZCG') and FIND_IN_SET(po.`status`,'待确认,待发货,已发货,退款请核,已取消,已退款,售后中,已收货'))
             or (FIND_IN_SET(po.bs_type,'TKXS,TKCG') and FIND_IN_SET(po.`status`,'已完成')) )
@@ -589,12 +583,10 @@
         `pjpf_order_items` poi
         LEFT JOIN pjpf_goods_desc pgd ON poi.goods_id = pgd.id
         LEFT JOIN pjpf_order po ON poi.pid = po.id
-        LEFT JOIN pjpf_storage_desc psd on  po.storage_id = psd.id
-        LEFT JOIN blade_user bu ON po.saler_id = bu.id
         WHERE
         poi.is_deleted = '0'
         AND po.is_deleted = '0'
-        AND find_in_set(po.bs_type,#{bsType})
+        AND po.bs_type = 'XS'
         AND poi.tenant_id = #{tenantId}
         AND po.tenant_id = #{tenantId}
         <if test="salesCompanyId !=null and salesCompanyId != ''">

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

@@ -876,7 +876,7 @@
             is_deleted = '0'
           AND bs_type = 'XS'
           AND tenant_id = #{tenantId}
-        and FIND_IN_SET(po.`status`,'待确认,待发货,已发货,退款请核,已取消,已退款,售后中,已收货')
+        and FIND_IN_SET(`status`,'待确认,待发货,已发货,退款请核,已取消,已退款,售后中,已收货')
         <if test='type !=null and type != "" and type == "1"'>
             AND DATE(busines_date) = CURDATE()
         </if>

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/statistics/controller/StatisticsController.java

@@ -112,7 +112,7 @@ public class StatisticsController {
 	@GetMapping("/saleDetailExport")
 	public void saleDetailExport(SaleDetail saleDetailDto, HttpServletResponse response) {
 		List<SaleDetailDto> saleDetailDtoList = statisticsService.saleDetailExport(saleDetailDto);
-		if ("XS,TKXS".equals(saleDetailDto.getBsType())) {
+		if ("XS,TKXS".contains(saleDetailDto.getBsType())) {
 			ExcelUtil.export(response, "统计销售明细", "统计销售明细", saleDetailDtoList, SaleDetailDto.class);
 		} else if ("RZCG".equals(saleDetailDto.getBsType())) {
 			ExcelUtil.export(response, "融资采购明细", "统计采购明细", BeanUtil.copy(saleDetailDtoList, SaleDetailRZDto.class), SaleDetailRZDto.class);

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/statistics/service/IStatisticsService.java

@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.salesPart.dto.*;
+import org.springblade.salesPart.entity.PjOrder;
 import org.springblade.salesPart.entity.PjOrderItems;
 
 import java.util.List;
@@ -79,7 +80,7 @@ public interface IStatisticsService {
 	 * @param saleDetailDto
 	 * @return
 	 */
-	R<IPage<SaleDetailDto>> saleDetail(SaleDetail saleDetailDto, IPage<PjOrderItems> page);
+	R<IPage<SaleDetailDto>> saleDetail(SaleDetail saleDetailDto, IPage<SaleDetailDto> page);
 
 	/**
 	 * 统计销售明细 合计
@@ -93,7 +94,7 @@ public interface IStatisticsService {
 	 */
 	List<SaleDetailDto> saleDetailExport(SaleDetail saleDetailDto);
 
-	R<IPage<SalespersonCustomer>> salespersonCustomerDetail(SaleDetail saleDetailDto, IPage<SalespersonCustomer> page);
+	R<IPage<SalespersonCustomer>> salespersonCustomerDetail(SaleDetail saleDetailDto, IPage<PjOrder> page);
 
 	R salespersonCustomerSum(SaleDetail saleDetailDto);
 

blade-service/blade-sales-part/src/main/resources/log/logback-dev.xml

@@ -58,56 +58,56 @@
     </if>
 
     <!-- 日志输出级别 -->
-    <root level="ERROR">
+    <root level="info">
         <appender-ref ref="STDOUT"/>
         <appender-ref ref="${STDOUT_APPENDER}"/>
     </root>
 
-    <logger name="net.sf.ehcache" level="ERROR"/>
-    <logger name="druid.sql" level="ERROR"/>
+    <logger name="net.sf.ehcache" level="info"/>
+    <logger name="druid.sql" level="info"/>
 
 
     <!-- MyBatis log configure -->
-    <logger name="com.apache.ibatis" level="ERROR"/>
-    <logger name="org.mybatis.spring" level="ERROR"/>
-    <logger name="java.sql.Connection" level="ERROR"/>
-    <logger name="java.sql.Statement" level="ERROR"/>
-    <logger name="java.sql.PreparedStatement" level="ERROR"/>
+    <logger name="com.apache.ibatis" level="info"/>
+    <logger name="org.mybatis.spring" level="info"/>
+    <logger name="java.sql.Connection" level="info"/>
+    <logger name="java.sql.Statement" level="info"/>
+    <logger name="java.sql.PreparedStatement" level="info"/>
 
     <!-- 减少部分debug日志 -->
-    <logger name="druid.sql" level="ERROR"/>
-    <logger name="org.apache.shiro" level="ERROR"/>
-    <logger name="org.mybatis.spring" level="ERROR"/>
-    <logger name="org.springframework" level="ERROR"/>
-    <logger name="org.springframework.context" level="ERROR"/>
-    <logger name="org.springframework.beans" level="ERROR"/>
-    <logger name="com.baomidou.mybatisplus" level="ERROR"/>
-    <logger name="org.apache.ibatis.io" level="ERROR"/>
-    <logger name="org.apache.velocity" level="ERROR"/>
-    <logger name="org.eclipse.jetty" level="ERROR"/>
-    <logger name="io.undertow" level="ERROR"/>
-    <logger name="org.xnio.nio" level="ERROR"/>
-    <logger name="org.thymeleaf" level="ERROR"/>
-    <logger name="springfox.documentation" level="ERROR"/>
-    <logger name="org.hibernate.validator" level="ERROR"/>
-    <logger name="com.netflix.loadbalancer" level="ERROR"/>
-    <logger name="com.netflix.hystrix" level="ERROR"/>
-    <logger name="com.netflix.zuul" level="ERROR"/>
-    <logger name="de.codecentric" level="ERROR"/>
-    <!-- cache ERROR -->
-    <logger name="net.sf.ehcache" level="ERROR"/>
-    <logger name="org.springframework.cache" level="ERROR"/>
+    <logger name="druid.sql" level="info"/>
+    <logger name="org.apache.shiro" level="info"/>
+    <logger name="org.mybatis.spring" level="info"/>
+    <logger name="org.springframework" level="info"/>
+    <logger name="org.springframework.context" level="info"/>
+    <logger name="org.springframework.beans" level="info"/>
+    <logger name="com.baomidou.mybatisplus" level="info"/>
+    <logger name="org.apache.ibatis.io" level="info"/>
+    <logger name="org.apache.velocity" level="info"/>
+    <logger name="org.eclipse.jetty" level="info"/>
+    <logger name="io.undertow" level="info"/>
+    <logger name="org.xnio.nio" level="info"/>
+    <logger name="org.thymeleaf" level="info"/>
+    <logger name="springfox.documentation" level="info"/>
+    <logger name="org.hibernate.validator" level="info"/>
+    <logger name="com.netflix.loadbalancer" level="info"/>
+    <logger name="com.netflix.hystrix" level="info"/>
+    <logger name="com.netflix.zuul" level="info"/>
+    <logger name="de.codecentric" level="info"/>
+    <!-- cache info -->
+    <logger name="net.sf.ehcache" level="info"/>
+    <logger name="org.springframework.cache" level="info"/>
     <!-- cloud -->
-    <logger name="org.apache.http" level="ERROR"/>
-    <logger name="com.netflix.discovery" level="ERROR"/>
-    <logger name="com.netflix.eureka" level="ERROR"/>
+    <logger name="org.apache.http" level="info"/>
+    <logger name="com.netflix.discovery" level="info"/>
+    <logger name="com.netflix.eureka" level="info"/>
     <!-- 业务日志 -->
-    <Logger name="org.springblade" level="ERROR"/>
-    <Logger name="org.springblade.core.tenant" level="ERROR"/>
-    <Logger name="org.springblade.core.version" level="ERROR"/>
+    <Logger name="org.springblade" level="info"/>
+    <Logger name="org.springblade.core.tenant" level="info"/>
+    <Logger name="org.springblade.core.version" level="info"/>
 
     <!-- 减少nacos日志 -->
-    <logger name="com.alibaba.nacos" level="ERROR"/>
+    <logger name="com.alibaba.nacos" level="info"/>
 
 
 </configuration>