Merge branch 'dev' into pre-production

blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java

@@ -41,6 +41,12 @@ public class OldSystemDataPushConfig {
 		// 西安
 		warehourseIds.add("145");
 
+		// 重庆
+		warehourseIds.add("42");
+
+		// 清远
+		warehourseIds.add("68");
+
 
 	}
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicDataClienImporter.java

@@ -9,6 +9,7 @@ import java.util.List;
 public class BasicDataClienImporter  implements ExcelImporter<BasicdataClientExcel> {
 
 		private final IBasicdataClientService service;
+
 		private final Boolean isCovered;
 
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml

@@ -366,15 +366,24 @@
         LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.stock_article_id = ldbs.stock_article_id
         LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id
         LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id
+        LEFT JOIN (
+        SELECT
+        IFNULL(COUNT( b.reservation_id ),0 )AS aaa,
+        b.stockup_id AS stockup_id
+        FROM
+        logpm_distribution_stockup AS a
+        LEFT JOIN logpm_distribution_stockup_info AS b ON a.id = b.stockup_id
+        WHERE b.stock_status != 4
+        GROUP BY b.stockup_id
+        ) AS aa ON aa.stockup_id = lds.id
         <where>
-            lds.is_deleted = 0
+            lds.is_deleted = 0 AND aa.aaa >0 AND ldsi.stock_status != 4
             <!-- lds.tenant_id = #{param.tenantId} -->
             <if test="param.typeService != null and param.typeService != '' ">and lds.type_service =
                 #{param.typeService}
             </if>
             <if test="param.consignee != null and param.consignee != '' ">and
-                ldr.consignee =
-                #{param.consignee}
+                ldsa.mall_name =#{param.consignee}
             </if>
             <if test="param.stockupDate != null  ">and TO_DAYS(lds.stockup_date)=TO_DAYS( #{param.stockupDate})</if>
             <if test="param.outboundDate != null  ">and TO_DAYS(lds.outbound_date)=TO_DAYS( #{param.outboundDate})</if>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml

@@ -514,9 +514,11 @@
     <select id="getBillLadingOrderMainVO"
             resultType="com.logpm.distribution.vo.app.DistrilbutionAppBillLadingOrderMainVO">
         SELECT
-        ( SELECT count( 1 ) FROM logpm_distrilbution_bill_stock WHERE bill_lading_id = ldbl.id AND order_status != 2 AND is_deleted = 0) AS orderNum ,
-        (IFNULL((SELECT SUM(quantity) FROM logpm_distribution_reservation_zero_package WHERE reservation_id = ldbl.id AND is_deleted = 0),0)) + (IFNULL((SELECT sum(packet_number) FROM logpm_distrilbution_bill_package WHERE bill_lading_id = ldbl.id AND is_deleted = 0),0))+(IFNULL((SELECT SUM(quantity) FROM logpm_distribution_delivery_details WHERE bill_lading_id = ldbl.id AND is_deleted = 0),0)) AS planNum,
-        IFNULL((SELECT SUM(quantity) FROM logpm_distribution_delivery_details WHERE bill_lading_id = ldbl.id AND is_deleted = 0),0) AS inventoryNub,
+        ( SELECT count( 1 ) FROM logpm_distrilbution_bill_stock WHERE bill_lading_id = ldbl.id AND order_status != 2 AND is_deleted = 0 AND order_status ！= 2 ) AS orderNum ,
+        (IFNULL((SELECT SUM(quantity) FROM logpm_distribution_reservation_zero_package WHERE reservation_id = ldbl.id AND zero_package_status != 2  AND is_deleted = 0),0)) +
+        (IFNULL((SELECT sum(packet_number) FROM logpm_distrilbution_bill_package WHERE bill_lading_id = ldbl.id AND packet_bar_status ！= 2  AND is_deleted = 0),0))+
+        (IFNULL((SELECT SUM(quantity) FROM logpm_distribution_delivery_details WHERE bill_lading_id = ldbl.id AND inventory_status != 2 AND is_deleted = 0),0)) AS planNum,
+        IFNULL((SELECT SUM(quantity) FROM logpm_distribution_delivery_details WHERE bill_lading_id = ldbl.id AND is_deleted = 0 AND inventory_status != 2),0) AS inventoryNub,
         IFNULL((SELECT SUM(quantity) FROM logpm_distribution_bill_lading_scan WHERE bill_lading_id = ldbl.id AND is_deleted = 0) ,0) AS signedNum
         FROM
         logpm_distrilbution_bill_lading AS ldbl

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java

@@ -376,6 +376,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 			BeanUtils.copyProperties(i, parcelListVO);
 			parcelListVO.setLibraryQuantity(parcelNumber.getHandQuantity());
 			parcelListVO.setDeliveryQuantity(parcelNumber.getDeliveryQuantity());
+			parcelListVO.setTiQuantity(parcelNumber.getHandQuantity());
 			if (ObjectUtils.isNotNull(one)) {
 				parcelListVO.setReservationQuantity(one.getQuantity());
 			} else {
@@ -410,7 +411,6 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 					.eq("parcel_list_id", parcelZeroVO.getId())
 					.set("hand_quantity", parcelZeroVO.getTiQuantity())
 				);
-
 			}
 
 		});

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupInfoServiceImpl.java

