修改备货查询

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java

@@ -21,6 +21,8 @@ import org.springblade.core.tool.node.INode;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
  * 在库订单包件清单 视图实体类
  *
@@ -32,4 +34,10 @@ import lombok.EqualsAndHashCode;
 public class DistributionParcelListVO extends DistributionParcelListEntity {
 	private static final long serialVersionUID = 1L;
 
+	private String stockupStatus;
+	private Date stockupDate;
+	private String stockupArea;
+	private String goodsAllocation;
+
+
 }

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java

@@ -61,4 +61,12 @@ public class DistributionStockupVO extends DistributionStockupEntity {
 	private String deliveryPhone;
 	private String mallName;
 	private String stockArticleId;
+	private String orderSelfNumbering; //订单自编号
+	private String descriptionGoods;
+	private String reservationNum;
+	private Date stockupDate;
+	private Integer number;
+	private String goodsAllocation; //货位
+	private Integer reservationStockListNum; //数量
+	private String reservationId; //预约ID
 }

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

@@ -79,6 +79,18 @@ public class DistributionParcelListController extends BladeController {
 		return R.data(pages);
 	}
 
+	/**
+	 * 在库订单包件清单 分页
+	 */
+	@GetMapping("/parcelListOwn")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入distributionParcelList")
+	public R<IPage<DistributionParcelListEntity>> getParcelListOwn(@ApiIgnore @RequestParam Map<String, Object> distributionParcelList, Query query) {
+
+		IPage<DistributionParcelListEntity> pages = distributionParcelListService.getParcelListOwn(Condition.getPage(query), distributionParcelList);
+		return R.data(pages);
+	}
+
 	/**
 	 * 在库订单包件清单 自定义分页
 	 */

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

@@ -84,10 +84,33 @@ public class DistributionStockupController extends BladeController {
 	 */
 	@GetMapping("/detailReservationOwn")
 	@ApiOperation(value = "详情", notes = "传入distributionStockup")
-	public R<IPage<DistributionStockupVO>> detailReservationOwn(Query query,DistributionStockupEntity distributionStockup) {
-		IPage<DistributionStockupVO> detail = distributionStockupService.detailReservationOwn(Condition.getPage(query),distributionStockup.getId());
+	public R<IPage<DistributionStockupVO>> detailReservationOwn(@ApiIgnore @RequestParam Map<String, Object> distributionStockup, Query query) {
+		Object o = distributionStockup.get("id");
+		IPage<DistributionStockupVO> detail = distributionStockupService.detailReservationOwn(Condition.getPage(query),Long.parseLong((String) o));
 		return R.data(detail);
 	}
+
+	/**
+	 * 备货信息表 库存品信息 详情
+	 */
+	@GetMapping("/inventoryOwn")
+	@ApiOperation(value = "详情", notes = "传入distributionStockup")
+	public R<IPage<DistributionStockupVO>> getInventoryOwn(@ApiIgnore @RequestParam Map<String, Object> distributionStockup, Query query) {
+		Object o = distributionStockup.get("id");
+		IPage<DistributionStockupVO> detail = distributionStockupService.getInventoryOwn(Condition.getPage(query),Long.parseLong((String) o));
+		return R.data(detail);
+	}
+	/**
+	 * 备货信息表 订单信息 详情
+	 */
+	@GetMapping("/detailOrderOwn")
+	@ApiOperation(value = "详情", notes = "传入distributionStockup")
+	public R<IPage<DistributionStockupVO>> detailOrderOwn(@ApiIgnore @RequestParam Map<String, Object> distributionStockup, Query query) {
+		Object o = distributionStockup.get("id");
+		IPage<DistributionStockupVO> detail = distributionStockupService.detailOrderOwn(Condition.getPage(query),Long.parseLong((String) o));
+		return R.data(detail);
+	}
+
 	/**
 	 * 备货信息表 分页
 	 */

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

@@ -59,4 +59,6 @@ public interface DistributionParcelListMapper extends BaseMapper<DistributionPar
     List<String> selectWarehouseAreaByReservationId(@Param("reservationId") Long reservationId);
 
 	List<String> selectPalletByReservationId(@Param("reservationId") Long reservationId);
+
+    IPage<DistributionParcelListEntity> getParcelListOwn(IPage<Object> page,@Param("id") Long id);
 }

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

@@ -86,5 +86,18 @@
           and ldr.is_deleted = 0
         group by ldpl.pallet
     </select>
+    <select id="getParcelListOwn" resultType="com.logpm.distribution.vo.DistributionParcelListVO">
+        select DISTINCT  ldpl.id, ldpl.packet_bar_code packetBarCode, ldpl.firsts ,ldpl.second ,ldpl.third_product thirdProduct,ldpl.material_name materialName,
+                        lds.stockup_status stockupStatus,lds.stockup_date stockupDate,
+                        lds.stockup_area stockupArea,ldpl.goods_allocation goodsAllocation,ldpl.pallet
+        from logpm_distribution_parcel_list ldpl
+                 LEFT JOIN  logpm_distribution_stock_article ldsa on ldsa.id = ldpl.stock_article_id
+                 LEFT JOIN  logpm_distribution_reservation_stockarticle ldrs  on ldrs.stock_article_id = ldsa.id
+                 LEFT JOIN  logpm_distribution_stockup_info ldsi on ldsi.reservation_id = ldrs.reservation_id
+                 LEFT JOIN logpm_distribution_stockup lds on lds.id = ldsi.stockup_id
+        <where>
+            lds.id =#{id}
+        </where>
+    </select>
 
 </mapper>

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

@@ -62,7 +62,29 @@ public interface DistributionStockupMapper extends BaseMapper<DistributionStocku
 
 	Integer getAllStockNum(@Param("reservationId") Long reservationId);
 
+	/**
+	 * 查询备货信息
+	 * @param id
+	 * @return
+	 */
     DistributionStockupVO getOneOwn(@Param("id")Long id);
 
+	/**
+	 * 查询预约单记录
+	 * @param page
+	 * @param id
+	 * @return
+	 */
 	IPage<DistributionStockupVO> detailReservationOwn(IPage<Object> page,@Param("id") Long id);
+
+	/**
+	 * 查询预约订单
+	 * @param page
+	 * @param id
+	 * @return
+	 */
+	IPage<DistributionStockupVO> detailOrderOwn(IPage<Object> page,@Param("id") Long id);
+
+	IPage<DistributionStockupVO> getInventoryOwn(IPage<Object> page,@Param("id") Long id);
+	List<DistributionStockupVO> getInventoryChe(@Param("id") Long id);
 }

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

