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

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

@@ -251,7 +251,7 @@ public class BasicdataVehicleEntity extends TenantEntity {
 	 * 车辆年审有效期
 	 */
 	@ApiModelProperty(value = "车辆年审有效期")
-	private Integer reviewValidity;
+	private String reviewValidity;
 	/**
 	 * 车辆保险开始时间
 	 */

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

@@ -83,8 +83,10 @@ public class BasicdataVehicleController extends BladeController {
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入basicdataVehicle")
-	public R<BasicdataVehicleVO> detail(BasicdataVehicleDTO basicdataVehicle) {
-		BasicdataVehicleEntity detail = basicdataVehicleService.getOne(Condition.getQueryWrapper(basicdataVehicle));
+	public R<BasicdataVehicleVO> detail(@Param("id") Long id) {
+
+//		BasicdataVehicleEntity detail = basicdataVehicleService.getOne(Condition.getQueryWrapper(basicdataVehicle));
+		BasicdataVehicleEntity detail = basicdataVehicleService.getVehicleDetail(id);
 		//查询历史照片
 		BasicdataVehicleVO basicdataVehicleVO = new BasicdataVehicleVO();
 		BeanUtils.copyProperties(detail,basicdataVehicleVO);

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

@@ -62,4 +62,11 @@ public interface BasicdataVehicleMapper extends BaseMapper<BasicdataVehicleEntit
     List<BasicdataVehicleVO> selectBasicdataDictionary(@Param("vehicleNub") String vehicleNub);
 
     List<BasicdataVehicleEntity> findCarListByName(@Param("carNumber") String carNumber);
+
+	/**
+	 * 查询车辆详情
+	 * @param id
+	 * @return
+	 */
+	BasicdataVehicleEntity getVehicleDetail(@Param("id")Long id);
 }

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

@@ -252,6 +252,85 @@
         and vehicle_nub like concat('%',#{carNumber},'%')
         limit 10
     </select>
+    <select id="getVehicleDetail" resultType="com.logpm.basicdata.entity.BasicdataVehicleEntity">
+        SELECT
+        lbv.id id,
+        lbv.tenant_id tenantId,
+        lbv.create_user createUser,
+        lbv.create_time createTime,
+        lbv.update_user updateUser,
+        lbv.update_time updateTime,
+        lbv.STATUS STATUS,
+        lbv.create_dept createDept,
+        lbv.vehicle_nub vehicleNub,
+        lbv.vehicle_source vehicleSource,
+        lbv.is_head isHead,
+        lbv.trailer_type trailerType,
+        lbv.vehicle_model vehicleModel,
+        lbv.car_type carType,
+        lbv.carrier_name carrierName,
+        lbv.vehicle_commander vehicleCommander,
+        lbv.vehicle_height vehicleHeight,
+        lbv.payment_method paymentMethod,
+        lbv.approved_volume approvedVolume,
+        lbv.license_plate_color licensePlateColor,
+        lbv.vehicle_color vehicleColor,
+        lbv.energy_type energyType,
+        lbv.license_plate_type licensePlateType,
+        lbv.notes notes,
+        lbv.vehicle_owner vehicleOwner,
+        lbv.vehicle_brand vehicleBrand,
+        lbv.vehicle_code vehicleCode,
+        lbv.engine_code engineCode,
+        lbv.vehicle_quality vehicleQuality,
+        lbv.curb_weight curbWeight,
+        lbv.load_mass loadMass,
+        lbv.outer_width outerWidth,
+        lbv.expiration_time expirationTime,
+        lbv.road_transport roadTransport,
+        lbv.business_license businessLicense,
+        lbv.vehicle_unit vehicleUnit,
+        lbv.vehicle_unit_phone vehicleUnitPhone,
+        lbv.vehicle_owner_phone vehicleOwnerPhone,
+        lbv.vehicle_owner_card vehicleOwnerCard,
+        lbv.driving_license_photo drivingLicensePhoto,
+        lbv.driving_license_photo_back drivingLicensePhotoBack,
+        lbv.license_photo licensePhoto,
+        lbv.vehicle_photo vehiclePhoto,
+        lbv.vehicle_rear_photo vehicleRearPhoto,
+        lbv.road_transport_photo roadTransportPhoto,
+        lbv.vehicle_people_photo vehiclePeoplePhoto,
+        lbv.insurance_card_photo insuranceCardPhoto,
+        lbv.carrier_id carrierId,
+        lbv.review_time reviewTime,
+        lbv.review_validity reviewValidity,
+        lbv.insurance_start_time insuranceStartTime,
+        lbv.insurance_end_time insuranceEndTime,
+        lbv.body_advertising bodyAdvertising,
+        lbv.advertisements_new_times advertisementsNewTimes,
+        lbv.vehicle_parking_company vehicleParkingCompany,
+        lbv.with_gps withGps,
+        lbv.gps_service_provider gpsServiceProvider,
+        lbv.gps_model gpsModel,
+        (
+        SELECT
+        group_concat( lbvp.photo_url )
+        FROM
+        logpm_basicdata_vehicle_photo lbvp
+        WHERE
+        lbvp.master_id = lbv.id
+        AND lbvp.create_time &lt;= DATE_SUB( CURDATE(), INTERVAL 1 YEAR )
+        ORDER BY
+        lbvp.create_time
+        LIMIT 3
+        ) historicPhotos,
+        ( SELECT GROUP_CONCAT( driver_id SEPARATOR ',' ) FROM logpm_basicdata_drivermiddle lbd WHERE lbd.brand_id = lbv.id AND lbd.is_deleted = 0 ) vehicleOwners
+        FROM
+        logpm_basicdata_vehicle lbv
+        WHERE
+        lbv.id = #{id}
+        AND is_deleted = 0
+    </select>
 
 
 </mapper>

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

@@ -92,4 +92,11 @@ public interface IBasicdataVehicleService extends BaseService<BasicdataVehicleEn
 	 * @param data
 	 */
     void importDriverArtery(List<BasicdataVehicleImportExcel> data);
+
+	/**
+	 * 查询车辆详情
+	 * @param id
+	 * @return
+	 */
+	BasicdataVehicleEntity getVehicleDetail(Long id);
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataVehicleServiceImpl.java

@@ -286,4 +286,9 @@ public class BasicdataVehicleServiceImpl extends BaseServiceImpl<BasicdataVehicl
 
 	}
 
+	@Override
+	public BasicdataVehicleEntity getVehicleDetail(Long id) {
+		return baseMapper.getVehicleDetail(id);
+	}
+
 }

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

@@ -224,7 +224,7 @@ public class DistributionSignforAppController {
 	}
 
 	/**
-	 * 司机签收管理  确认签收
+	 * 上传签收图片
 	 */
 	@PostMapping("/signforack")
 	@ApiOperationSupport(order = 2)

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

@@ -367,6 +367,7 @@
         association_value ) AS t2 ON t.cargo_number = t2.association_value
         where ldslNew.is_deleted = 0
         AND ldslNew.warehouse_id=#{warehouseId}
+        AND ldslNew.market_name=#{mallName}
         GROUP BY
         ldslNew.cargo_number
     </select>

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

@@ -52,7 +52,7 @@
         dbl.total_cost AS totalCost,
         dbl.pick_up_plate AS pickUpPlate,
         dbl.pickup_batch AS pickupBatch,
-        ( SELECT count( quantity ) FROM logpm_distribution_bill_lading_scan WHERE bill_lading_id = dbl.id ) AS stopNum,
+        ( SELECT IFNULL(SUM(quantity),0 FROM logpm_distribution_bill_lading_scan WHERE bill_lading_id = dbl.id ) AS stopNum,
         (
         SELECT
         group_concat( splice )

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

@@ -904,8 +904,9 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 		List<String> materialUnit = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getMaterialUnit).distinct().collect(Collectors.toList());
 		List<Long> mallId = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getMarketId).distinct().collect(Collectors.toList());
 		List<String> materialName = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getMaterialName).distinct().collect(Collectors.toList());