@@ -128,7 +128,6 @@ public class DistributionStockupInfoServiceImpl extends BaseServiceImpl<Distribu
 					//查询备货任务错误的原因
 					log.error(method+"预约单关联备货任务错误reservationId:{}",reservationId);
 				}
-				break;
 			case 2:
 				List<DistributionStockupInfoEntity> billLadingentityList = this.list(Wrappers.<DistributionStockupInfoEntity>query().lambda()
 					.eq(DistributionStockupInfoEntity::getReservationId, reservationId)
@@ -143,7 +142,6 @@ public class DistributionStockupInfoServiceImpl extends BaseServiceImpl<Distribu
 				}else {
 					log.error(method+"预约单关联备货任务错误reservationId:{}",reservationId);
 				}
-				break;
 			default:
 				List<DistributionStockupInfoEntity> stockupInfoEntityList = this.list(Wrappers.<DistributionStockupInfoEntity>query().lambda()
 					.eq(DistributionStockupInfoEntity::getStockupId, distributionStockupInfoEntity.getStockupId())

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java

@@ -679,6 +679,19 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			case 0:
 				//进行自提单的取消
 				this.removeBatchByIds(ids);
+				//取消备货任务
+				List<DistributionStockupInfoEntity> entityList = distributionStockupInfoService.list(Wrappers.<DistributionStockupInfoEntity>query().lambda()
+					.in(DistributionStockupInfoEntity::getReservationId, ids)
+					.ne(DistributionStockupInfoEntity::getStockStatus, "4")
+					.eq(DistributionStockupInfoEntity::getStockUpType, "3")
+				);
+				if (Func.isNotEmpty(entityList)){
+					for (DistributionStockupInfoEntity distributionStockupInfoEntity : entityList) {
+						//取消备货任务
+						distributionStockupInfoEntity.setStockStatus("4");
+						distributionStockupInfoService.updateById(distributionStockupInfoEntity);
+					}
+				}
 				return R.status(true);
 			case 1:
 				return R.fail("未授权!!!");
@@ -2144,6 +2157,8 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			billLadingEntity.setConditions(BillLadingStatusConstant.yiqianshou.getValue());
 			billLadingEntity.setId(Long.parseLong(s));
 			this.updateById(billLadingEntity);
+			//完成备货状态
+			distributionStockupInfoService.maintenanceStockUp(Long.parseLong(s),2);
 			//查询自提单是否完成扫描
 			Integer integer = this.selectBillLadingPlanNum(Long.parseLong(s));
 			List<DistributionBillLadingScanEntity> ladingScanEntities = distributionBillLadingScanService.list(Wrappers.<DistributionBillLadingScanEntity>query().lambda().eq(DistributionBillLadingScanEntity::getBillLadingId, Long.parseLong(s)));

blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java

@@ -444,11 +444,11 @@ public class SyncOrderInfoToPlatform {
 					}catch (CustomerException e){
 						warehouseMappingDataService.updateSyncZeroStatus(id,2);
 						log.error(e.message,e);
-						return ReturnT.FAIL;
+						continue;
 					}catch (Exception e){
 						warehouseMappingDataService.updateSyncZeroStatus(id,2);
 						log.error("#############syncZeroOrderInfo: 同步数据失败",e);
-						return ReturnT.FAIL;
+						continue;
 					}
 					log.info("################syncZeroOrderInfo: 同步完成{}个订单",total);
 				}

