1.发车查看

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

@@ -25,37 +25,47 @@ import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
 
 /**
- * 配送预约中间表 实体类
+ * 配送装车中间表 实体类
  *
  * @author TJJ
  * @since 2023-06-16
  */
 @Data
 @TableName("logpm_distribution_delivery_info")
-@ApiModel(value = "DistributionDeliveryInfo对象", description = "配送预约中间表")
+@ApiModel(value = "DistributionDeliveryInfo对象", description = "配送装车中间表")
 @EqualsAndHashCode(callSuper = true)
 public class DistributionDeliveryInfoEntity extends TenantEntity {
 
 	/**
-	 * 预约编号
+	 * 客户表Id
 	 */
-	@ApiModelProperty(value = "预约编号")
-	private String reservationId;
+	@ApiModelProperty(value = "客户表Id")
+	private Long reservationId;
 	/**
-	 * 配送单编号
+	 * 配送表id
 	 */
-	@ApiModelProperty(value = "配送单编号")
+	@ApiModelProperty(value = "配送表id")
 	private String deliveryId;
 	/**
-	 * 预留1
+	 * 包条表id
 	 */
-	@ApiModelProperty(value = "预留1")
-	private String reserve1;
+	@ApiModelProperty(value = "包条表id")
+	private String packageId;
 	/**
-	 * 预留2
+	 * 订单表id
 	 */
-	@ApiModelProperty(value = "预留2")
-	private String reserve2;
+	@ApiModelProperty(value = "订单表id")
+	private String orderId;
+	/**
+	 * 装车状态(1-未装车,2-已装车)
+	 */
+	@ApiModelProperty(value = "装车状态(1-未装车,2-已装车)")
+	private String loadedState;
+	/**
+	 * 装车数量
+	 */
+	@ApiModelProperty(value = "装车数量")
+	private Integer loadedNub;
 	/**
 	 * 预留3
 	 */

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

@@ -139,10 +139,15 @@ public class DistributionDeliveryListEntity extends TenantEntity {
 	@ApiModelProperty(value = "装卸班组")
 	private String loadingTeam;
 	/**
-	 * 预约表id
+	 * 预约表id（客户）
 	 */
-	@ApiModelProperty(value = "预约表id")
+	@ApiModelProperty(value = "预约表id(客户)")
 	private String reservationId;
+	/**
+	 * 关联订单id
+	 */
+	@ApiModelProperty(value = "关联订单id")
+	private String orderId;
 	/**
 	 * 备货时间
 	 */

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

@@ -149,5 +149,11 @@ public class DistributionSigndetailEntity extends TenantEntity {
 	@ApiModelProperty(value = "品牌")
 	private String brand;
 
+	/**
+	 * 是否签收
+	 */
+	@ApiModelProperty(value = "是否签收")
+	private String isSignfor;
+
 
 }

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryChargeClient.java

@@ -16,6 +16,7 @@
  */
 package com.logpm.distribution.feign;
 
+import org.springblade.common.constant.ModuleNameConstant;
 import org.springblade.core.mp.support.BladePage;
 import com.logpm.distribution.entity.DistributionDeliveryChargeEntity;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -29,11 +30,11 @@ import org.springframework.web.bind.annotation.RequestParam;
  * @since 2023-06-14
  */
 @FeignClient(
-    value = "blade-distributionDeliveryCharge"
+	value = ModuleNameConstant.APPLICATION_DISTRIBUTION_NAME
 )
 public interface IDistributionDeliveryChargeClient {
 
-    String API_PREFIX = "/client";
+    String API_PREFIX = "DeliveryCharge/client";
     String TOP = API_PREFIX + "/top12312";
 
     /**

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryInfoClient.java

@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
 /**
- * 配送预约中间表 Feign接口类
+ * 配送装车中间表 Feign接口类
  *
  * @author TJJ
  * @since 2023-06-16
@@ -37,7 +37,7 @@ public interface IDistributionDeliveryInfoClient {
     String TOP = API_PREFIX + "/top";
 
     /**
-     * 获取配送预约中间表列表
+     * 获取配送装车中间表
      *
      * @param current   页号
      * @param size      页数

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

@@ -22,7 +22,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 配送预约中间表 视图实体类
+ * 配送装车中间表 视图实体类
  *
  * @author TJJ
  * @since 2023-06-16

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

@@ -0,0 +1,39 @@
+package com.logpm.distribution.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 车次统计
+ *
+ * @author lmy
+ * @since 2023-06-19
+ */
+@Data
+public class DistributionSignforsnmbVO {
+
+	/**
+	 * 客户总数
+	 */
+	@ApiModelProperty(value = "客户总数")
+	private Integer customNub;
+
+	/**
+	 * 订单总数
+	 */
+	@ApiModelProperty(value = "订单总数")
+	private Integer ordersNub;
+
+	/**
+	 * 已签收总数
+	 */
+	@ApiModelProperty(value = "已签收总数")
+	private Integer signedNub;
+	/**
+	 * 未签收总数
+	 */
+	@ApiModelProperty(value = "未签收总数")
+	private Integer unsignedNub;
+
+
+}

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

@@ -45,21 +45,21 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 /**
- * 配送预约中间表 控制器
+ * 配送装车中间表 控制器
  *
  * @author TJJ
  * @since 2023-06-16
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping("deliveryInfo/distributionDeliveryInfo")
-@Api(value = "配送预约中间表", tags = "配送预约中间表接口")
+@RequestMapping("/deliveryInfo")
+@Api(value = "配送装车中间表", tags = "配送装车中间表接口")
 public class DistributionDeliveryInfoController extends BladeController {
 
 	private final IDistributionDeliveryInfoService distributionDeliveryInfoService;
 
 	/**
-	 * 配送预约中间表 详情
+	 * 配送装车中间表 详情
 	 */
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
@@ -69,7 +69,7 @@ public class DistributionDeliveryInfoController extends BladeController {
 		return R.data(detail);
 	}
 	/**
-	 * 配送预约中间表 分页
+	 * 配送装车中间表 分页
 	 */
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
@@ -80,7 +80,7 @@ public class DistributionDeliveryInfoController extends BladeController {
 	}
 
 	/**
-	 * 配送预约中间表 自定义分页
+	 * 配送装车中间表 自定义分页
 	 */
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
@@ -91,7 +91,7 @@ public class DistributionDeliveryInfoController extends BladeController {
 	}
 
 	/**
-	 * 配送预约中间表 新增
+	 * 配送装车中间表 新增
 	 */
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
@@ -101,7 +101,7 @@ public class DistributionDeliveryInfoController extends BladeController {
 	}
 
 	/**
-	 * 配送预约中间表 修改
+	 * 配送装车中间表 修改
 	 */
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
@@ -111,7 +111,7 @@ public class DistributionDeliveryInfoController extends BladeController {
 	}
 
 	/**
-	 * 配送预约中间表 新增或修改
+	 * 配送装车中间表 新增或修改
 	 */
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
@@ -121,7 +121,7 @@ public class DistributionDeliveryInfoController extends BladeController {
 	}
 
 	/**
-	 * 配送预约中间表 删除
+	 * 配送装车中间表 删除
 	 */
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
@@ -144,7 +144,7 @@ public class DistributionDeliveryInfoController extends BladeController {
 		//}
 		queryWrapper.lambda().eq(DistributionDeliveryInfoEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
 		List<DistributionDeliveryInfoExcel> list = distributionDeliveryInfoService.exportDistributionDeliveryInfo(queryWrapper);
-		ExcelUtil.export(response, "配送预约中间表数据" + DateUtil.time(), "配送预约中间表数据表", list, DistributionDeliveryInfoExcel.class);
+		ExcelUtil.export(response, "配送装车中间表数据" + DateUtil.time(), "配送装车中间表数据表", list, DistributionDeliveryInfoExcel.class);
 	}
 
 }

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

@@ -97,6 +97,17 @@ public class DistributionDeliveryListController extends BladeController {
 		return R.data(distributionstatisticsnmbVO);
 	}
 
+	/**
+	 * 配送管理 点击发车
+	 */
+	@GetMapping("/start")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入distributionDeliveryList")
+	public R<Integer> start(DistributionDeliveryListDTO distributionDeliveryList) {
+		Integer i	= distributionDeliveryListService.start(distributionDeliveryList);
+		return R.data(i);
+	}
+
 	/**
 	 * 配送管理 自定义分页
 	 */

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

@@ -18,6 +18,8 @@ package com.logpm.distribution.controller;
 
 import com.logpm.distribution.dto.DistributionSignforDTO;
 import com.logpm.distribution.service.IDistributionReservationService;
+import com.logpm.distribution.vo.DistributionSignforsnmbVO;
+import com.logpm.distribution.vo.DistributionstatisticsnmbVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -79,6 +81,18 @@ public class DistributionSignforController extends BladeController {
 
 		return R.data(distributionSignforVO);
 	}
+
+	/**
+	 * 签收管理 签收订单统计
+	 */
+	@GetMapping("/statistics")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入distributionSignfor")
+	public R<DistributionSignforsnmbVO> statistics(DistributionSignforDTO distributionSignfor) {
+		DistributionSignforsnmbVO distributionSignforsnmbVO	= distributionSignforService.getNubTotal(distributionSignfor);
+		return R.data(distributionSignforsnmbVO);
+	}
+
 	/**
 	 * 签收管理 分页
 	 */

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

@@ -21,7 +21,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 配送预约中间表 数据传输对象实体类
+ * 配送装车中间表 数据传输对象实体类
  *
  * @author TJJ
  * @since 2023-06-16

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

@@ -17,6 +17,7 @@
 package com.logpm.distribution.dto;
 
 import com.logpm.distribution.entity.DistributionSignforEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -30,5 +31,9 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 public class DistributionSignforDTO extends DistributionSignforEntity {
 	private static final long serialVersionUID = 1L;
-
+	/**
+	 * 查询创建时间
+	 */
+	@ApiModelProperty(value = "查询创建时间")
+	private String createTime_query;
 }

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

@@ -28,7 +28,7 @@ import java.io.Serializable;
 
 
 /**
- * 配送预约中间表 Excel实体类
+ * 配送装车中间表 Excel实体类
  *
  * @author TJJ
  * @since 2023-06-16

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionDeliveryInfoClient.java

@@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
 /**
- * 配送预约中间表 Feign实现类
+ * 配送装车中间表 Feign实现类
  *
  * @author TJJ
  * @since 2023-06-16

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

@@ -26,7 +26,7 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 /**
- * 配送预约中间表 Mapper 接口
+ * 配送装车中间表 Mapper 接口
  *
  * @author TJJ
  * @since 2023-06-16

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

@@ -16,6 +16,7 @@
  */
 package com.logpm.distribution.mapper;
 
+import com.logpm.distribution.dto.DistributionSignforDTO;
 import com.logpm.distribution.entity.DistributionSignforEntity;
 import com.logpm.distribution.vo.DistributionSignforVO;
 import com.logpm.distribution.excel.DistributionSignforExcel;
@@ -50,5 +51,32 @@ public interface DistributionSignforMapper extends BaseMapper<DistributionSignfo
 	 * @return
 	 */
 	List<DistributionSignforExcel> exportDistributionSignfor(@Param("ew") Wrapper<DistributionSignforEntity> queryWrapper);
-
+	/**
+	 * 订单总数
+	 *
+	 * @param distributionSignfor
+	 * @return
+	 */
+    Integer selectOrdersNub(DistributionSignforDTO distributionSignfor);
+	/**
+	 * 签收总数
+	 *
+	 * @param distributionSignfor
+	 * @return
+	 */
+	Integer selectSignedNub(DistributionSignforDTO distributionSignfor);
+	/**
+	 * 未签收总数
+	 *
+	 * @param distributionSignfor
+	 * @return
+	 */
+	Integer selectUnsignedNub(DistributionSignforDTO distributionSignfor);
+	/**
+	 * 客户总数
+	 *
+	 * @param distributionSignfor
+	 * @return
+	 */
+	List<DistributionSignforEntity> selectCustomNub(DistributionSignforDTO distributionSignfor);
 }

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

@@ -51,5 +51,17 @@
     <select id="exportDistributionSignfor" resultType="com.logpm.distribution.excel.DistributionSignforExcel">
         SELECT * FROM logpm_distribution_signfor ${ew.customSqlSegment}
     </select>
+    <select id="selectOrdersNub" resultType="java.lang.Integer">
+        SELECT COUNT(1) FROM logpm_distribution_signdetail where is_deleted = 0
+    </select>
+    <select id="selectSignedNub" resultType="java.lang.Integer">
+        SELECT COUNT(1) FROM logpm_distribution_signdetail where is_deleted = 0 and is_signfor ='2'
+    </select>
+    <select id="selectUnsignedNub" resultType="java.lang.Integer">
+
+    </select>
+    <select id="selectCustomNub" resultMap="distributionSignforResultMap">
+        select id,reservation_id,order_id from logpm_distribution_signfor where is_deleted = 0
+    </select>
 
 </mapper>

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

@@ -25,7 +25,7 @@ import org.springblade.core.mp.base.BaseService;
 import java.util.List;
 
 /**
- * 配送预约中间表 服务类
+ * 配送装车中间表 服务类
  *
  * @author TJJ
  * @since 2023-06-16

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

@@ -67,4 +67,11 @@ public interface IDistributionDeliveryListService extends BaseService<Distributi
 	 * @return
 	 */
 	DistributionstatisticsnmbVO getNubTotal(DistributionDeliveryListDTO distributionDeliveryList);
+	/**
+	 * 发车
+	 *
+	 * @param
+	 * @return
+	 */
+	Integer start(DistributionDeliveryListDTO distributionDeliveryList);
 }

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

@@ -17,10 +17,13 @@
 package com.logpm.distribution.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.logpm.distribution.dto.DistributionSignforDTO;
 import com.logpm.distribution.entity.DistributionSignforEntity;
 import com.logpm.distribution.vo.DistributionSignforVO;
 import com.logpm.distribution.excel.DistributionSignforExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.distribution.vo.DistributionSignforsnmbVO;
+import com.logpm.distribution.vo.DistributionstatisticsnmbVO;
 import org.springblade.core.mp.base.BaseService;
 import java.util.List;
 
@@ -48,5 +51,10 @@ public interface IDistributionSignforService extends BaseService<DistributionSig
 	 * @return
 	 */
 	List<DistributionSignforExcel> exportDistributionSignfor(Wrapper<DistributionSignforEntity> queryWrapper);
-
+	/**
+	 * 签收订单统计
+	 *
+	 * @return
+	 */
+	DistributionSignforsnmbVO getNubTotal(DistributionSignforDTO distributionSignfor);
 }

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

