fix: 修复String map 转Stirng 报错

blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java

@@ -60,6 +60,12 @@ public class OldSystemDataPushConfig {
 		// 阳春仓
 		warehourseIds.add("150");
 
+		//宜昌
+		warehourseIds.add("45");
+
+		// 大竹
+		warehourseIds.add("37");
+
 	}
 
 

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

@@ -464,7 +464,10 @@ public class DistributionSignforController extends BladeController {
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "PC下载签收图片", notes = "传入ids")
 	public void handlePicture(@RequestParam String ids,HttpServletResponse res) {
-		 distributionSignforService.handlePicture(ids,res);
+		if(StringUtils.isNotBlank(ids)){
+			distributionSignforService.handlePicture(ids,res);
+		}
+
 	}
 
 

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

@@ -78,18 +78,6 @@ public class DistributionClientMessageServiceImpl extends BaseServiceImpl<Distri
 			}
 			for (String s : split) {
 				//修改在库记录的地址
-//				List<DistributionStockArticleEntity> list = distributionStockArticleService.list(Wrappers.<DistributionStockArticleEntity>query().lambda()
-//					.eq(DistributionStockArticleEntity::getId, s)
-//				);
-//				DistributionStockArticleEntity distributionStockArticleEntity = list.get(0);
-//				distributionStockArticleEntity.setCustomerName(distributionClientMessage.getName());
-//				distributionStockArticleEntity.setCustomerTelephone(distributionClientMessage.getPhone());
-//				distributionStockArticleEntity.setCustomerAddress(distributionClientMessage.getAddress());
-//				distributionStockArticleService.updateById(distributionStockArticleEntity);
-//				DistributionClientMessageEntity distributionClientMessageEntity = new DistributionClientMessageEntity();
-//				BeanUtils.copyProperties(distributionClientMessage,distributionClientMessageEntity);
-//				distributionClientMessageEntity.setStockArticleId(s);
-//				this.save(distributionClientMessageEntity);
 				DistributionStockArticleEntity oldStockArticle = distributionStockArticleService.getById(Long.parseLong(s));
 				DistributionStockArticleEntity newStockArticle = new DistributionStockArticleEntity();
 				BeanUtil.copy(oldStockArticle,newStockArticle);

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

@@ -2654,6 +2654,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			return R.fail("请联系管理员!!!");
 		}
 		if ((signforEntity.getReceivedQuantity() + signforEntity.getReceivedinQuantity()) <= 0) {
+
 			log.error("signforack############未进行签收上传图片");
 			return Resp.scanFail(12000, "请先进行签收扫描后上传图片", "请先进行签收扫描后上传图片", null);
 		}
@@ -2663,7 +2664,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		if (ObjectUtils.isNotNull(distributionSignfor.getMap())) {
 			List<DistributionSignPrintEntity> distributionSignPrintList = new ArrayList<>();
 			distributionSignfor.getMap().forEach((k, v) -> {
-				v.stream().forEach(i -> {
+				v.forEach(i -> {
 					DistributionSignPrintEntity distributionSignPrint = new DistributionSignPrintEntity();
 					BeanUtils.copyProperties(i, distributionSignPrint);
 					distributionSignPrint.setId(null);

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java

@@ -398,7 +398,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 	public WarehouseWaybillEntity findByWaybillNo(String waybillNo) {
 		QueryWrapper<WarehouseWaybillEntity> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("waybill_no", waybillNo);
-        return warehouseWaybillMapper.selectOne(queryWrapper);
+		return warehouseWaybillMapper.selectOne(queryWrapper);
 	}
 
 	@Override