blade-service/logpm-report/src/main/java/com/logpm/report/controller/BillDataController.java

@@ -0,0 +1,38 @@
+package com.logpm.report.controller;
+
+
+import com.logpm.report.service.BillingService;
+import com.logpm.report.vo.indexCount.BillingDataVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@AllArgsConstructor
+@RestController
+@RequestMapping("/bill_data")
+@Api(value = "首页开单数据",tags = "首页开单数据")
+public class BillDataController {
+
+	private BillingService billingService;
+
+	/**
+	 * 获取开单数据
+	 * @return
+	 */
+	@GetMapping("/bill_data")
+	@ApiOperation(value = "",tags = "")
+	public BillingDataVo billData(){
+	return  billingService.BillData();
+	}
+
+
+
+
+
+
+
+}

blade-service/logpm-report/src/main/java/com/logpm/report/controller/IndexCountController.java

@@ -40,7 +40,7 @@ public class IndexCountController {
 		return  R.data(theNumberOfShelvesInTheLibrary);
 	}
 
-	@GetMapping("/index_number_in_the_library")
+	@GetMapping("/index_number_no_the_library")
 	@ApiOperation(value = "定制品在库订单未上架总数",tags = "定制品在库订单未上架总数")
 	public R<Integer> getTheNumberOfShelvesNoTheLibrary(@RequestParam("id") Long id){
 		Integer theNumberOfShelvesInTheLibrary= inLibraryDeliverService.theNumberOfShelvesInTheLibrary(id,1);

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/BillDataMapper.java

@@ -6,14 +6,16 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
+import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 
 @Mapper
 public interface BillDataMapper {
 
-	Integer  billCount(@Param("warehouseId") Long warehouseId, @Param("timeType") Integer timeType, @Param("date")List<Object> date);
-	BigDecimal billMoney(@Param("warehouseId") Long warehouseId,@Param("timeType") Integer timeType, @Param("date")List<Object> date);
-	BigDecimal detailMoney(@Param("warehouseId") Long warehouseId,@Param("detailMoney") Integer timeType, @Param("date")List<Object> date);
+	Integer  billCount(@Param("warehouseId") List<Long> warehouseId, @Param("timeType") String timeType, @Param("date") HashMap<String, Date> date);
+	BigDecimal billMoney(@Param("warehouseId") List<Long> warehouseId,@Param("timeType") String timeType, @Param("date")HashMap<String,Date> date);
+	BigDecimal detailMoney(@Param("warehouseId") List<Long> warehouseId,@Param("detailMoney") String timeType, @Param("date")HashMap<String,Date> date);
 
 
 

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/BillDataMapper.xml

@@ -7,20 +7,22 @@
         select count(*) billCount
          from
              logpm_platform.logpm_warehouse_waybill
-        where  freeze_status = 1
+        where  freeze_status = 0
         <where>
-            <if test="warehouseId!=null">
-                and
-                where destination_warehouse_id = #{warehouseId}
-            </if>
+                <foreach collection="warehouseId" index="index" item="item">
+                    <if test="item != null">
+                        and  destination_warehouse_id = #{item}
+                    </if>
+
+                </foreach>
             <if test="timeType !=null ">
                 <choose>
                     <when test="timeType == 2">
-                        <if test="param.startDate != null and date.startDate != '' ">
-                            and  create_time &gt; #{param.startDate}
+                        <if test="date.start_date != null and date.start_date != '' ">
+                            and  create_time &gt; #{date.start_date}
                         </if>
-                        <if test="param.endDate != null and date.endDate != '' ">
-                            and  create_time &lt; #{param.endDate}
+                        <if test="date.end_date != null and date.end_date != '' ">
+                            and  create_time &lt; #{date.end_date}
                         </if>
                     </when>
                 </choose>

blade-service/logpm-report/src/main/java/com/logpm/report/service/BillingService.java

@@ -4,6 +4,8 @@ import com.logpm.report.vo.indexCount.BillingDataVo;
 import com.logpm.report.vo.indexCount.DetailMoneyVo;
 
 import java.math.BigDecimal;
+import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 
 public interface BillingService {
@@ -13,21 +15,21 @@ public interface BillingService {
 	 * @param TType
 	 * @return Integer
 	 */
-	Integer BillCount(Integer TType);
+	Integer BillCount(String TType,HashMap<String,Date> date);
 
 	/**
 	 * 获取开单收入
 	 * @param TType
 	 * @return BigDecimal
 	 */
-	BigDecimal BillMoney(Integer TType);
+	BigDecimal BillMoney(String TType, HashMap<String, Date> date);
 
 	/**
 	 * 获取开单收入明细
 	 * @param TType
 	 * @return List
 	 */
-	List<DetailMoneyVo> DetailType(Integer TType);
+	List<DetailMoneyVo> DetailType(String TType,HashMap<String,Date> date);
 
 
 	/**

blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/BillingServiceImpl.java

@@ -2,15 +2,19 @@ package com.logpm.report.service.impl;
 
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
+import com.logpm.report.mapper.BillDataMapper;
 import com.logpm.report.service.BillingService;
+import com.logpm.report.typepage.TimeType;
 import com.logpm.report.vo.indexCount.BillingDataVo;
 import com.logpm.report.vo.indexCount.DetailMoneyVo;
 import lombok.AllArgsConstructor;
+
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
+
+import java.util.*;
+
 
 @Service
 @AllArgsConstructor
@@ -18,35 +22,99 @@ public class BillingServiceImpl  implements BillingService {
 
 	private IBasicdataWarehouseClient warehouseClient;
 
+	private BillDataMapper billDataMapper;
 
 
-
+	/**
+	 * 获取时间范围内的开单数
+	 * @param TType
+	 * @param date
+	 * @return Integer
+	 */
 	@Override
-	public Integer BillCount(Integer TType) {
-		return null;
+	public Integer BillCount(String TType,HashMap<String,Date> date) {
+		List<Long> warehouse = getWarehouse();
+		return billDataMapper.billCount(warehouse, TType, date);
 	}
 
+	/**
+	 * 获取时间范围内的收入
+	 * @param TType
+	 * @param date
+	 * @return BigDecimal
+	 */
 	@Override
-	public BigDecimal BillMoney(Integer TType) {
-		return null;
+	public BigDecimal BillMoney(String TType, HashMap<String,Date> date) {
+		List<Long> warehouse = getWarehouse();
+		return billDataMapper.billMoney(warehouse, TType, date);
 	}
 
+	/**
+	 * 获取时间范围内地的收入明细
+	 * @param TType
+	 * @param date
+	 * @return
+	 */
 	@Override
-	public List<DetailMoneyVo> DetailType(Integer TType) {
+	public List<DetailMoneyVo> DetailType(String TType,HashMap<String,Date> date) {
 		return null;
 	}
 
+	/**
+	 * 获取全部开单数据
+	 * @return BillingDataVo
+	 */
 	@Override
 	public BillingDataVo BillData() {
-		return null;
+		BillingDataVo billingDataVo = new BillingDataVo();
+		HashMap<String, Date> time1 = getOtherTime(TimeType.all.getValue());
+		HashMap<String, Date> time2 = getOtherTime(TimeType.moon.getValue());
+		HashMap<String, Date> time3 = getOtherTime(TimeType.day.getValue());
+		Integer all = BillCount(TimeType.all.getValue(), time1);
+		Integer moon = BillCount(TimeType.moon.getValue(), time2);
+		Integer day = BillCount(TimeType.day.getValue(), time3);
+		billingDataVo.setAllCount(all);
+		billingDataVo.setMoonCount(moon);
+		billingDataVo.setDayCount(day);
+		return billingDataVo;
 	}
 
+	/**
+	 * 获取当月/当天时间
+	 * @param type 2：月：3天
+	 * @return
+	 */
+	public HashMap<String,Date> getOtherTime(String type){
+		HashMap<String, Date> hashMap = new HashMap<>();
+		Calendar instance = Calendar.getInstance();
+		Date endTime = new Date();
+		int typeI = Integer.parseInt(type);
+		if (typeI ==2){
+			instance.set(Calendar.DAY_OF_MONTH,1);
+			Date time = instance.getTime();
+			hashMap.put("stare_time",time);
+			hashMap.put("end_time",endTime);
+		}else if (typeI ==3) {
+			Calendar calendar = Calendar.getInstance();
+			calendar.set(Calendar.HOUR_OF_DAY, 0);
+			calendar.set(Calendar.MINUTE, 0);
+			calendar.set(Calendar.SECOND, 0);
+			calendar.set(Calendar.MILLISECOND, 0);
+			Date time = calendar.getTime();
+			hashMap.put("stare_time",time);
+			hashMap.put("end_time",endTime);
+		}
+		return  hashMap;
+
+
+	}
 	/**
 	 * 获取用户仓库id
 	 * @return
 	 */
 	private List<Long> getWarehouse(){
 		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+//		BasicdataWarehouseEntity myCurrentWarehouse = new BasicdataWarehouseEntity();
 		List<Long> ls = new ArrayList<>();
 		if (myCurrentWarehouse !=null){
 			ls.add(myCurrentWarehouse.getId());

blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/BillingDataVo.java

@@ -1,11 +1,16 @@
 package com.logpm.report.vo.indexCount;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.List;
 
-public class BillingDataVo {
+@Data
+@ApiModel("首页开单数据")
+public class BillingDataVo implements Serializable {
 
 	@ApiModelProperty("开单总数")
 	private  Integer allCount;

blade-service/logpm-report/src/main/resources/application-dev.yml

@@ -33,7 +33,7 @@ spring:
           url: ${blade.datasource.report.master.url}
           username: ${blade.datasource.report.master.username}
 #          password: ${blade.datasource.report.master.password}
-          password: Hwy@1234
+          password: 12345678
         slave:
           druid:
             #独立校验配置
@@ -43,5 +43,5 @@ spring:
           url: ${blade.datasource.report.slave.url}
           username: ${blade.datasource.report.slave.username}
 #          password: ${blade.datasource.report.slave.password}
-          password: Hwy@1234
+          password: 12345678
 

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/TaskQuestController.java

@@ -25,6 +25,7 @@ import com.logpm.warehouse.dto.TaskQuestDTO;
 import com.logpm.warehouse.dto.TaskSearchDTO;
 import com.logpm.warehouse.entity.TaskQuestEntity;
 import com.logpm.warehouse.excel.QuestContrastExcel;
+import com.logpm.warehouse.excel.TaskQueryDataExcel;
 import com.logpm.warehouse.excel.TaskQuestExcel;
 import com.logpm.warehouse.service.ITaskQuestService;
 import com.logpm.warehouse.vo.QuestContrastVO;
@@ -164,6 +165,25 @@ public class TaskQuestController extends BladeController {
 		return R.data(page);
 	}
 
+	/**
+	 * 盘点任务 未盘点数据导出
+	 * @return
+	 */
+	@GetMapping("/exportContrastStockInfo")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "盘点任务 未盘点数据导出", notes = "传入id")
+	public void exportContrastStockInfo( HttpServletResponse response,QuestDetailDTO questDetailDTO,Query query){
+//		IPage<QuestDetailVO> page = taskQuestService.selectTaskDataInfo(questDetailDTO,Condition.getPage(query));
+
+		List<TaskQueryDataExcel> data =taskQuestService.exportContrastStockInfo(questDetailDTO);
+//		List<QuestContrastExcel> list = taskQuestService.exportGetContrastInfo(questDetailDTO);
+
+
+		ExcelUtil.export(response, "未盘点任务数据" + DateUtil.time(), "未盘点任务数据数据表", data, TaskQueryDataExcel.class);
+
+	}
+
+
 	/**
 	 *盘点任务 查询盘点对比数据
  	 * @return

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/excel/TaskQueryDataExcel.java

@@ -0,0 +1,100 @@
+package com.logpm.warehouse.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class TaskQueryDataExcel  implements Serializable {
+
+
+
+	/**
+	 * 订单自编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("商场名称")
+	private String marketName;
+	/**
+	 * 订单自编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("订单自编号")
+	private String orderCode;
+
+
+	@ColumnWidth(20)
+	@ExcelProperty("包条码")
+	private String orderPackageCode;
+
+
+	@ColumnWidth(20)
+	@ExcelProperty("品类")
+	private String questTarget;
+
+	@ColumnWidth(20)
+	@ExcelProperty("盘点状态")
+	private String questStatus;
+
+
+	@ColumnWidth(20)
+	@ExcelProperty("货位")
+	private String positionCode;
+
+	@ColumnWidth(20)
+	@ExcelProperty("物料名称")
+	private String materialName;
+
+	@ColumnWidth(20)
+	@ExcelProperty("数量")
+	private String stockNum;
+
+
+	@ColumnWidth(20)
+	@ExcelProperty("托盘名称")
+	private String trayName;
+
+	/**
+	 * 一级名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("一级名称")
+	private String oneProduct;
+	/**
+	 * 二级名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("二级名称")
+	private String twoProduct;
+	/**
+	 * 三级名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("三级名称")
+	private String thirdProduct;
+
+	/**
+	 * 产品名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("产品名称")
+	private String categoryName;
+
+	/**
+	 * 物料编码
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("物料编码")
+	private String materialCode;
+
+	@ColumnWidth(20)
+	@ExcelProperty("品牌名称")
+	private String brandName;
+}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.java

@@ -22,6 +22,7 @@ import com.logpm.warehouse.entity.QuestDetailChildEntity;
 import com.logpm.warehouse.entity.QuestDetailEntity;
 import com.logpm.warehouse.entity.TaskQuestEntity;
 import com.logpm.warehouse.entity.WarehouseTrayEntity;
+import com.logpm.warehouse.excel.TaskQueryDataExcel;
 import com.logpm.warehouse.vo.*;
 import com.logpm.warehouse.excel.TaskQuestExcel;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -186,4 +187,6 @@ public interface TaskQuestMapper extends BaseMapper<TaskQuestEntity> {
 	List<QuestDetailVO> findListByTrayCode(@Param("questNum") String questNum, @Param("trayCode") String trayCode);
 
 	List<DistributionStockListEntity> findStockList(@Param("param") TaskSearchDTO taskSearchDTO);
+
+	List<TaskQueryDataExcel> selectContrastStockInfo(@Param("questNum") String questNum);
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml

@@ -653,5 +653,23 @@
             </foreach>
         </if>
     </select>
+    <select id="selectContrastStockInfo" resultType="com.logpm.warehouse.excel.TaskQueryDataExcel">
+        select
+        order_code,
+        order_package_code,
+        quest_target,
+        tray_name,
+        position_code,
+        firsts oneProduct,
+        second as twoProduct,
+        third_product as thirdProduct,
+        market_name,
+        material_name,
+        stock_num,
+        brand_name,
+        material_code,
+        category_name
+        from ${questNum} lqd where quest_status =0
+    </select>
 
 </mapper>

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/ITaskQuestService.java

@@ -26,6 +26,7 @@ import com.logpm.warehouse.entity.QuestDetailChildEntity;
 import com.logpm.warehouse.entity.QuestDetailEntity;
 import com.logpm.warehouse.entity.TaskQuestEntity;
 import com.logpm.warehouse.excel.QuestContrastExcel;
+import com.logpm.warehouse.excel.TaskQueryDataExcel;
 import com.logpm.warehouse.excel.TaskQuestExcel;
 import com.logpm.warehouse.vo.*;
 import org.springblade.core.mp.base.BaseService;
@@ -295,4 +296,10 @@ public interface ITaskQuestService extends BaseService<TaskQuestEntity> {
 
 	List<DistributionStockListEntity> findStockList(TaskSearchDTO taskSearchDTO);
 
+	/**
+	 * 导出未盘点数据
+	 * @param questDetailDTO
+	 * @return
+	 */
+	List<TaskQueryDataExcel> exportContrastStockInfo(QuestDetailDTO questDetailDTO);
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java

@@ -38,6 +38,7 @@ import com.logpm.warehouse.dto.TaskQuestDTO;
 import com.logpm.warehouse.dto.TaskSearchDTO;
 import com.logpm.warehouse.entity.*;
 import com.logpm.warehouse.excel.QuestContrastExcel;
+import com.logpm.warehouse.excel.TaskQueryDataExcel;
 import com.logpm.warehouse.excel.TaskQuestExcel;
 import com.logpm.warehouse.mapper.TaskQuestMapper;
 import com.logpm.warehouse.mapper.WarehouseTrayGoodsMapper;
@@ -924,53 +925,9 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 		IPage<QuestDetailEntity> questDetailEntityIPage = baseMapper.selectTaskInfoIPage(page, questDetailDTO.getQuestNum(), questDetail);
 		IPage<QuestDetailVO> page1 = new Page<>();
 		List<QuestDetailVO> questDetailVOS = new ArrayList<>();
-		questDetailEntityIPage.getRecords().stream().forEach(i -> {
+		questDetailEntityIPage.getRecords().forEach(i -> {
 			QuestDetailVO questDetailVO = new QuestDetailVO();
 			BeanUtil.copyProperties(i, questDetailVO);
-			//查询包件信息
-			/*if(ObjectUtils.isNotNull(i.getOrderPackageId()) ){
-
-				DistributionParcelListEntity parcelListId = distributionParcelListClient.getParcelListId(String.valueOf(i.getOrderPackageId()));
-				if(ObjectUtils.isNotNull(parcelListId)){
-					questDetailVO.setFirsts(parcelListId.getFirsts());
-					questDetailVO.setSecond(parcelListId.getSecond());
-					questDetailVO.setThirdProduct(parcelListId.getThirdProduct());
-					questDetailVO.setMaterialName(parcelListId.getMaterialName());
-					questDetailVO.setMaterialCode(parcelListId.getMaterialCode());
-					questDetailVO.setBrandName(parcelListId.getBrandName());
-				}
-			}else*/
-			/*	if(i.getQuestTarget().equals(2)){
-				//零担
-				DistributionStockArticleEntity stockArticleEntity = new DistributionStockArticleEntity();
-				stockArticleEntity.setWarehouseId(i.getWarehouseId());
-				stockArticleEntity.setId(i.getOrderId());
-				List<DistributionStockArticleEntity> stockArticleInfo = distributionStockArticleClient.getStockArticleInfo(stockArticleEntity);
-				if(!stockArticleInfo.isEmpty()){
-					//
-					questDetailVO.setOrderCode(stockArticleInfo.get(0).getOrderCode());
-					questDetailVO.setFirsts(stockArticleInfo.get(0).getDescriptionGoods());
-					questDetailVO.setDescriptionGoods(stockArticleInfo.get(0).getDescriptionGoods());
-
-				}
-
-			}else if(i.getQuestTarget().equals(3) && ObjectUtils.isNull(i.getOrderPackageId())){
-				//库存平 无数据的
-				DistributionStockListEntity stockListById = distributionStockListClient.getStockListById(i.getStockId());
-				if(ObjectUtils.isNotNull( stockListById)){
-					questDetailVO.setOrderCode(stockListById.getIncomingBatch());
-					questDetailVO.setMaterialName(stockListById.getDescriptionGoods() );
-					questDetailVO.setMaterialCode(stockListById.getCargoNumber () );
-					questDetailVO.setBrandName(stockListById.getBrandName());
-				}
-			}*/
-			/*if(ObjectUtils.isNotNull(i.getTrayId())){
-				//查询托盘名称
-				List<BasicdataTrayEntity> trayEntityList = basicdataTrayClient.getTrayEntityList(i.getTrayId());
-				if(ObjectUtils.isNotNull(trayEntityList)){
-				questDetailVO.setTrayName(trayEntityList.get(0).getPalletName());
-				}
-			}*/
 			if (!i.getQuestStatus().equals(0)) {
 				R<List<User>> listR = userSearchClient.listByUser(String.valueOf(i.getUpdateUser()));
 				if (ObjectUtils.isNotNull(listR.getData())) {
@@ -3365,6 +3322,16 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 		return R.data(taskContractVOS);
 	}
 
+	@Override
+	public List<TaskQueryDataExcel> exportContrastStockInfo(QuestDetailDTO questDetailDTO) {
+
+
+		List<TaskQueryDataExcel> datas =baseMapper.selectContrastStockInfo( questDetailDTO.getQuestNum());
+		return datas;
+
+
+
+	}
 
 	private String getQuestNum(String warehouseCode) {
 		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
@@ -3398,4 +3365,6 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 		}
 	}
 
+
+
 }