@@ -28,7 +28,7 @@ import org.springblade.core.mp.base.BaseServiceImpl;
 import java.util.List;
 
 /**
- * 配送预约中间表 服务实现类
+ * 配送装车中间表 服务实现类
  *
  * @author TJJ
  * @since 2023-06-16

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

@@ -27,14 +27,20 @@ import com.logpm.distribution.service.IDistributionDeliveryListService;
 import com.logpm.distribution.vo.DistributionPackadeliVO;
 import com.logpm.distribution.vo.DistributionstatisticsnmbVO;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.transaction.annotation.Isolation;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigInteger;
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -45,6 +51,7 @@ import java.util.List;
  */
 @Service
 @AllArgsConstructor
+@Slf4j
 public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<DistributionDeliveryListMapper, DistributionDeliveryListEntity> implements IDistributionDeliveryListService {
 	private final DistributionPackadeliMapper distributionPackadeliMapper;
 	@Override
@@ -100,4 +107,20 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		return distributionstatisticsnmbVO;
 	}
 
+	@Override
+	@Transactional(isolation = Isolation.READ_COMMITTED,rollbackFor = Exception.class)
+	public Integer start(DistributionDeliveryListDTO distributionDeliveryList) {
+		log.info("开始发车>>>>>>>>>{}",distributionDeliveryList);
+		//获取关联的客户信息
+		String reservationId = distributionDeliveryList.getReservationId();
+		List<Long> reservationIds = Arrays.asList(Long.valueOf(String.valueOf(reservationId.split(","))));
+		//查询客户信息
+
+		//插入配送管理表
+		//获取关联订单
+		String orderId = distributionDeliveryList.getOrderId();
+		List<Long> orderIds = Arrays.asList(Long.valueOf(String.valueOf(orderId.split(","))));
+		return null;
+	}
+
 }

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

