修改货位重复

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationPackageController.java

@@ -138,12 +138,8 @@ public class DistributionReservationPackageController extends BladeController {
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "导出数据", notes = "传入distributionReservationPackage")
 	public void exportDistributionReservationPackage(@ApiIgnore @RequestParam Map<String, Object> distributionReservationPackage, BladeUser bladeUser, HttpServletResponse response) {
-		QueryWrapper<DistributionReservationPackageEntity> queryWrapper = Condition.getQueryWrapper(distributionReservationPackage, DistributionReservationPackageEntity.class);
-		//if (!AuthUtil.isAdministrator()) {
-		//	queryWrapper.lambda().eq(DistributionReservationPackage::getTenantId, bladeUser.getTenantId());
-		//}
-		queryWrapper.lambda().eq(DistributionReservationPackageEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
-		List<DistributionReservationPackageExcel> list = distributionReservationPackageService.exportDistributionReservationPackage(queryWrapper);
+
+		List<DistributionReservationPackageExcel> list = distributionReservationPackageService.exportDistributionReservationPackage(distributionReservationPackage);
 		ExcelUtil.export(response, "预约包件中间表数据" + DateUtil.time(), "预约包件中间表数据表", list, DistributionReservationPackageExcel.class);
 	}
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationStockarticleController.java

@@ -149,12 +149,8 @@ public class DistributionReservationStockarticleController extends BladeControll
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "导出数据", notes = "传入distributionReservationStockarticle")
 	public void exportDistributionReservationStockarticle(@ApiIgnore @RequestParam Map<String, Object> distributionReservationStockarticle, BladeUser bladeUser, HttpServletResponse response) {
-		QueryWrapper<DistributionReservationStockarticleEntity> queryWrapper = Condition.getQueryWrapper(distributionReservationStockarticle, DistributionReservationStockarticleEntity.class);
-		//if (!AuthUtil.isAdministrator()) {
-		//	queryWrapper.lambda().eq(DistributionReservationStockarticle::getTenantId, bladeUser.getTenantId());
-		//}
-		queryWrapper.lambda().eq(DistributionReservationStockarticleEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
-		List<DistributionReservationStockarticleExcel> list = distributionReservationStockarticleService.exportDistributionReservationStockarticle(queryWrapper);
+
+		List<DistributionReservationStockarticleExcel> list = distributionReservationStockarticleService.exportDistributionReservationStockarticle(distributionReservationStockarticle);
 		ExcelUtil.export(response, "预约订单中间表数据" + DateUtil.time(), "预约订单中间表数据表", list, DistributionReservationStockarticleExcel.class);
 	}
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationStocklistController.java

@@ -138,12 +138,8 @@ public class DistributionReservationStocklistController extends BladeController
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "导出数据", notes = "传入distributionReservationStocklist")
 	public void exportDistributionReservationStocklist(@ApiIgnore @RequestParam Map<String, Object> distributionReservationStocklist, BladeUser bladeUser, HttpServletResponse response) {
-		QueryWrapper<DistributionReservationStocklistEntity> queryWrapper = Condition.getQueryWrapper(distributionReservationStocklist, DistributionReservationStocklistEntity.class);
-		//if (!AuthUtil.isAdministrator()) {
-		//	queryWrapper.lambda().eq(DistributionReservationStocklist::getTenantId, bladeUser.getTenantId());
-		//}
-		queryWrapper.lambda().eq(DistributionReservationStocklistEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
-		List<DistributionReservationStocklistExcel> list = distributionReservationStocklistService.exportDistributionReservationStocklist(queryWrapper);
+
+		List<DistributionReservationStocklistExcel> list = distributionReservationStocklistService.exportDistributionReservationStocklist(distributionReservationStocklist);
 		ExcelUtil.export(response, "预约库存中间表数据" + DateUtil.time(), "预约库存中间表数据表", list, DistributionReservationStocklistExcel.class);
 	}
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionReservationPackageDTO.java

@@ -30,5 +30,5 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 public class DistributionReservationPackageDTO extends DistributionReservationPackageEntity {
 	private static final long serialVersionUID = 1L;
-
+    private Long warehouseId;
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionReservationPackageExcel.java

@@ -24,6 +24,7 @@ import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 
 /**
@@ -40,65 +41,145 @@ public class DistributionReservationPackageExcel implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
+
 	/**
-	 * 租户号
+	 * 预约编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("租户号")
-	private String tenantId;
+	@ExcelProperty("预约编号")
+	private String reservationCode;
 	/**
-	 * 是否已删除
+	 * 包件编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("是否已删除")
-	private Integer isDeleted;
+	@ExcelProperty("预约时间")
+	private Date reservation_date;
+
 	/**
-	 * 预约编号
+	 * 订单编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预约编号")
-	private String reservationId;
+	@ExcelProperty("服务类型")
+	private String deliveryType;
 	/**
-	 * 包件编号
+	 * 订单编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("收货人")
+	private String consignee;
+	/**
+	 * 订单编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("手机号码")
+	private String deliveryPhone;
+	/**
+	 * 订单编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("收货地址")
+	private String deliveryAddress;
+	/**
+	 * 订单编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("运单号")
+	private String waybillNumber;
+	/**
+	 * 订单编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("包件编号")
-	private String parceListId;
+	@ExcelProperty("服务号")
+	private String serviceNumber;
 	/**
-	 * 预留1
+	 * 订单编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预留1")
-	private String reserve1;
+	@ExcelProperty("订单自编号")
+	private String orderCode;
 	/**
-	 * 预留2
+	 * 订单编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预留2")
-	private String reserve2;
+	@ExcelProperty("仓库")
+	private String warehouseName;
 	/**
-	 * 预留3
+	 * 订单编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预留3")
-	private String reserve3;
+	@ExcelProperty("包条码")
+	private String orderPackageCode;
 	/**
-	 * 预留4
+	 * 订单编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预留4")
-	private String reserve4;
+	@ExcelProperty("发站仓")
+	private String sendWarehouseName;
 	/**
-	 * 预留5
+	 * 订单编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("目的仓")
+	private String acceptWarehouseName;
+	/**
+	 * 订单编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("入库时间")
+	private String warehouseEntryTimeEnd;
+	/**
+	 * 订单编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("车次号")
+	private String trainNumber;
+	/**
+	 * 订单编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("一级品")
+	private Long firsts;
+	/**
+	 * 订单编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("二级品")
+	private Long second;
+	/**
+	 * 订单编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("三级品")
+	private Long thirdProduct;
+	/**
+	 * 订单编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("物料名称")
+	private Long materialName;
+	/**
+	 * 订单编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("数量")
+	private Long quantity;
+//	/**
+//	 * 订单编号
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("计划数量")
+//	private Long stockArticle;
+	/**
+	 * 订单编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预留5")
-	private String reserve5;
+	@ExcelProperty("货位数量")
+	private Long positionCode;
 	/**
 	 * 订单编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("订单编号")
-	private Long stockArticle;
+	@ExcelProperty("所在托盘")
+	private Long trayCode;
 
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionReservationStockarticleExcel.java

@@ -24,6 +24,7 @@ import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 
 /**
@@ -40,65 +41,100 @@ public class DistributionReservationStockarticleExcel implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
+
+	/**
+	 * 预约编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预约单号")
+	private String reservationCode;
+	/**
+	 * 预约编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("运单号")
+	private String waybillNumber;
+	/**
+	 * 预约编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("订单自编号")
+	private String orderCode;
+	/**
+	 * 预约编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("商场名称")
+	private String mallName;
+
 	/**
-	 * 租户号
+	 * 预约编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("租户号")
-	private String tenantId;
+	@ExcelProperty("门店名称")
+	private String storeName;
 	/**
-	 * 是否已删除
+	 * 预约编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("是否已删除")
-	private Integer isDeleted;
+	@ExcelProperty("货物名称")
+	private String descriptionGoods;
 	/**
 	 * 预约编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预约编号")
-	private String reservationId;
+	@ExcelProperty("品牌")
+	private String brand;
+	/**
+	 * 预约编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("收货单位")
+	private String consigneeUnit;
 	/**
 	 * 订单编号
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("订单编号")
-	private String stockarticleId;
+	@ExcelProperty("订单来源")
+	private String resource;
+
 	/**
 	 * 预约数量
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预约数量")
-	private String reservationNum;
+	@ExcelProperty("服务类型")
+	private String deliveryType;
 	/**
-	 * 预留1
+	 * 预约数量
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预留1")
-	private String reserve1;
+	@ExcelProperty("预约时间	")
+	private Date reservationDate;
 	/**
-	 * 预留2
+	 * 预约数量
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预留2")
-	private String reserve2;
+	@ExcelProperty("收货人")
+	private String consignee;
 	/**
-	 * 预留3
+	 * 预约数量
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预留3")
-	private String reserve3;
+	@ExcelProperty("手机号")
+	private String deliveryPhone;
 	/**
-	 * 预留4
+	 * 预约数量
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预留4")
-	private String reserve4;
+	@ExcelProperty("收货地址")
+	private String deliveryAddress;
 	/**
-	 * 预留5
+	 * 预约数量
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预留5")
-	private String reserve5;
+	@ExcelProperty("包件数量")
+	private String reservationNum;
+
+
 
 }

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

@@ -927,7 +927,7 @@
     </select>
 
     <select id="getAllocationByStockArticleIdAndReservationId" resultType="java.lang.String">
-        select CONCAT(lwug.area_title,'-',lwug.shelf_title,'-',lwug.allocation_title)
+        select DISTINCT CONCAT(lwug.area_title,'-',lwug.shelf_title,'-',lwug.allocation_title)
         from logpm_distribution_reservation_package ldrp
          left join logpm_distribution_parcel_list ldpl on ldpl.id = ldrp.parce_list_id and ldpl.is_deleted = 0
          left join logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id

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

@@ -56,7 +56,7 @@ public interface DistributionReservationPackageMapper extends BaseMapper<Distrib
 	 * @param queryWrapper
 	 * @return
 	 */
-	List<DistributionReservationPackageExcel> exportDistributionReservationPackage(@Param("ew") Wrapper<DistributionReservationPackageEntity> queryWrapper);
+	List<DistributionReservationPackageExcel> exportDistributionReservationPackage(@Param("param") DistributionReservationPackageDTO queryWrapper);
 
 	/**
 	 * 删除预约单和包件绑定关系

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

@@ -42,9 +42,32 @@
     </select>
 
 
-    <select id="exportDistributionReservationPackage"
-            resultType="com.logpm.distribution.excel.DistributionReservationPackageExcel">
-        SELECT * FROM logpm_distribution_reservation_package ${ew.customSqlSegment}
+    <select id="exportDistributionReservationPackage" resultType="com.logpm.distribution.excel.DistributionReservationPackageExcel">
+      <!--  SELECT * FROM logpm_distribution_reservation_package ${ew.customSqlSegment}-->
+        select DISTINCT ldr.reservation_code reservationCode,ldr.reservation_date reservationDate,ldr.delivery_type deliveryType,ldr.consignee,ldr.delivery_address deliveryAddress
+        ,ldr.delivery_phone deliveryPhone,ldr.reservation_num reservationNum,ldr.warehouse_name warehouseName,
+        ldpl.waybill_number waybillNumber,ldpl.service_number serviceNumber,ldpl.order_code orderCode,ldpl.order_package_code orderPackageCode,ldpl.send_warehouse_name sendWarehouseName
+        ,ldpl.accept_warehouse_name acceptWarehouseName,ldpl.warehouse_entry_time_end warehouseEntryTimeEnd,
+        ldpl.train_number trainNumber,ldpl.firsts,ldpl.second,ldpl.third_product thirdProduct,ldpl.material_name materialName,ldpl.quantity, lwtg.tray_code trayCode,
+        lwug.position_code positionCode
+
+        from  logpm_distribution_reservation_package ldrp
+        LEFT JOIN logpm_distribution_reservation ldr on ldr.id = ldrp.reservation_id
+        LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.id = ldrp.parce_list_id
+        LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id and lwtg.warehouse_id = #{param.warehouseId}
+        LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id  and lwug.warehouse_id = #{param.warehouseId}
+        <where>
+            ldrp.packet_bar_status in (1,3)
+            <if test="param.reservationId != null and param.reservationId != ''"> and ldrs.reservation_id  = #{param.reservationId } </if>
+            <if test="param. != null and param. != ''"> and  = #{param. } </if>
+            <if test="param. != null and param. != ''"> and  = #{param. } </if>
+            <if test="param. != null and param. != ''"> and  = #{param. } </if>
+            <if test="param. != null and param. != ''"> and  = #{param. } </if>
+            <if test="param. != null and param. != ''"> and  = #{param. } </if>
+            <if test="param. != null and param. != ''"> and  = #{param. } </if>
+            <if test="param. != null and param. != ''"> and  = #{param. } </if>
+        </where>
+
     </select>
     <select id="getReservationPackage" resultType="com.logpm.distribution.entity.DistributionParcelListEntity">
         SELECT

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

@@ -45,9 +45,30 @@
     </select>
 
 
-    <select id="exportDistributionReservationStockarticle"
-            resultType="com.logpm.distribution.excel.DistributionReservationStockarticleExcel">
-        SELECT * FROM logpm_distribution_reservation_stockarticle ${ew.customSqlSegment}
+    <select id="exportDistributionReservationStockarticle" resultType="com.logpm.distribution.excel.DistributionReservationStockarticleExcel">
+<!--        SELECT * FROM logpm_distribution_reservation_stockarticle ${ew.customSqlSegment}-->
+
+        select ldr.reservation_code reservationCode,ldr.reservation_date reservationDate,ldr.delivery_type deliveryType,ldr.consignee,ldr.delivery_address deliveryAddress
+        ,ldr.delivery_phone deliveryPhone,ldr.reservation_num reservationNum,
+        ldsa.waybill_number waybillNumber,ldsa.order_code orderCode,ldsa.mall_name mallName,ldsa.store_name storeName,ldsa.description_goods descriptionGoods,ldsa.brand,
+        ldsa.consignee_unit consigneeUnit ,ldsa.resource
+        from logpm_distribution_reservation ldr
+        LEFT JOIN logpm_distribution_reservation_stockarticle ldrs on ldr.id = ldrs.reservation_id
+        LEFT JOIN logpm_distribution_stock_article ldsa on ldsa.id = ldrs.stock_article_id
+        <where>
+            ldrs.stock_article_status in (1,3)
+            <if test="param.reservationId != null and param.reservationId != ''"> and ldrs.reservation_id  = #{param.reservationId } </if>
+            <if test="param. != null and param. != ''"> and  = #{param. } </if>
+            <if test="param. != null and param. != ''"> and  = #{param. } </if>
+            <if test="param. != null and param. != ''"> and  = #{param. } </if>
+            <if test="param. != null and param. != ''"> and  = #{param. } </if>
+            <if test="param. != null and param. != ''"> and  = #{param. } </if>
+            <if test="param. != null and param. != ''"> and  = #{param. } </if>
+            <if test="param. != null and param. != ''"> and  = #{param. } </if>
+            <if test="param. != null and param. != ''"> and  = #{param. } </if>
+        </where>
+
+
     </select>
     <select id="selectDistributionReservationStockarticleorderPage"
             resultType="com.logpm.distribution.vo.DistributionReservationStockarticleVO">

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

@@ -19,6 +19,7 @@ package com.logpm.distribution.mapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.distribution.dto.DistributionReservationStocklistDTO;
 import com.logpm.distribution.entity.DistributionParcelListEntity;
 import com.logpm.distribution.entity.DistributionReservationStocklistEntity;
 import com.logpm.distribution.entity.DistributionStockListEntity;
@@ -54,7 +55,7 @@ public interface DistributionReservationStocklistMapper extends BaseMapper<Distr
 	 * @param queryWrapper
 	 * @return
 	 */
-	List<DistributionReservationStocklistExcel> exportDistributionReservationStocklist(@Param("ew") Wrapper<DistributionReservationStocklistEntity> queryWrapper);
+	List<DistributionReservationStocklistExcel> exportDistributionReservationStocklist(@Param("param") DistributionReservationStocklistDTO queryWrapper);
 
 
 	int deleteReservationStocklist(@Param("id")Long id);

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

@@ -34,7 +34,14 @@
 
 
     <select id="exportDistributionReservationStocklist" resultType="com.logpm.distribution.excel.DistributionReservationStocklistExcel">
-        SELECT * FROM logpm_distribution_reservation_stocklist ${ew.customSqlSegment}
+       <!-- SELECT * FROM logpm_distribution_reservation_stocklist ${ew.customSqlSegment}-->
+
+
+
+
+
+
+
     </select>
     <select id="getStockListTotal" resultType="java.lang.Integer">
         select count(*) from logpm_distribution_reservation_stocklist

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

@@ -280,6 +280,9 @@
             <if test="param.sjsigningTime!=null and param.sjsigningTime!=''">
                 and  date_format(lds.sjsigning_time,'%y%m%d%') = date_format(#{param.sjsigningTime},'%y%m%d%')
             </if>
+            <if test="param.warehouseId!=null and param.warehouseId!=''">
+                and  lddl.warehouse_id = #{param.warehouseId}  and ldr.warehouse_id =#{param.warehouseId}
+            </if>
             <!--              <if test="param.leadTime!=null and param.leadTime!=''">-->
             <!--                and  date_format(ldsd.lead_time,'%y%m%d%') = date_format(#{param.leadTime},'%y%m%d%')-->
             <!--            </if>-->

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationPackageService.java

@@ -30,6 +30,7 @@ import com.logpm.distribution.vo.app.DistributionAppParcelListVO;
 import org.springblade.core.mp.base.BaseService;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 预约包件中间表 服务类
@@ -51,10 +52,10 @@ public interface IDistributionReservationPackageService extends BaseService<Dist
 	/**
 	 * 导出数据
 	 *
-	 * @param queryWrapper
+	 * @param distributionReservationPackage
 	 * @return
 	 */
-	List<DistributionReservationPackageExcel> exportDistributionReservationPackage(Wrapper<DistributionReservationPackageEntity> queryWrapper);
+	List<DistributionReservationPackageExcel> exportDistributionReservationPackage(Map<String, Object> distributionReservationPackage);
 
 
 	/**

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationStockarticleService.java

@@ -24,6 +24,7 @@ import com.logpm.distribution.vo.DistributionReservationStockarticleVO;
 import org.springblade.core.mp.base.BaseService;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 预约订单中间表 服务类
@@ -45,10 +46,10 @@ public interface IDistributionReservationStockarticleService extends BaseService
 	/**
 	 * 导出数据
 	 *
-	 * @param queryWrapper
+	 * @param distributionReservationStockarticle
 	 * @return
 	 */
-	List<DistributionReservationStockarticleExcel> exportDistributionReservationStockarticle(Wrapper<DistributionReservationStockarticleEntity> queryWrapper);
+	List<DistributionReservationStockarticleExcel> exportDistributionReservationStockarticle(Map<String, Object> distributionReservationStockarticle);
 	/**
 	 * 查询该客户订单自定义分页
 	 *

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationStocklistService.java

@@ -24,6 +24,7 @@ import com.logpm.distribution.vo.DistributionReservationStocklistVO;
 import org.springblade.core.mp.base.BaseService;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 预约库存中间表 服务类
@@ -45,9 +46,9 @@ public interface IDistributionReservationStocklistService extends BaseService<Di
 	/**
 	 * 导出数据
 	 *
-	 * @param queryWrapper
+	 * @param distributionReservationStocklist
 	 * @return
 	 */
-	List<DistributionReservationStocklistExcel> exportDistributionReservationStocklist(Wrapper<DistributionReservationStocklistEntity> queryWrapper);
+	List<DistributionReservationStocklistExcel> exportDistributionReservationStocklist(Map<String, Object> distributionReservationStocklist);
 
 }

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

@@ -5632,6 +5632,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					//通过订单id和预约id查询对应包件的库位信息
 					List<String> allocationStrList = distributionReservationMapper.getAllocationByStockArticleIdAndReservationId(distributionStockArticleEntity.getId(), distributionReservationEntity.getId());
 					if (!allocationStrList.isEmpty()) {
+
 						String allocationStr = StringUtils.join(allocationStrList, ",");
 						temp.put("货位", allocationStr);
 					} else {

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

@@ -16,8 +16,12 @@
  */
 package com.logpm.distribution.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
+import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.distribution.dto.DistributionReservationPackageDTO;
 import com.logpm.distribution.dto.DistributionStockArticleDTO;
 import com.logpm.distribution.entity.DistributionReservationPackageEntity;
@@ -29,12 +33,17 @@ import com.logpm.distribution.vo.*;
 import com.logpm.distribution.vo.app.DistributionAppParcelListVO;
 import com.logpm.distribution.wrapper.DistributionParcelListWrapper;
 import lombok.AllArgsConstructor;
+import org.springblade.common.constant.DictBizConstant;
 import org.springblade.common.constant.order.OrderReservationStatusConstant;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.tool.constant.BladeConstant;
+import org.springblade.system.cache.DictBizCache;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 预约包件中间表 服务实现类
@@ -47,6 +56,7 @@ import java.util.List;
 public class DistributionReservationPackageServiceImpl extends BaseServiceImpl<DistributionReservationPackageMapper, DistributionReservationPackageEntity> implements IDistributionReservationPackageService {
 
 	private IDistributionParcelListService parcelListService;
+	private IBasicdataWarehouseClient warehouseClient;
 
 
 	@Override
@@ -56,11 +66,22 @@ public class DistributionReservationPackageServiceImpl extends BaseServiceImpl<D
 
 
 	@Override
-	public List<DistributionReservationPackageExcel> exportDistributionReservationPackage(Wrapper<DistributionReservationPackageEntity> queryWrapper) {
-		List<DistributionReservationPackageExcel> distributionReservationPackageList = baseMapper.exportDistributionReservationPackage(queryWrapper);
-		//distributionReservationPackageList.forEach(distributionReservationPackage -> {
-		//	distributionReservationPackage.setTypeName(DictCache.getValue(DictEnum.YES_NO, DistributionReservationPackage.getType()));
-		//});
+	public List<DistributionReservationPackageExcel> exportDistributionReservationPackage(Map<String, Object> distributionReservationPackage) {
+		QueryWrapper<DistributionReservationPackageEntity> queryWrapper = Condition.getQueryWrapper(distributionReservationPackage, DistributionReservationPackageEntity.class);
+		queryWrapper.lambda().eq(DistributionReservationPackageEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		queryWrapper.apply("packet_bar_status in (1,3)");
+
+		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+		DistributionReservationPackageDTO reservationPackageDTO = JSONObject.parseObject(JSONObject.toJSONString(distributionReservationPackage), DistributionReservationPackageDTO.class);
+		reservationPackageDTO.setWarehouseId(myCurrentWarehouse.getId());
+		List<DistributionReservationPackageExcel> distributionReservationPackageList = baseMapper.exportDistributionReservationPackage(reservationPackageDTO);
+
+		distributionReservationPackageList.forEach(d -> {
+//			distributionReservationPackage.setTypeName(DictCache.getValue(DictEnum.YES_NO, DistributionReservationPackage.getType()));
+			d.setDeliveryType(DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE,d.getDeliveryType()));
+		});
+
+
 		return distributionReservationPackageList;
 	}
 

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

@@ -17,16 +17,22 @@
 package com.logpm.distribution.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.distribution.entity.DistributionReservationStockarticleEntity;
 import com.logpm.distribution.excel.DistributionReservationStockarticleExcel;
 import com.logpm.distribution.mapper.DistributionReservationStockarticleMapper;
 import com.logpm.distribution.service.IDistributionReservationStockarticleService;
 import com.logpm.distribution.vo.DistributionReservationStockarticleVO;
+import org.springblade.common.constant.DictBizConstant;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.tool.constant.BladeConstant;
+import org.springblade.system.cache.DictBizCache;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 预约订单中间表 服务实现类
@@ -44,11 +50,16 @@ public class DistributionReservationStockarticleServiceImpl extends BaseServiceI
 
 
 	@Override
-	public List<DistributionReservationStockarticleExcel> exportDistributionReservationStockarticle(Wrapper<DistributionReservationStockarticleEntity> queryWrapper) {
+	public List<DistributionReservationStockarticleExcel> exportDistributionReservationStockarticle(Map<String, Object> distributionReservationStockarticle) {
+
+		QueryWrapper<DistributionReservationStockarticleEntity> queryWrapper = Condition.getQueryWrapper(distributionReservationStockarticle, DistributionReservationStockarticleEntity.class);
+		queryWrapper.lambda().eq(DistributionReservationStockarticleEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		queryWrapper.apply("stock_article_status in (1,3)");
 		List<DistributionReservationStockarticleExcel> distributionReservationStockarticleList = baseMapper.exportDistributionReservationStockarticle(queryWrapper);
-		//distributionReservationStockarticleList.forEach(distributionReservationStockarticle -> {
-		//	distributionReservationStockarticle.setTypeName(DictCache.getValue(DictEnum.YES_NO, DistributionReservationStockarticle.getType()));
-		//});
+		distributionReservationStockarticleList.forEach(d  -> {
+			d.setDeliveryType(DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE,d.getDeliveryType()));
+//			distributionReservationStockarticle.setTypeName(DictCache.getValue(DictEnum.YES_NO, DistributionReservationStockarticle.getType()));
+		});
 		return distributionReservationStockarticleList;
 	}
 

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

@@ -16,17 +16,23 @@
  */
 package com.logpm.distribution.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.distribution.dto.DistributionReservationStocklistDTO;
 import com.logpm.distribution.entity.DistributionReservationStocklistEntity;
 import com.logpm.distribution.excel.DistributionReservationStocklistExcel;
 import com.logpm.distribution.mapper.DistributionReservationStocklistMapper;
 import com.logpm.distribution.service.IDistributionReservationStocklistService;
 import com.logpm.distribution.vo.DistributionReservationStocklistVO;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.tool.constant.BladeConstant;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 预约库存中间表 服务实现类
@@ -44,11 +50,17 @@ public class DistributionReservationStocklistServiceImpl extends BaseServiceImpl
 
 
 	@Override
-	public List<DistributionReservationStocklistExcel> exportDistributionReservationStocklist(Wrapper<DistributionReservationStocklistEntity> queryWrapper) {
-		List<DistributionReservationStocklistExcel> distributionReservationStocklistList = baseMapper.exportDistributionReservationStocklist(queryWrapper);
-		//distributionReservationStocklistList.forEach(distributionReservationStocklist -> {
-		//	distributionReservationStocklist.setTypeName(DictCache.getValue(DictEnum.YES_NO, DistributionReservationStocklist.getType()));
-		//});
+	public List<DistributionReservationStocklistExcel> exportDistributionReservationStocklist(Map<String, Object> distributionReservationStocklist) {
+
+		QueryWrapper<DistributionReservationStocklistEntity> queryWrapper = Condition.getQueryWrapper(distributionReservationStocklist, DistributionReservationStocklistEntity.class);
+		queryWrapper.apply("stock_list_status in (1,3)");
+		queryWrapper.lambda().eq(DistributionReservationStocklistEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		DistributionReservationStocklistDTO reservationStocklistDTO = JSONObject.parseObject(JSONObject.toJSONString(distributionReservationStocklist), DistributionReservationStocklistDTO.class);
+
+		List<DistributionReservationStocklistExcel> distributionReservationStocklistList = baseMapper.exportDistributionReservationStocklist(reservationStocklistDTO);
+		distributionReservationStocklistList.forEach(d -> {
+//			distributionReservationStocklist.setTypeName(DictCache.getValue(DictEnum.YES_NO, DistributionReservationStocklist.getType()));
+		});
 		return distributionReservationStocklistList;
 	}
 

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

@@ -33,6 +33,7 @@ import com.logpm.distribution.vo.DistributionSigndetailVO;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.DictBizConstant;
+import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.system.cache.DictBizCache;
@@ -84,6 +85,11 @@ public class DistributionSigndetailServiceImpl extends BaseServiceImpl<Distribut
 			distributionSigndetail.remove("ids");
 		}
 
+		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+		if(ObjectUtils.isNull(myCurrentWarehouse)){
+			throw new ServiceException("请选择仓库");
+		}
+
 		DistributionSigndetailDTO distributionSigndetailDTO = JSONObject.parseObject(JSON.toJSONString(distributionSigndetail), DistributionSigndetailDTO.class);
 
 		if(ObjectUtils.isNotNull(o)){
@@ -91,7 +97,7 @@ public class DistributionSigndetailServiceImpl extends BaseServiceImpl<Distribut
 			String[] split = id.split(",");
 			distributionSigndetailDTO.setIds(Arrays.asList(split));
 		}
-
+		distributionSigndetailDTO.setWarehouseId(String.valueOf(myCurrentWarehouse.getId()));
 		List<DistributionSigndetailVO> distributionSigndetailList = baseMapper.exportDistributionSigndetailOwn(distributionSigndetailDTO);
 		List<DistributionSigndetailExcel> list = new ArrayList<>();
 		distributionSigndetailList.forEach(d -> {

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

@@ -1541,13 +1541,18 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 	public IPage<DistributionStockupVO> getInventoryOwn(IPage<Object> page, Long id) {
 		IPage<DistributionStockupVO> l = new Page<>();
 		List<DistributionStockupVO> inventoryChe = baseMapper.getInventoryChe(id);
-		boolean b = inventoryChe.stream().anyMatch(i -> i.getReservationStockListNum() > 0);
-		if (b) {
-			//查询库存品
-			return baseMapper.getInventoryOwn(page, id);
-		} else {
+		if(ObjectUtils.isNotNull(inventoryChe) && ObjectUtils.isNotNull(inventoryChe.get(0))){
+			boolean b = inventoryChe.stream().anyMatch(i -> i.getReservationStockListNum() > 0);
+			if (b) {
+				//查询库存品
+				return baseMapper.getInventoryOwn(page, id);
+			} else {
+				return l;
+			}
+		}else{
 			return l;
 		}
+
 	}
 
 	@Override