1.签收详情

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSignforEntity.java

@@ -117,7 +117,7 @@ public class DistributionSignforEntity extends TenantEntity {
 	 * 商城名称
 	 */
 	@ApiModelProperty(value = "商城名称")
-	private String shoppingName;
+	private String mallName;
 	/**
 	 * 订单来源
 	 */

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

@@ -43,6 +43,22 @@ public class DistributionDeliveryInfoVO extends DistributionDeliveryInfoEntity {
 	 */
 	@ApiModelProperty(value = "仓库")
 	private String warehouse;
+	/**
+	 * 签收类型;1-签收，2-代签收
+	 */
+	@ApiModelProperty(value = "签收类型;1-签收，2-代签收")
+	private String signingType;
+	/**
+	 * 司机签收图片
+	 */
+	@ApiModelProperty(value = "司机签收图片")
+	private String deliverySignPictures;
+	/**
+	 * 文员复核图片
+	 */
+	@ApiModelProperty(value = "文员复核图片")
+	private String clerkSignPictures;
+
 	/**
 	 * 订单
 	 */

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

@@ -17,6 +17,7 @@
 package com.logpm.distribution.vo;
 
 import com.logpm.distribution.entity.DistributionReservationStockarticleEntity;
+import io.swagger.annotations.ApiModelProperty;
 import org.springblade.core.tool.node.INode;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -31,5 +32,15 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 public class DistributionReservationStockarticleVO extends DistributionReservationStockarticleEntity {
 	private static final long serialVersionUID = 1L;
+	/**
+	 * 订单自编号
+	 */
+	@ApiModelProperty(value = "订单自编号")
+	private String orderSelfNumbering;
+	/**
+	 * 运单号
+	 */
+	@ApiModelProperty(value = "运单号")
+	private String waybillNumber;
 
 }

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

@@ -37,6 +37,17 @@ public class DistributionSignforVO extends DistributionSignforEntity {
 	 */
 	@ApiModelProperty(value = "门店名称")
 	private String storeName;
+
+	/**
+	 * 配送单号
+	 */
+	@ApiModelProperty(value = "配送单号")
+	private String reservationCode;
+	/**
+	 * 预约时间
+	 */
+	@ApiModelProperty(value = "预约时间")
+	private String reservationDate;
 	/**
 	 * 装车未扫数
 	 */

blade-service/logpm-basic/src/main/java/com/logpm/basic/BasicApplication.java

@@ -3,6 +3,7 @@ package com.logpm.basic;
 
 
 import org.springblade.common.constant.ModuleNameConstant;
+import org.springblade.common.constant.TenantNum;
 import org.springblade.core.cloud.client.BladeCloudApplication;
 import org.springblade.core.launch.BladeApplication;
 

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

@@ -79,6 +79,7 @@ public class DistributionReservationStockarticleController extends BladeControll
 		return R.data(pages);
 	}
 
+
 	/**
 	 * 预约订单中间表 自定义分页
 	 */
@@ -89,6 +90,16 @@ public class DistributionReservationStockarticleController extends BladeControll
 		IPage<DistributionReservationStockarticleVO> pages = distributionReservationStockarticleService.selectDistributionReservationStockarticlePage(Condition.getPage(query), distributionReservationStockarticle);
 		return R.data(pages);
 	}
+	/**
+	 * 预约订单中间表 查询客户订单 自定义分页
+	 */
+	@GetMapping("/orderpage")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入distributionReservationStockarticle")
+	public R<IPage<DistributionReservationStockarticleVO>> orderpage(DistributionReservationStockarticleVO distributionReservationStockarticle, Query query) {
+		IPage<DistributionReservationStockarticleVO> pages = distributionReservationStockarticleService.selectDistributionReservationStockarticleorderPage(Condition.getPage(query), distributionReservationStockarticle);
+		return R.data(pages);
+	}
 
 	/**
 	 * 预约订单中间表 新增

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

@@ -76,11 +76,11 @@ public class DistributionSignforController extends BladeController {
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入distributionSignfor")
 	public R<DistributionSignforVO> detail(DistributionSignforDTO distributionSignfor) {
-		DistributionSignforEntity detail = distributionSignforService.getOne(Condition.getQueryWrapper(distributionSignfor));
+		DistributionSignforVO detail = distributionSignforService.getOneCustom(distributionSignfor.getId());
-		DistributionSignforVO distributionSignforVO = new DistributionSignforVO();
+//		DistributionSignforVO distributionSignforVO = new DistributionSignforVO();
-		BeanUtils.copyProperties(detail,distributionSignforVO);
+//		BeanUtils.copyProperties(detail,distributionSignforVO);
 		//查询预约单号及服务
-		return R.data(distributionSignforVO);
+		return R.data(detail);
 	}
 
 

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

@@ -63,12 +63,17 @@
     <select id="selectcustomList" resultType="com.logpm.distribution.vo.DistributionDeliveryInfoVO">
         SELECT
         ldr.id id,
+        lds.id deliveryId,
         ldr.consignee consignee,
+         lds.signing_type signingType,
         ldr.delivery_address deliveryAddress,
         ldr.delivery_phone deliveryPhone,
         ldr.stock_article_id orderIds,
+        lds.delivery_sign_pictures deliverySignPictures,
+        lds.clerk_sign_pictures clerkSignPictures,
         ldr.reservation_num packageNub,
         lds.loaded_number  loadedNub,
+        lds.reservation_id  reservationId,
         lds.received_quantity  receivedQuantity,
         CASE
         WHEN lds.signing_status ='1' THEN '未签收'

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

@@ -75,6 +75,7 @@
         lddl.reservation_id reservationId,
         lddl.lead_time leadTime,
         lddl.order_id orderId,
+        lddl.fee fee,
         lddl.loading_time loadingTime,
         lddl.note_number noteNumber,
         lddl.source source,

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

@@ -57,4 +57,12 @@ public interface DistributionReservationStockarticleMapper extends BaseMapper<Di
 	 * @return
 	 */
     int deleteReservationStockarticle(@Param("id")Long id);
+	/**
+	 * 查询该客户订单自定义分页
+	 *
+	 * @param page
+	 * @param distributionReservationStockarticle
+	 * @return
+	 */
+    List<DistributionReservationStockarticleVO> selectDistributionReservationStockarticleorderPage(IPage<DistributionReservationStockarticleVO> page, DistributionReservationStockarticleVO distributionReservationStockarticle);
 }

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

