1.修改司机用户绑定信息

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java

@@ -37,6 +37,12 @@ import org.springblade.core.tenant.mp.TenantEntity;
 @EqualsAndHashCode(callSuper = true)
 public class BasicdataDriverArteryEntity extends TenantEntity {
 
+	/**
+	 * 绑定用户id
+	 */
+	@ApiModelProperty(value = "绑定用户id")
+	private Long userId;
+
 	/**
 	 * 司机姓名
 	 */

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

@@ -185,6 +185,7 @@ public class DistributionStockArticleEntity extends TenantEntity {
 	/**
 	 * 预约数量
 	 */
+	@TableField(exist = false)
 	@ApiModelProperty(value = "预约数量")
 	private Integer reservationNum;
 	/**

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

@@ -43,6 +43,11 @@ public class DistributionDeliveryInfoVO extends DistributionDeliveryInfoEntity {
 	 */
 	@ApiModelProperty(value = "仓库")
 	private String warehouse;
+	/**
+	 * 订单
+	 */
+	@ApiModelProperty(value = "订单")
+	private String orderIds;
 	/**
 	 * 状态
 	 */
@@ -93,11 +98,6 @@ public class DistributionDeliveryInfoVO extends DistributionDeliveryInfoEntity {
 	 */
 	@ApiModelProperty(value = "车次号")
 	private String trainNumber;
-//	/**
-//	 * 在库订单ID
-//	 */
-//	@ApiModelProperty(value = "在库订单ID")
-//	private String stockArticleId;
 
 
 
@@ -183,11 +183,7 @@ public class DistributionDeliveryInfoVO extends DistributionDeliveryInfoEntity {
 	 */
 	@ApiModelProperty(value = "备注")
 	private String remarks;
-//	/**
-//	 * 预约单编号，系统构建生成
-//	 */
-//	@ApiModelProperty(value = "预约单编号")
-//	private String reservationId;
+
 	/**
 	 * 时段
 	 */

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java

@@ -15,7 +15,7 @@ import org.springblade.core.launch.BladeApplication;
 public class BasicDataApplication {
 
 	public static void main(String[] args) {
-		BladeApplication.run(ModuleNameConstant.APPLICATION_BASICDATA_NAME, BasicDataApplication.class, args);
+		BladeApplication.run(ModuleNameConstant.APPLICATION_BASICDATA_NAME.concat("-lmy"), BasicDataApplication.class, args);
 
 	}
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java

@@ -27,6 +27,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -58,6 +59,7 @@ import javax.servlet.http.HttpServletResponse;
 @AllArgsConstructor
 @RequestMapping("/driverArtery")
 @Api(value = "司机信息表", tags = "司机信息表接口")
+@Slf4j
 public class BasicdataDriverArteryController extends BladeController {
 
 	private final IBasicdataDriverArteryService basicdataDriverArteryService;
@@ -129,6 +131,7 @@ public class BasicdataDriverArteryController extends BladeController {
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入basicdataDriverArtery")
 	public R update(@Valid @RequestBody BasicdataDriverArteryDTO basicdataDriverArtery) {
+
 		//加入关联表
 		if (null !=basicdataDriverArtery.getBindVehicles()){
 			Integer b =	basicdataDriverArteryService.updateVehicle(basicdataDriverArtery);

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.xml

@@ -85,6 +85,7 @@
         lbda.license_people_photo licensePeoplePhoto,
         lbda.carrier_id carrierId,
         lbda.transportation_agreement transportationAgreement,
+        lbda.user_id userId,
         (SELECT GROUP_CONCAT(brand_id SEPARATOR ',') from logpm_basicdata_drivermiddle lbd WHERE lbd.driver_id = lbda.id and lbd.is_deleted = 0) bindVehicles
         FROM
         logpm_basicdata_driver_artery lbda

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

@@ -128,6 +128,17 @@ public class DistributionDeliveryListController extends BladeController {
 		return R.data(i);
 	}
 
+	/**
+	 * 配送管理 装车确认
+	 */
+	@PostMapping("/loadingack")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入distributionDeliveryList")
+	public R<Integer> loadingack(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
+		Integer i	= distributionDeliveryListService.loadingscan(distrilbutionloadingscanDTO);
+		return R.data(i);
+	}
+
 	/**
 	 * 配送管理 点击发车
 	 */

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

@@ -8,19 +8,32 @@ import javax.validation.constraints.NotEmpty;
 
 @Data
 public class DistrilbutionloadingscanDTO {
+
+
 	/**
-	 * 扫描包条信息
+	 * pda信息
 	 */
+	@ApiModelProperty(value = "pda信息")
+	@NotEmpty(message = "pda信息不能为空")
+	private String pdaInformation;
 
+	/**
+	 * 扫描包条信息
+	 */
 	@ApiModelProperty(value = "扫描包条信息")
 	@NotEmpty(message = "扫描单号不能为空")
 	private String barcode;
-
-
 	/**
 	 * 扫描类型
 	 */
 	@ApiModelProperty(value = "扫描类型(1-包条,2-托盘)")
 	@NotEmpty(message = "扫描类型不能为空")
 	private Integer type;
+
+
+	/**
+	 * 确认类型
+	 */
+	@ApiModelProperty(value = "确认类型(1-整车确认,2-零星确认)")
+	private Integer ackType;
 }

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

@@ -59,6 +59,7 @@
     </select>
     <select id="selectcustomList" resultType="com.logpm.distribution.vo.DistributionDeliveryInfoVO">
         SELECT
+        ldr.id id,
         ldr.consignee consignee,
         ldr.delivery_address deliveryAddress,
         ldr.delivery_phone deliveryPhone,

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

@@ -29,7 +29,15 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.ss.formula.functions.T;
+import org.springblade.core.redis.cache.BladeRedis;
+import org.springblade.core.redis.config.RedisAutoCacheManager;
+import org.springblade.core.tool.utils.Func;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.cache.CacheProperties;
+import org.springframework.data.redis.cache.RedisCache;
+import org.springframework.data.redis.cache.RedisCacheManager;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -59,8 +67,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 	private final DistributionParcelListMapper distributionParcelListMapper;
 	private final DistributionLoadscanMapper distributionLoadscanMapper;
 	private final DistributionDeliveryListMapper distributionDeliveryListMapper;
-	private final DistributionStockArticleMapper distributionStockArticleMapper;
-
+	private final BladeRedis bladeRedis;
 	@Override
 	public IPage<DistributionDeliveryListVO> selectDistributionDeliveryListPage(IPage<DistributionDeliveryListVO> page, DistributionDeliveryListDTO distributionDeliveryList) {
 		//转换创建时间
@@ -86,7 +93,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 	public DistributionDeliveryListVO getdetailVO(DistributionDeliveryListEntity detail) {
 		DistributionDeliveryListVO distributionDeliveryListVO = new DistributionDeliveryListVO();
 		//转移数据到VO上
-		BeanUtils.copyProperties(detail, distributionDeliveryListVO);
+		Func.copy(detail, distributionDeliveryListVO);
 		//查询包条数据
 		List<DistributionDeliveryInfoVO> stripList =distributionDeliveryInfoMapper.selectStripList(detail.getId());
 		distributionDeliveryListVO.setPackadeList(stripList);
@@ -109,6 +116,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 			distributionDeliveryList.setCreateTime_query(sdf.format(distributionDeliveryList.getCreateTime()));
 		}
+//		redisCache.put("....",123);
+//		log.info(">>>>>>>>{}",redisCache.get("..."));
+
 		DistributionstatisticsnmbVO distributionstatisticsnmbVO = new DistributionstatisticsnmbVO();
 		//商配车次
 		Integer commercialNub = baseMapper.selectBycommercialNub(distributionDeliveryList);
@@ -162,9 +172,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			distributionSignforEntity.setOrderTotal(i);
 			//该客户总件数
 		  	Integer i1 =distributionDeliveryInfoMapper.selectWrapCount(e.getId());
-			  distributionSignforEntity.setTotal(i1);
-			  //装车件数
-
+		    distributionSignforEntity.setTotal(i1);
+			//装车件数
 			distributionSignforEntities.add(distributionSignforEntity);
 		});
 		}else {
@@ -182,6 +191,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 
 	@Override
 	public Integer loadingscan(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
+		//查询是否同一pda
+//		bladeRedis.setEx(distrilbutionloadingscanDTO.getPdaInformation(),);
+		//寻找车次
 		if (distrilbutionloadingscanDTO.getType()==1){
 		//找出该包条码
 		List<DistributionParcelListEntity> distributionParcelListEntities = distributionParcelListMapper.selectList(new QueryWrapper<DistributionParcelListEntity>().lambda()