+		List<String> brandName = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getBrandName).distinct().collect(Collectors.toList());
 		List<Long> brandId = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getBrandId).distinct().collect(Collectors.toList());
-		if (materialId.size() != 1 || materialCode.size() != 1 || materialUnit.size() != 1 || mallId.size() != 1 || materialName.size() != 1 || brandId.size() != 1) {
+		if (materialId.size() != 1 || materialCode.size() != 1 || materialUnit.size() != 1 || mallId.size() != 1 || materialName.size() != 1 || brandName.size() != 1) {
 			//该批次包件出现多种物料包件
 			return null;
 		}
@@ -941,6 +942,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 //		distributionStockListEntity.setCategory(Optional.ofNullable(distributionParcelList.getBrandId()+"").orElse(null));//品分类
 		// 品牌
 		distributionStockListEntity.setBrandId(brandId.get(0));
+		distributionStockListEntity.setBrandName(brandName.get(0));
 		distributionStockListEntity.setUnpackingQuantity(0);
 		distributionStockListEntity.setSourceType("1"); //类型
 

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

@@ -59,6 +59,7 @@ import com.logpm.warehouse.feign.IWarehouseUpdownStockUpAreaClient;
 import com.logpm.warehouse.feign.IWarehouseUpdownTypeClient;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.util.Strings;
 import org.jetbrains.annotations.NotNull;
 import org.springblade.common.constant.DistributionTypeConstant;
 import org.springblade.common.constant.Inventory.InventoryLoadingStatusConstant;
@@ -950,7 +951,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			log.error("signforack############未进行签收上传图片");
 			return R.fail("无签收数据");
 		}