@@ -36,5 +36,8 @@
     <select id="exportDistributionReservationStockarticle" resultType="com.logpm.distribution.excel.DistributionReservationStockarticleExcel">
         SELECT * FROM logpm_distribution_reservation_stockarticle ${ew.customSqlSegment}
     </select>
+    <select id="selectDistributionReservationStockarticleorderPage" resultType="com.logpm.distribution.vo.DistributionReservationStockarticleVO">
+
+    </select>
 
 </mapper>

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

@@ -103,4 +103,10 @@ public interface DistributionSignforMapper extends BaseMapper<DistributionSignfo
 	Integer updateloadByReservationId(@Param("reservationId") Long reservationId,@Param("nub") Integer nub);
 
 	Integer updateloadreduceByReservationId(@Param("reservationId") Long reservationId,@Param("nub") Integer nub);
+	/**
+	 * 签收详情
+	 *
+	 * @return
+	 */
+    DistributionSignforVO selectOneCustom(@Param("id")Long id);
 }

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

@@ -253,7 +253,7 @@
         SELECT
         lds.id id,
         lds.signee_name signeeName,
-        ldr.mall_name shoppingName,
+        ldr.mall_name mallName,
         lddl.warehouse_name warehouseName,
         ldr.stock_article_id stockArticleId,
         ldr.store_name storeName,
@@ -262,6 +262,8 @@
         lds.delivery_time deliveryTime,
         lds.signing_time signingTime,
         lds.sjsigning_time sjsigningTime,
+        lds.signing_status signingStatus,
+        lds.signing_type signingType,
         lddl.train_number trainNumber,
         lds.received_quantity receivedQuantity,
         ldr.delivery_phone deliveryPhone,
@@ -285,8 +287,8 @@
         JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id
         <where>
             lds.is_deleted = 0
