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

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

@@ -180,6 +180,13 @@ public class DistrilbutionBillLadingEntity extends TenantEntity {
 	private String examineUserName;
 
 
+	/**
+	 * 仓库名称
+	 */
+	@ApiModelProperty(value = "仓库名称")
+	private String warehouseName;
+
+
 
 
 

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

@@ -2229,10 +2229,10 @@
                 </foreach>
             </if>
             <if test="  param.openTimeStart != null ">
-                and lww.create_time &gt; = #{param.openTimeStart}
+                and lww.create_time &gt;= #{param.openTimeStart}
             </if>
             <if test="  param.openTimeEnd != null ">
-                and lww.create_time &lt; = #{param.openTimeEnd}
+                and lww.create_time &lt;= #{param.openTimeEnd}
             </if>
         </where>
         group by ldpl.order_code,ldpl.waybill_number

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

@@ -24,6 +24,7 @@
         <result column="delivery_document" property="deliveryDocument"/>
         <result column="certificate_type" property="certificateType"/>
         <result column="total_cost" property="totalCost"/>
+        <result column="warehouse_name" property="warehouseName"/>
     </resultMap>
     <update id="cancelBillLadingPackage">
         UPDATE logpm_distrilbution_bill_package SET packet_bar_status = 3 WHERE bill_lading_id IN

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

@@ -948,7 +948,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		}
 		String planContent = user.getNickName() + "在" + warehouse.getName()
 			+ "修改自提计划;自提计划编号:" + oldEntity.getPickupBatch()
-			+ ";收货单位:" + ((Objects.isNull(oldEntity.getConsigneeUnit())?"未填写":oldEntity.getConsigneeUnit()).equals((Objects.isNull(newEntity.getConsigneeUnit())?"未填写":newEntity.getConsigneeUnit())) ? oldEntity.getConsigneeUnit() : "由" + oldEntity.getConsigneeUnit() + "变更为-->" + newEntity.getConsigneeUnit())
+			+ ";收货单位:" + ((Objects.isNull(oldEntity.getConsigneeUnit()) ? "未填写" : oldEntity.getConsigneeUnit()).equals((Objects.isNull(newEntity.getConsigneeUnit()) ? "未填写" : newEntity.getConsigneeUnit())) ? oldEntity.getConsigneeUnit() : "由" + oldEntity.getConsigneeUnit() + "变更为-->" + newEntity.getConsigneeUnit())
 			+ ",提货人:" + (oldEntity.getConsignee().equals(newEntity.getConsignee()) ? oldEntity.getConsignee() : "由" + oldEntity.getConsignee() + "变更为-->" + newEntity.getConsignee())
 			+ ",提货车牌:" + (oldEntity.getPickUpPlate().equals(newEntity.getPickUpPlate()) ? oldEntity.getPickUpPlate() : "由" + oldEntity.getPickUpPlate() + "变更为-->" + newEntity.getPickUpPlate())
 			+ ",提货证件:" + (oldEntity.getDeliveryDocument().equals(newEntity.getDeliveryDocument()) ? oldEntity.getDeliveryDocument() : "由" + oldEntity.getDeliveryDocument() + "变更为-->" + newEntity.getDeliveryDocument())
@@ -4033,7 +4033,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			}
 			Integer num = baseMapper.selectBillLadingLoading(billLadingEntity.getId());
 			//自提复核日志
-			handleDExamineDistributionPlanLog(billLadingEntity,AuthUtil.getUser(),myCurrentWarehouse,num);
+			handleDExamineDistributionPlanLog(billLadingEntity, AuthUtil.getUser(), myCurrentWarehouse, num);
 			// 回传老系统自提数据
 			sendOldSystem(Long.parseLong(s));
 			//整理运单信息
@@ -4051,7 +4051,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 	}
 
 
-	private void handleDExamineDistributionPlanLog(DistrilbutionBillLadingEntity billLadingEntity, BladeUser user, BasicdataWarehouseEntity myCurrentWarehouse,Integer num) {
+	private void handleDExamineDistributionPlanLog(DistrilbutionBillLadingEntity billLadingEntity, BladeUser user, BasicdataWarehouseEntity myCurrentWarehouse, Integer num) {
 		String planContent = user.getNickName() + "在" + myCurrentWarehouse.getName()
 			+ "完成自提计划;自提计划编号:" + billLadingEntity.getPickupBatch()
 			+ ",签收件数:" + num;
@@ -4373,20 +4373,20 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			List<DisStockListDetailEntity> recoveryInventoryPackageList = list.stream().filter(f -> InventorySigningStatusConstant.weiqianshou.getValue().equals(f.getStockSignfoStatus())).collect(Collectors.toList());
 			if (!recoveryInventoryPackageList.isEmpty()) {
 				Map<Long, List<DisStockListDetailEntity>> recoveryInventoryPackageGroupByMap = recoveryInventoryPackageList.stream().collect(Collectors.groupingBy(DisStockListDetailEntity::getStockListId));
-				recoveryInventoryPackageGroupByMap.forEach((k,v)->{
+				recoveryInventoryPackageGroupByMap.forEach((k, v) -> {
 					//进行指定库存品的冻结数量进行释放
 					DistributionStockListEntity stockListEntity = distributionStockListService.getById(k);
-					if (Objects.isNull(stockListEntity)){
+					if (Objects.isNull(stockListEntity)) {
-						log.error("查询库存品信息错误>>>>>>>>>>>>>>>>>updateStock,id:{}",k);
+						log.error("查询库存品信息错误>>>>>>>>>>>>>>>>>updateStock,id:{}", k);
 						throw new CustomerException("查询库存品信息错误");
 					}
 					//维护库存品的冻结数量
-					distributionStockListMapper.decreaseStockListQuantityOccupied(k,v.stream().mapToInt(DisStockListDetailEntity::getNum).sum());
+					distributionStockListMapper.decreaseStockListQuantityOccupied(k, v.stream().mapToInt(DisStockListDetailEntity::getNum).sum());
 					cancelList.addAll(v);
 				});
 			}
 			if (!cancelList.isEmpty()) {
-				cancelList.stream().forEach(c->c.setStockPackageStatus(InventoryPackageStatusConstant.quxiao.getValue()));
+				cancelList.stream().forEach(c -> c.setStockPackageStatus(InventoryPackageStatusConstant.quxiao.getValue()));
 				List<DisStockListDetailEntity> packageList = cancelList.stream().filter(p -> InventoryStockTypeStatusConstant.caiji.getValue().equals(p.getStockType()) && InventoryStockUpStatusConstant.yibeihuo.getValue().equals(p.getStockStatus())).collect(Collectors.toList());
 				if (!packageList.isEmpty()) {
 					//TODO这是包件转的库存品进行包件的
@@ -4493,6 +4493,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			distrilbutionBillLading.setParcelLisList(null);
 			isZeroType = true;
 		}
+		distrilbutionBillLading.setWarehouseName(warehouse.getName());
 		this.save(distrilbutionBillLading);
 		//新增自提日志
 		// 创建备货任务