Merge branch 'dev' into pre-production

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

@@ -30,12 +30,9 @@ import java.io.Serializable;
 public class DistributionAppStockUpTrayDetailVO implements Serializable {
 
 
-	private Long orderId;
-	private Long packageId;
-	private String  waybillNumber;
-	private String  orderCode;
-	private String  categoryName;
+	private String  trayName;
+	private String  trayCode;
 	private Integer  planNum;
-	private String  scanNum;
+	private Integer  scanNum;
 
 }

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

@@ -275,7 +275,7 @@ public class BasicdataDriverArteryServiceImpl extends BaseServiceImpl<BasicdataD
                         throw new ServiceException(phone + "手机号码已存在！");
                     }
 
-                    R<User> userR = userClient.userInfoByPhone("627683", datum.getPhone());
+                    R<User> userR = userClient.userInfoByPhone(AuthUtil.getTenantId(), datum.getPhone());
                     if (userR.getData() == null) {
 //					log.error("未找到用户");
 //					continue;

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

@@ -1223,14 +1223,7 @@ public class DistributionStockupAppController extends BladeController {
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "备货扫描详情", notes = "传入stockupDTO")
 	public R stockupScanDetail(@RequestBody StockupDTO stockupDTO) {
-		String lockKey = "Lock:" + stockupDTO.getPacketBarCode() + stockupDTO.getStockupId();
 		String method = "#######################DistributionStockupAppController.newStockupScan";
-		log.info("#################stockupScan：获取redisson对象开始");
-		if (redis.exists(lockKey)) {
-			String audioValue2 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, PdaAudioLingoStatus.chongfusaomiao.getValue());
-			return Resp.scanFail(PdaAudioLingoStatus.chongfusaomiao.getName(), audioValue2);
-		}
-		redis.setEx(lockKey, stockupDTO.getPacketBarCode() + stockupDTO.getStockupId(), 5L);
 		//针对商市配、自提分别进行处理
 		if (Objects.isNull(stockupDTO.getReservationId())){
 			log.error(method+"参数:stockupDTO.getReservationId()缺失");

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

@@ -72,7 +72,7 @@
         WHERE
         reservation_id = #{reservationId} AND parce_list_id = #{packageId}
     </delete>
-    <select id="deliveryTrayDetailList" resultType="com.logpm.distribution.vo.app.DistributionAppStockUpScanDetailVO" >
+    <select id="deliveryTrayDetailList" resultType="com.logpm.distribution.vo.app.DistributionAppStockUpTrayDetailVO" >
         SELECT
         t.trayName,
         t.trayCode,

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

@@ -2030,7 +2030,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 					//需要修改订单的状态
 					DistributionStockArticleDTO stockArticleDTO = Func.copy(stockArticleEntity, DistributionStockArticleDTO.class);
 					//维护订单信息
-					distributionStockArticleService.maintenanceOrderInfo(stockArticleDTO.getOrderCode(), myCurrentWarehouse.getId());
+					distributionStockArticleService.maintenanceOrderInfo(stockArticleEntity.getOrderCode(), myCurrentWarehouse.getId());
 					distributionReservationStockarticleService.updateById(reservationStockarticleEntity);
 				});
 			}

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

@@ -5900,6 +5900,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 	}
 
 	@Override
+	@Transactional
 	public R upStockUpShelf(StockupDTO stockupDTO) {
 		BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
 		if (Objects.isNull(myCurrentWarehouse)){
@@ -5948,6 +5949,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 	}
 
 	@Override
+	@Transactional
 	public R cancelStock(StockupDTO stockupDTO) {
 		BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
 		if (Objects.isNull(myCurrentWarehouse)){
@@ -5957,14 +5959,14 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		String stockIds = stockupDTO.getStockIds();
 		Long stockupId = stockupDTO.getStockupId();
 		DistributionStockupEntity stockupEntity = this.getById(stockupId);
-		boolean b = this.judgeIsPickingStaff(AuthUtil.getUser());
-		if (!b) {
-			return Resp.scanFail("当前操作人无此操作权限","当前操作人无此操作权限");
-		}else {
-			if (!stockupEntity.getForkliftId().equals(AuthUtil.getUserId())){
-				return Resp.scanFail("与任务指派拣货员不一致","与任务指派拣货员不一致");
-			}
-		}
+//		boolean b = this.judgeIsPickingStaff(AuthUtil.getUser());
+//		if (!b) {
+//			return Resp.scanFail("当前操作人无此操作权限","当前操作人无此操作权限");
+//		}else {
+//			if (!stockupEntity.getForkliftId().equals(AuthUtil.getUserId())){
+//				return Resp.scanFail("与任务指派拣货员不一致","与任务指派拣货员不一致");
+//			}
+//		}
 		List<String> strList = Func.toStrList(stockIds);
 		List<DistributionStockEntity> distributionStockEntities = distributionStockService.listByIds(strList);
 		int sum = 0;
@@ -6093,9 +6095,9 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		if (Objects.isNull(stockUpClientVO)){
 			return R.fail("查询备货客户信息错误");
 		}
-		List<DistributionAppStockUpTrayDetailVO> distributionAppStockUpTrayDetailVOS = distributionReservationMapper.deliveryTrayDetailList(reservationId);
-		if (!distributionAppStockUpTrayDetailVOS.isEmpty()) {
-			stockUpClientVO.setDeliveryTrayList(distributionAppStockUpTrayDetailVOS);
+		List<DistributionAppStockUpTrayDetailVO> deliveryTrayDetailList = distributionReservationMapper.deliveryTrayDetailList(reservationId);
+		if (!deliveryTrayDetailList.isEmpty()) {
+			stockUpClientVO.setDeliveryTrayList(deliveryTrayDetailList);
 		}
 		return R.data(stockUpClientVO);
 	}