Merge remote-tracking branch 'origin/dev' into dev

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

@@ -8,7 +8,7 @@ public interface ModuleNameConstant {
 	/**
 	 * 如果不需要 ""
 	 */
-	public static final String DEVAUTH ="";
+	public static final String DEVAUTH ="-cyz";
 
 
 	/**

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

@@ -21,6 +21,8 @@ import org.springblade.core.tool.node.INode;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
  * 备货信息表 视图实体类
  *
@@ -35,5 +37,28 @@ public class DistributionStockupVO extends DistributionStockupEntity {
 	private String headline;
 
 	private String groupName;
+	//备货编码
+	private String stockupCode;
+	//备货人
+	private String stockupUser;
+	//备货状态
+	private String stockupStatus;
+	//预约时间
+	private Date reservationDate;
+	//服务类型
+	private String serveType;
+	//配送方式
+	private String deliveryWay;
+	//配送类型
+	private String deliveryType;
+	//配送车次号
+	private String trainNumber;
+	//备货区名称
+	private String stockupArea;
 
+	private String consignee;
+	private String deliveryAddress;
+	private String deliveryPhone;
+	private String mallName;
+	private String stockArticleId;
 }

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

@@ -69,6 +69,25 @@ public class DistributionStockupController extends BladeController {
 		DistributionStockupEntity detail = distributionStockupService.getOne(Condition.getQueryWrapper(distributionStockup));
 		return R.data(detail);
 	}
+	/**
+	 * 备货信息表 详情
+	 */
+	@GetMapping("/detailOwn")
+	@ApiOperation(value = "详情", notes = "传入distributionStockup")
+	public R<DistributionStockupVO> detailOwn(DistributionStockupEntity distributionStockup) {
+		DistributionStockupVO detail = distributionStockupService.getOneOwn(distributionStockup.getId());
+		return R.data(detail);
+	}
+
+	/**
+	 * 备货信息表 预约信息 详情
+	 */
+	@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());
+		return R.data(detail);
+	}
 	/**
 	 * 备货信息表 分页
 	 */

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

@@ -61,4 +61,8 @@ public interface DistributionStockupMapper extends BaseMapper<DistributionStocku
     Integer getAllPackageNum(@Param("reservationId") Long reservationId);
 
 	Integer getAllStockNum(@Param("reservationId") Long reservationId);
+
+    DistributionStockupVO getOneOwn(@Param("id")Long id);
+
+	IPage<DistributionStockupVO> detailReservationOwn(IPage<Object> page,@Param("id") Long id);
 }

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

@@ -106,5 +106,34 @@
         where ldrs.reservation_id = #{reservationId}
     </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,
+            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
+                 LEFT JOIN logpm_distribution_stockup ds  on dsi.stockup_id = ds.id
+                 LEFT JOIN logpm_distribution_signfor lds on lds.reservation_id = ldr.id
+        <where> ldr.id in (
+            select DISTINCT ldsi.reservation_id
+            from logpm_distribution_stockup_info ldsi
+            where ldsi.stockup_id  in (select lds.id
+                                       from logpm_distribution_stockup lds )
+        )
+            and ds.id  = #{id}
+        </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,
+               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
+        <where>
+         ldr.id in (select  reservation_id
+                         from logpm_distribution_stockup_info )
+          and ldsi.stockup_id = #{id}
+        </where>
+    </select>
+
+
 
 </mapper>

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

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.distribution.dto.DistributionDeliveryAllocationDTO;
 import com.logpm.distribution.dto.DistributionReservationDTO;
 import com.logpm.distribution.entity.DistributionReservationEntity;
+import com.logpm.distribution.entity.DistributionStockupEntity;
 import com.logpm.distribution.excel.DistributionReservationExcel;
 import com.logpm.distribution.vo.DistributionReservationVO;
 import com.logpm.distribution.vo.DistributionStockupOrderListVO;

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

@@ -64,4 +64,19 @@ public interface IDistributionStockupService extends BaseService<DistributionSto
 
 	DistributionStockupOrderInfoVO selectOrderInfo(Long reservationId, Long stockArticleId, String allocation, String pallet);
 
+	/**
+	 * 备货基础信息
+	 * @param id
+	 * @return
+	 */
+    DistributionStockupVO getOneOwn(Long id);
+
+	/**
+	 * 查询预约信息
+	 *
+	 * @param page
+	 * @param id
+	 * @return
+	 */
+	IPage<DistributionStockupVO> detailReservationOwn(IPage<Object> page,Long id);
 }

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

@@ -258,5 +258,27 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		return vo;
 	}
 
+	/**
+	 * 查询备货信息
+	 * @param id
+	 * @return
+	 */
+	@Override
+	public DistributionStockupVO getOneOwn(Long id) {
+		return baseMapper.getOneOwn(id);
+	}
+
+	/**
+	 * 查询预约信息
+	 *
+	 * @param page
+	 * @param id
+	 * @return
+	 */
+	@Override
+	public IPage<DistributionStockupVO> detailReservationOwn(IPage page, Long id) {
+		return baseMapper.detailReservationOwn(page,id);
+	}
+
 
 }