@@ -98,7 +98,7 @@
     </select>
 
     <select id="getOneOwn" resultType="com.logpm.distribution.vo.DistributionStockupVO">
-        select ldr.id,ds.stockup_code stockupCode,ds.stockup_user stockupUser,ds.stockup_status stockupStatus,ldr.reservation_date reservationDate,ldr.serve_type serveType,ldr.delivery_way deliveryWay,
+        select DISTINCT ds.stockup_code stockupCode,ds.stockup_user stockupUser,ds.stockup_status stockupStatus,ldr.reservation_date reservationDate,ldr.serve_type serveType,ldr.delivery_way deliveryWay,
             ldr.delivery_type deliveryType , lds.train_number trainNumber ,ds.stockup_area stockupArea
         from logpm_distribution_reservation ldr
                  LEFT JOIN logpm_distribution_stockup_info dsi on ldr.id = dsi.reservation_id
@@ -114,7 +114,7 @@
         </where>
     </select>
     <select id="detailReservationOwn" resultType="com.logpm.distribution.vo.DistributionStockupVO">
-        select ldr.id,ldr.consignee ,ldr.delivery_address deliveryAddress,ldr.delivery_phone deliveryPhone,ldr.mall_name mallName,
+        select DISTINCT ldr.consignee ,ldr.delivery_address deliveryAddress,ldr.delivery_phone deliveryPhone,ldr.mall_name mallName,
                ldr.stock_article_id stockArticleId,ldr.stockup_status stockupStatus
         from logpm_distribution_reservation ldr
                  LEFT JOIN logpm_distribution_stockup_info ldsi on ldr.id = ldsi.reservation_id
@@ -125,6 +125,58 @@
         </where>
     </select>
 
