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

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesAppealEntity.java

@@ -116,5 +116,10 @@ public class AftersalesAppealEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "处理人ID")
 	private Long processedById;
+	/**
+	 * 申述附件
+	 */
+	@ApiModelProperty(value = "申述附件")
+	private String  imagePath;
 
 }

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java

@@ -1303,20 +1303,35 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 		workOrderEntity.setCompletionId(myCurrentWarehouse.getId());
 		baseMapper.updateById(workOrderEntity);
 		//修改处理方提交结果
-		AftersalesProcessorEntity one = aftersalesProcessorService.getOne(Wrappers.<AftersalesProcessorEntity>query().lambda()
+		List<AftersalesProcessorEntity> list = aftersalesProcessorService.list(Wrappers.<AftersalesProcessorEntity>query().lambda()
 			.eq(AftersalesProcessorEntity::getWorkOrderId, aftersalesWorkOrderDTO.getId())
-			.eq(AftersalesProcessorEntity::getBusinessName, myCurrentWarehouse.getName())
-			.eq(AftersalesProcessorEntity::getBusinessId, myCurrentWarehouse.getId())
+			/*.eq(AftersalesProcessorEntity::getBusinessName, myCurrentWarehouse.getName())
+			.eq(AftersalesProcessorEntity::getBusinessId, myCurrentWarehouse.getId())*/
 			.eq(AftersalesProcessorEntity::getTypesOf, ProcessorTypesOfStatusConstant.chulifang.getValue())
+			.apply("conditions in ( 1 , 2 )")
 		);
-		if(ObjectUtils.isNull(one)){
-			throw new ServiceException("处理方信息不存在！！");
+		if(list.isEmpty()){
+//			throw new ServiceException("处理方信息不存在！！");
+			log.info("异常工单处理结果》》》不是处理方提交数据");
+			//查询处理方待回复的；
+
+
+
+
+
+		}else{
+			Optional<AftersalesProcessorEntity> first = list.stream().filter(i -> i.getBusinessId().equals(myCurrentWarehouse.getId()) && i.getBusinessName().equals(myCurrentWarehouse.getName())).findFirst();
+			if(first.isPresent()){
+				AftersalesProcessorEntity processor = new AftersalesProcessorEntity();
+				processor.setProcessingStatus(ProcessorProcessingStatusStatusConstant.tijiaofang.getValue());
+				processor.setId(first.get().getId());
+				aftersalesProcessorService.updateById(processor);
+			}
+
+
 		}
 
-		AftersalesProcessorEntity processor = new AftersalesProcessorEntity();
-		processor.setProcessingStatus(ProcessorProcessingStatusStatusConstant.tijiaofang.getValue());
-		processor.setId(one.getId());
-		aftersalesProcessorService.updateById(processor);
+
 
 		//添加操作记录
 //		AftersaleSurveyRecordDTO aftersaleSurveyRecordDTO = new AftersaleSurveyRecordDTO();

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

@@ -422,7 +422,16 @@
         ldsa.train_number, ldsa.factory_train, ldsa.sending, ldsa.send_warehouse_id, ldsa.send_warehouse_name,
         ldsa.is_zero, ldsa.accept_warehouse_id, ldsa.accept_warehouse_name, ldsa.order_delivery_status,
         GROUP_CONCAT( DISTINCT lwtg.tray_code ) trays,
-        GROUP_CONCAT( DISTINCT lwug.position_code ) allocation
+        GROUP_CONCAT( DISTINCT lwug.position_code ) allocation,
+        (select COUNT(ldp.id)
+        from logpm_distribution_parcel_list ldp
+        where ldp.stock_article_id = ldsa.id and ldp.order_package_status = 70
+        ) signinQuantity,
+        sum((
+        select COUNT(ldl.id)
+        from logpm_distribution_loadscan ldl
+        where ldl.package_id = ldpl.id and ldl.signfor_state = 1
+        ))  deliveryQuantity
         from logpm_distribution_stock_article ldsa
         LEFT JOIN logpm_distribution_parcel_list ldpl on ldsa.id = ldpl.stock_article_id
         LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id

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

@@ -50,6 +50,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.DictBizConstant;
 import org.springblade.common.constant.common.IsOrNoConstant;
 import org.springblade.common.constant.order.OrderStatusConstant;
+import org.springblade.common.constant.orderpackage.OrderPackageStatusConstant;
 import org.springblade.common.constant.printTemplate.PrintTemplateStatusConstant;
 import org.springblade.common.exception.CustomerException;
 import org.springblade.common.utils.CommonUtil;
@@ -847,9 +848,13 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		}
 		IPage<DistributionStockArticleEntity> distributionStockArticleEntityIPage = baseMapper.pageListOwe(page, stockArticleEntity);
 		distributionStockArticleEntityIPage.getRecords().stream().forEach(i ->{
-			DistributionStockArticleEntity distributionStockArticleEntity = baseMapper.getStockArticleQueryQuantity(i.getId());
+/*			DistributionStockArticleEntity distributionStockArticleEntity = baseMapper.getStockArticleQueryQuantity(i.getId());
 			i.setDeliveryQuantity(distributionStockArticleEntity.getDeliveryQuantity());
-			i.setSigninQuantity(distributionStockArticleEntity.getSigninQuantity());
+			List<DistributionParcelListEntity> list = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda()
+				.eq(DistributionParcelListEntity::getStockArticleId, i.getId())
+				.eq(DistributionParcelListEntity::getOrderPackageStatus, OrderPackageStatusConstant.yiqianshou.getValue())
+			);
+			i.setSigninQuantity(distributionStockArticleEntity.getSigninQuantity() + list.size() );*/
 			if(i.getIsZero().equals("1")){
 				//查询托盘
 				WarehouseTrayGoodsEntity warehouseTrayGoods = new WarehouseTrayGoodsEntity();

blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java

@@ -392,15 +392,15 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 				 takeCompany = supplyData.get("takeCompany");
 			}
 
-			OrderDetailEntity orderDetailEntity = orderDetailClient.findByUnitNo(unitNo);
-			if(Objects.isNull(orderDetailEntity)){
-				logger.warn("############handleDataToPlatform: 包条信息不存在 unitNo={}",unitNo);
-				throw new CustomerException(405, "包条信息不存在");
-			}
-			Integer oldId = orderDetailEntity.getNowWarehouseId();
+//			OrderDetailEntity orderDetailEntity = orderDetailClient.findByUnitNo(unitNo);
+//			if(Objects.isNull(orderDetailEntity)){
+//				logger.warn("############handleDataToPlatform: 包条信息不存在 unitNo={}",unitNo);
+//				throw new CustomerException(405, "包条信息不存在");
+//			}
+//			Integer oldId = orderDetailEntity.getNowWarehouseId();
 
 			// 查询数据对应的仓库名称
-			BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getWarehouseByOldId(oldId);
+			BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.findByName(destinationWarehouse);
 			if(Objects.isNull(basicdataWarehouseEntity)){
 				logger.warn("############handleDataToPlatform: 仓库信息不存在 destinationWarehouse={}",destinationWarehouse);
 				throw new CustomerException(405, "仓库信息不存在");
@@ -558,7 +558,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 
 			}
 			//保存包件信息
-			saveOrderPackage(unitNo, distributionStockArticleEntity, basicdataWarehouseEntity, waybillNoNum,operationTime,oldId);
+			saveOrderPackage(unitNo, distributionStockArticleEntity, basicdataWarehouseEntity, waybillNoNum,operationTime,basicdataWarehouseEntity.getOldId());
 
 			logger.info("#################handleDataToPlatform: 数据处理完成");
 		} else {