@@ -16,15 +16,20 @@
  */
 package com.logpm.distribution.service.impl;
 
+import com.logpm.distribution.dto.DistributionSignforDTO;
 import com.logpm.distribution.entity.DistributionSignforEntity;
 import com.logpm.distribution.vo.DistributionSignforVO;
 import com.logpm.distribution.excel.DistributionSignforExcel;
 import com.logpm.distribution.mapper.DistributionSignforMapper;
 import com.logpm.distribution.service.IDistributionSignforService;
+import com.logpm.distribution.vo.DistributionSignforsnmbVO;
+import com.logpm.distribution.vo.DistributionstatisticsnmbVO;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
+
+import java.text.SimpleDateFormat;
 import java.util.List;
 
 /**
@@ -51,4 +56,27 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		return distributionSignforList;
 	}
 
+	@Override
+	public DistributionSignforsnmbVO getNubTotal(DistributionSignforDTO distributionSignfor) {
+		//转换创建时间
+		if (null != distributionSignfor.getCreateTime()){
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+			distributionSignfor.setCreateTime_query(sdf.format(distributionSignfor.getCreateTime()));
+		}
+		DistributionSignforsnmbVO distributionSignforsnmbVO = new DistributionSignforsnmbVO();
+		//查询客户总数
+		List<DistributionSignforEntity> distributionSignforEntityList = baseMapper.selectCustomNub(distributionSignfor);
+		//订单总数
+		Integer OrdersNub = baseMapper.selectOrdersNub(distributionSignfor);
+		//已签收总数
+		Integer	SignedNub =	baseMapper.selectSignedNub(distributionSignfor);
+//		//未签收总数
+//		Integer	UnsignedNub =	baseMapper.selectUnsignedNub(distributionSignfor);
+		distributionSignforsnmbVO.setCustomNub(distributionSignforEntityList.size());
+		distributionSignforsnmbVO.setOrdersNub(OrdersNub);
+		distributionSignforsnmbVO.setUnsignedNub(OrdersNub - SignedNub);
+		distributionSignforsnmbVO.setSignedNub(SignedNub);
+		return distributionSignforsnmbVO;
+	}
+
 }