-            <if test="param.shoppingName != null and param.shoppingName!=''">
+            <if test="param.mallName != null and param.mallName!=''">
-                and ldr.mall_name like concat('%',#{param.shoppingName},'%')
+                and ldr.mall_name like concat('%',#{param.mallName},'%')
             </if>
             <if test="param.deliveryTime!=null and param.deliveryTime!=''">
                 and date_format(lds.delivery_time,'%y%m%d%') = date_format(#{param.deliveryTime},'%y%m%d%')
@@ -348,47 +350,45 @@
         select  COALESCE(COUNT(*), 0) from logpm_distribution_signfor
         <where>
             is_deleted = 0 and driver_signing ='1'
-            <if test="param.number != null and param.number!=''">
+            <if test="param.mallName != null and param.mallName!=''">
-                and number like concat('%',#{param.number},'%')
+                and ldr.mall_name like concat('%',#{param.mallName},'%')
-            </if>
-            <if test="param.shoppingName != null and param.shoppingName!=''">
-                and shopping_name like concat('%',#{param.shoppingName},'%')
-            </if>
-            <if test="param.signingStatus != null and param.signingStatus!=''">
-                and signing_status = #{param.signingStatus}
             </if>
             <if test="param.deliveryTime!=null and param.deliveryTime!=''">
-                and date_format(delivery_time,'%y%m%d%') = date_format(#{param.deliveryTime},'%y%m%d%')
+                and date_format(lds.delivery_time,'%y%m%d%') = date_format(#{param.deliveryTime},'%y%m%d%')
             </if>
             <if test="param.signingTime!=null and param.signingTime!=''">
-                and date_format(signing_time,'%y%m%d%') = date_format(#{param.signingTime},'%y%m%d%')
+                and date_format(lds.signing_time,'%y%m%d%') = date_format(#{param.signingTime},'%y%m%d%')
             </if>
             <if test="param.sjsigningTime!=null and param.sjsigningTime!=''">
-                and date_format(sjsigning_time,'%y%m%d%') = date_format(#{param.sjsigningTime},'%y%m%d%')
+                and date_format(lds.sjsigning_time,'%y%m%d%') = date_format(#{param.sjsigningTime},'%y%m%d%')
+            </if>
+            <if test="param.createTime_query!=null and param.createTime_query!=''">
+                and date_format(lds.create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%')
             </if>
-            <if test="param.orderId != null and param.orderId!=''">
+            <if test="param.stockArticleId != null and param.stockArticleId!=''">
-                and order_id like concat('%',#{param.orderId},'%')
+                and ldr.stock_article_id like concat('%',#{param.stockArticleId},'%')
             </if>
             <if test="param.consignee != null and param.consignee!=''">
-                and consignee like concat('%',#{param.consignee},'%')
+                and ldr.consignee like concat('%',#{param.consignee},'%')
             </if>
             <if test="param.deliveryType != null and param.deliveryType!=''">
-                and delivery_type = #{param.deliveryType}
+                and ldr.delivery_type = #{param.deliveryType}
-            </if>
-            <if test="param.orderSource != null and param.orderSource!=''">
-                and order_source = #{param.orderSource}
             </if>
             <if test="param.deliveryPhone != null and param.deliveryPhone!=''">
-                and delivery_phone = #{param.deliveryPhone}
+                and  ldr.delivery_phone like concat('%',#{param.deliveryPhone},'%')
             </if>
             <if test="param.trainNumber != null and param.trainNumber!=''">
-                and train_number like concat('%',#{param.trainNumber},'%')
+                and lddl.train_number like concat('%',#{param.trainNumber},'%')
-            </if>
-            <if test="param.deliveryDriverName != null and param.deliveryDriverName!=''">
-                and delivery_driver_name like concat('%',#{param.deliveryDriverName},'%')
             </if>
+
             <if test="param.deliveryAddress != null and param.deliveryAddress!=''">
-                and delivery_address like concat('%',#{param.deliveryAddress},'%')
+                and ldr.delivery_address like concat('%',#{param.deliveryAddress},'%')
+            </if>
+            <if test="param.driverSigning != null and param.driverSigning!=''">
+                and lds.driver_signing = #{param.driverSigning}
+            </if>
+            <if test="param.signingStatus != null and param.signingStatus!=''">
+                and lds.signing_status = #{param.signingStatus}
             </if>
         </where>
     </select>
@@ -396,47 +396,45 @@
         select  COALESCE(COUNT(*), 0) from logpm_distribution_signfor
         <where>
             is_deleted = 0 and signing_status ='1'
-            <if test="param.number != null and param.number!=''">
+            <if test="param.mallName != null and param.mallName!=''">
-                and number like concat('%',#{param.number},'%')
+                and ldr.mall_name like concat('%',#{param.mallName},'%')
-            </if>
-            <if test="param.signingStatus != null and param.signingStatus!=''">
-                and signing_status = #{param.signingStatus}
-            </if>
-            <if test="param.shoppingName != null and param.shoppingName!=''">
-                and shopping_name like concat('%',#{param.shoppingName},'%')
             </if>
             <if test="param.deliveryTime!=null and param.deliveryTime!=''">
-                and date_format(delivery_time,'%y%m%d%') = date_format(#{param.deliveryTime},'%y%m%d%')
+                and date_format(lds.delivery_time,'%y%m%d%') = date_format(#{param.deliveryTime},'%y%m%d%')
             </if>
             <if test="param.signingTime!=null and param.signingTime!=''">
-                and date_format(signing_time,'%y%m%d%') = date_format(#{param.signingTime},'%y%m%d%')
+                and date_format(lds.signing_time,'%y%m%d%') = date_format(#{param.signingTime},'%y%m%d%')
             </if>
             <if test="param.sjsigningTime!=null and param.sjsigningTime!=''">
-                and date_format(sjsigning_time,'%y%m%d%') = date_format(#{param.sjsigningTime},'%y%m%d%')
+                and date_format(lds.sjsigning_time,'%y%m%d%') = date_format(#{param.sjsigningTime},'%y%m%d%')
             </if>
-            <if test="param.orderId != null and param.orderId!=''">
+            <if test="param.createTime_query!=null and param.createTime_query!=''">
-                and order_id like concat('%',#{param.orderId},'%')
+                and date_format(lds.create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%')
+            </if>
+            <if test="param.stockArticleId != null and param.stockArticleId!=''">
+                and ldr.stock_article_id like concat('%',#{param.stockArticleId},'%')
             </if>
             <if test="param.consignee != null and param.consignee!=''">
-                and consignee like concat('%',#{param.consignee},'%')
+                and ldr.consignee like concat('%',#{param.consignee},'%')
             </if>
             <if test="param.deliveryType != null and param.deliveryType!=''">
-                and delivery_type = #{param.deliveryType}
+                and ldr.delivery_type = #{param.deliveryType}
-            </if>
-            <if test="param.orderSource != null and param.orderSource!=''">
-                and order_source = #{param.orderSource}
             </if>
             <if test="param.deliveryPhone != null and param.deliveryPhone!=''">
-                and delivery_phone = #{param.deliveryPhone}
+                and  ldr.delivery_phone like concat('%',#{param.deliveryPhone},'%')
             </if>
             <if test="param.trainNumber != null and param.trainNumber!=''">
-                and train_number like concat('%',#{param.trainNumber},'%')
+                and lddl.train_number like concat('%',#{param.trainNumber},'%')
-            </if>
-            <if test="param.deliveryDriverName != null and param.deliveryDriverName!=''">
-                and delivery_driver_name like concat('%',#{param.deliveryDriverName},'%')
             </if>
+
             <if test="param.deliveryAddress != null and param.deliveryAddress!=''">
-                and delivery_address like concat('%',#{param.deliveryAddress},'%')
+                and ldr.delivery_address like concat('%',#{param.deliveryAddress},'%')
+            </if>
+            <if test="param.driverSigning != null and param.driverSigning!=''">
+                and lds.driver_signing = #{param.driverSigning}
+            </if>
+            <if test="param.signingStatus != null and param.signingStatus!=''">
+                and lds.signing_status = #{param.signingStatus}
             </if>
         </where>
     </select>
@@ -447,5 +445,34 @@
         </where>
             order by create_time desc  limit 1
     </select>
+    <select id="selectOneCustom" resultType="com.logpm.distribution.vo.DistributionSignforVO">
+        SELECT
+            CASE
+
+                WHEN
+                    lds.driver_signing = '2' THEN
+                    '司机签收'
+                WHEN lds.signing_status = '2' THEN
+                    '文员签收' ELSE '待签收'
+                END signingStatusAll,
+            ldr.reservation_code reservationCode,
+            ldr.mall_name mallName,
+            ldr.consignee consignee,
+            ldr.delivery_address deliveryAddress,
+            ldr.delivery_phone deliveryPhone,
+            ldr.reservation_date reservationDate,
+            CASE
+
+                WHEN ldr.delivery_type = '1' THEN
+                    '商配'
+                WHEN ldr.delivery_type = '2' THEN
+                    '市配'
+                END deliveryType
+        FROM
+            logpm_distribution_signfor lds
+                JOIN logpm_distribution_delivery_list lddl ON lddl.id = lds.delivery_id
+                JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id
+        where lds.is_deleted = 0 and lds.id = #{id}
+    </select>
 
 </mapper>

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

@@ -48,5 +48,12 @@ public interface IDistributionReservationStockarticleService extends BaseService
 	 * @return
 	 */
 	List<DistributionReservationStockarticleExcel> exportDistributionReservationStockarticle(Wrapper<DistributionReservationStockarticleEntity> queryWrapper);
-
+	/**
+	 * 查询该客户订单自定义分页
+	 *
+	 * @param page
+	 * @param distributionReservationStockarticle
+	 * @return
+	 */
+	IPage<DistributionReservationStockarticleVO> selectDistributionReservationStockarticleorderPage(IPage<DistributionReservationStockarticleVO> page, DistributionReservationStockarticleVO distributionReservationStockarticle);
 }

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

@@ -70,4 +70,8 @@ public interface IDistributionSignforService extends BaseService<DistributionSig
 	 * 签收管理  用户签收
 	 */
     R signfor(DistrilbutionAppsignforDTO distrilbutionloadingscanDTO);
+	/**
+	 * 签收管理  详情
+	 */
+	DistributionSignforVO getOneCustom(Long id);
 }

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

@@ -108,8 +108,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		//转移数据到VO上
 		Func.copy(detail, distributionDeliveryListVO);
 		//查询包条数据
-		List<DistributionDeliveryInfoVO> stripList = distributionDeliveryInfoMapper.selectStripList(detail.getId());
+		//List<DistributionDeliveryInfoVO> stripList = distributionDeliveryInfoMapper.selectStripList(detail.getId());
-		distributionDeliveryListVO.setPackadeList(stripList);
+		//distributionDeliveryListVO.setPackadeList(stripList);
 		if (detail.getSource() == 1) {
 			//查询客户信息
 			List<DistributionDeliveryInfoVO> customList = distributionDeliveryInfoMapper.selectcustomList(detail.getId());

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

@@ -51,4 +51,9 @@ public class DistributionReservationStockarticleServiceImpl extends BaseServiceI
 		return distributionReservationStockarticleList;
 	}
 
+	@Override
+	public IPage<DistributionReservationStockarticleVO> selectDistributionReservationStockarticleorderPage(IPage<DistributionReservationStockarticleVO> page, DistributionReservationStockarticleVO distributionReservationStockarticle) {
+		return page.setRecords(baseMapper.selectDistributionReservationStockarticleorderPage(page, distributionReservationStockarticle));
+	}
+
 }

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

@@ -128,5 +128,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		return R.status(b);
 	}
 
+	@Override
+	public DistributionSignforVO getOneCustom(Long id) {
+		return baseMapper.selectOneCustom(id);
+	}
+
 
 }

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

@@ -167,8 +167,13 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 						result = distributionAddvalueService.save(addvalueEntity);
 					}
 					//TODO 这里就应该对累加的增值服务费用和配送单本身费用进行累加并完成数据修改
+					if (relatedId==2){
+						distributionDeliveryListEntity.setFee(sum);
+						result = SqlHelper.retBool(distributionDeliveryListMapper.updateById(distributionDeliveryListEntity));
+					}else {
 						distributionStockArticleEntity.setFee(sum);
 					result = SqlHelper.retBool(this.getBaseMapper().updateById(distributionStockArticleEntity));
+					}
 					if (!result){
 						log.error("sql执行结果:+{"+result+"}");
 						return R.fail("服务器正忙，请稍后再试!!!");