+    <select id="detailOrderOwn" resultType="com.logpm.distribution.vo.DistributionStockupVO">
+        select ldsa.order_self_numbering orderSelfNumbering,ldsa.description_goods descriptionGoods,ldrs.reservation_num reservationNum,
+               lds.stockup_status stockupStatus,lds.stockup_date stockupDate,lds.stockup_area stockupArea,(
+                   select count(1)
+                   from logpm_distribution_stock ds
+                   WHERE ds.stock_article in (
+                       select DISTINCT dpl.id
+                       from logpm_distribution_parcel_list dpl
+                       where  dpl.stock_article_id = ldrs.stock_article_id
+                   )
+               )  number ,
+            (select GROUP_CONCAT(NULLIF(dpl.goods_allocation,'') SEPARATOR ', ')
+              from logpm_distribution_parcel_list dpl
+              where  dpl.stock_article_id = ldrs.stock_article_id)  goodsAllocation
+        from  logpm_distribution_stockup_info ldsi
+                  LEFT JOIN  logpm_distribution_reservation_stockarticle ldrs  on ldrs.reservation_id = ldsi.reservation_id
+                  LEFT JOIN  logpm_distribution_stock_article ldsa on ldsa.id = ldrs.stock_article_id
+                  LEFT JOIN  logpm_distribution_stockup lds on lds.id = ldsi.stockup_id
+        <where>
+            ldsi.stockup_id = #{ id }
+        </where>
+
+    </select>
+
+    <select id="getInventoryOwn" resultType="com.logpm.distribution.vo.DistributionStockupVO">
+        select DISTINCT ldsii.sku ,ldsii.order_self_numbering orderSelfNumbering,ldsii.description_goods descriptionGoods,ldsii.cargo_unit cargoUnit,
+               ldrsi.reservation_num reservationNum,ldpl.pallet ,lds.stockup_area stockupArea,
+               lds.stockup_status stockupStatus,lds.stockup_date stockupDate,ldpl.goods_allocation goodsAllocation
+
+        from logpm_distribution_stockup_info ldsi
+
+                 LEFT JOIN logpm_distribution_reservation_stockarticle ldrs on ldsi.reservation_id = ldrs.reservation_id
+                 LEFT JOIN logpm_distribution_reservation_stocklist ldrsi on ldrsi.reservation_id = ldrs.reservation_id
+                 LEFT JOIN logpm_distribution_stockup lds on lds.id = ldsi.stockup_id
+                 LEFT JOIN logpm_distribution_stock_list ldsii on ldsii.id = ldrsi.stocklist_id
+                 LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.id = ldsii.parcel_list_id
+        <where>
+            ldsi.stockup_id =#{id}
+        </where>
+
+    </select>
+
+    <select id="getInventoryChe" resultType="com.logpm.distribution.vo.DistributionStockupVO">
+        select ldr.reservation_stock_list_num,ldrs.reservation_id reservationId
+        from logpm_distribution_stockup_info ldsi
+                 LEFT JOIN logpm_distribution_reservation ldr on ldsi.reservation_id = ldr.id
+                 LEFT JOIN logpm_distribution_reservation_stockarticle ldrs on ldsi.reservation_id = ldrs.reservation_id
+        <where>
+            ldsi.stockup_id =#{id}
+        </where>
+    </select>
+
 
 
 </mapper>

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

@@ -24,6 +24,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.distribution.vo.PackageStockupVO;
 import org.springblade.core.mp.base.BaseService;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 在库订单包件清单 服务类
@@ -58,4 +59,11 @@ public interface IDistributionParcelListService extends BaseService<Distribution
 
 	List<String> selectPalletByReservationId(Long reservationId);
 
+	/**
+	 * 查询备货包件信息
+	 * @param page
+	 * @param distributionParcelList
+	 * @return
+	 */
+    IPage<DistributionParcelListEntity> getParcelListOwn(IPage<Object> page, Map<String, Object> distributionParcelList);
 }

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

@@ -81,4 +81,20 @@ public interface IDistributionStockupService extends BaseService<DistributionSto
 	IPage<DistributionStockupVO> detailReservationOwn(IPage<Object> page,Long id);
 
 	DistributionStockupStockListInfoVO selectStockListInfo(Long reservationId, String descriptionGoods, String allocation, String pallet, String sku, String cargoNorms, String cargoUnit);
+
+	/**
+	 * 订单详细
+	 * @param page
+	 * @param id
+	 * @return
+	 */
+	IPage<DistributionStockupVO> detailOrderOwn(IPage<Object> page, Long id);
+
+	/**
+	 * 库存品信息详细
+	 * @param page
+	 * @param parseLong
+	 * @return
+	 */
+	IPage<DistributionStockupVO> getInventoryOwn(IPage<Object> page, Long id);
 }

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

@@ -28,6 +28,7 @@ import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 在库订单包件清单 服务实现类
@@ -78,4 +79,16 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 		return baseMapper.selectPalletByReservationId(reservationId);
 	}
 
+	/**
+	 * 查询备货包件信息
+	 * @param page
+	 * @param distributionParcelList
+	 * @return
+	 */
+	@Override
+	public IPage<DistributionParcelListEntity> getParcelListOwn(IPage<Object> page, Map<String, Object> distributionParcelList) {
+		Object o = distributionParcelList.get("id");
+		return baseMapper.getParcelListOwn(page, Long.parseLong((String) o) );
+	}
+
 }

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

@@ -345,6 +345,30 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		return baseMapper.getOneOwn(id);
 	}
 
+	@Override
+	public IPage<DistributionStockupVO> detailOrderOwn(IPage<Object> page, Long id) {
+		return baseMapper.detailOrderOwn(page,id);
+	}
+
+	/**
+	 * 查询库存品详细
+	 * @param page
+	 * @param id
+	 * @return
+	 */
+	@Override
+	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{
+			return l;
+		}
+	}
+
 	/**
 	 * 查询预约信息
 	 *