-		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		log.info("=============签收图片数据为：{}", distributionSignfor.getMap());
 		if (ObjectUtils.isNotNull(distributionSignfor.getMap())) {
 			List<DistributionSignPrintEntity> distributionSignPrintList = new ArrayList<>();
@@ -3221,7 +3222,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			return Resp.scanFail(12000, "请先进行签收扫描后上传图片", "请先进行签收扫描后上传图片", null);
 		}
 
-		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		log.info("=============签收图片数据为：{}", distributionSignfor.getMap());
 		if (ObjectUtils.isNotNull(distributionSignfor.getMap())) {
 			List<DistributionSignPrintEntity> distributionSignPrintList = new ArrayList<>();
@@ -4938,10 +4939,13 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		String method = "######################DistributionSignforServiceImpl.oneclickPDA";
 		BladeUser user = AuthUtil.getUser();
 		BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
+		//进行防重复提交
+
 		if (Objects.isNull(myCurrentWarehouse)) {
 			return R.fail(403, "仓库信息不能为空");
 //			throw new CustomerException(403, "仓库信息不能为/**/空");
 		}
+
 		int loadingPackageNum = 0;
 		int loadingInventoryNum = 0;
 		int signingPackageNum = 0;
@@ -4966,6 +4970,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			log.error(method + "reservationEntity参数错误:{}", reservationEntity);
 			return R.fail("服务器正忙~~");
 		}
+		Long batchLock = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "reservationId:" );
+		if (!Objects.isNull(batchLock)){
+			return R.fail("请不要重复操作");
+		}
 		List<Long> packageLockIds = new ArrayList<>();
 		//查询数据
 		DistributionSignforEntity distributionSignforEntity = baseMapper.selectOne(new QueryWrapper<DistributionSignforEntity>().lambda()
@@ -5449,6 +5457,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			distributionSignforEntity.setDriverRemarks(distributionSignfor.getDriverRemarks());
 		}
 		this.updateById(distributionSignforEntity);
+		bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "reservationId:", distributionSignfor.getReservationId(),60L);
 		return R.status(true);
 	}
 

blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mq/NodeDataPushListener.java

@@ -328,23 +328,24 @@ public class NodeDataPushListener {
 		HttpRequest post = HttpUtil.createPost(mengTianProperties.getHost() + url);
 		post.header("ClientId", "mt.ht");
 		post.header("OperationCode", operationCode);
-		post.timeout(5000);
+		post.timeout(30000);
 		post.body(body);
 		// 存入日志表
 		entity.setContent(body);
 		entity.setOperationCode(operationCode);
 		entity.setSendUrl(mengTianProperties.getHost() + url);
+		String resBody = "";
 		try {
 			HttpResponse execute = post.execute();
-			String resBody = execute.body();
+			resBody = execute.body();
 			log.info("推送工厂结果：{}", resBody);
 			JSONObject entries = JSONUtil.parseObj(resBody);
 			String resultCode = entries.getStr("Result");
 			entity.setResultContent(resBody);
-			entity.setSendStatus(StrUtil.isEmpty(resultCode) ? "0" : resultCode);
+			entity.setSendStatus(StrUtil.isEmpty(resultCode) ? "-1" : resultCode);
 		} catch (Exception e) {
-			entity.setResultContent(e.getMessage());
-			entity.setSendStatus("0");
+			entity.setResultContent(resBody);
+			entity.setSendStatus("-1");
 		}
 		factoryNodePushService.save(entity);
 	}