1.修复存入serviceNum多条问题

2.回传梦天数据模型更新

blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IServiceNumClient.java

@@ -58,4 +58,7 @@ public interface IServiceNumClient {
 
 	@GetMapping(API_PREFIX + "/findByserviceNum")
     ServiceNumEntity findByserviceNum(@RequestParam String sn);
+
+	@PostMapping(API_PREFIX + "/update")
+    void updateServiceNum(@RequestBody ServiceNumEntity serviceNum);
 }

blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java

@@ -240,13 +240,13 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 //				 serviceNum.setCreateTime(LocalDate.now());
 				serviceNum.setDeleteTime(0);
 				serviceNumEntityList.add(serviceNum);
+				serviceNumClient.addServiceNum(serviceNumEntityList);
 			}else{
 				log.info("#############handlerDataToHt: 当前服务号已存在数据serviceNum={}",sn);
+				serviceNum.setTotal(Integer.parseInt(serviceNum.getTotal())+1+"");
+				serviceNumClient.updateServiceNum(serviceNum);
 			}
 		}
-		if(!serviceNumEntityList.isEmpty()){
-			serviceNumClient.addServiceNum(serviceNumEntityList);
-		}
 		log.info("##############handlerDataToHt: 处理数据完成");
 	}
 
@@ -374,7 +374,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 				advanceDetailEntity.setDate6("");//车辆离厂时间
 				advanceDetailEntity.setCreateTime(LocalDate.now());//创建时间
 				advanceDetailEntity.setDeleteTime(0);//删除时间
-				advanceDetailEntity.setServiceNum("");//服务号
+				advanceDetailEntity.setServiceNum(StringUtil.isBlank(mtFactoryOrder.getMainOrderCode())?"":mtFactoryOrder.getMainOrderCode());//服务号
 				advanceDetailEntity.setAdmin("");//
 				advanceDetailEntity.setAdministratorsId(0);//导入人
 //				 advanceDetailEntity.setDueDate(0);//交期
@@ -408,12 +408,14 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 //				 serviceNum.setCreateTime(LocalDate.now());
 				serviceNum.setDeleteTime(0);
 				serviceNumEntityList.add(serviceNum);
+				serviceNumClient.addServiceNum(serviceNumEntityList);
 			}else{
 				log.info("#############handlerMtDataToHt: 当前服务号已存在数据serviceNum={}",sn);
+				serviceNum.setTotal(Integer.parseInt(serviceNum.getTotal())+1+"");
+				serviceNumClient.updateServiceNum(serviceNum);
 			}
 
 		}
-		serviceNumClient.addServiceNum(serviceNumEntityList);
 		log.info("##############handlerMtDataToHt: 处理数据完成");
 	}
 

blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/dto/MtOrderStatusDTO.java

@@ -24,7 +24,7 @@ public class MtOrderStatusDTO implements Serializable {
 	@JsonProperty("操作时间")
 	private Date operationTime;
 
-	@JsonProperty("中心仓编号")
+	@JsonProperty("仓库编号")
 	private String warehouse;
 
 	@JsonProperty("经销商名称")

blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java

@@ -95,6 +95,7 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService {
 			//判断是否有新的包件
 			if(packageInfos.size() == 0){
 				//如果没有新增包件就直接下一条数据
+				log.info("##################dealWithData: 没有新增包件，所以当前数据不保存 invoiceOrderCode={}",invoiceOrderCode);
 				continue;
 			}
 			//如果有新增包件就去存入订单发车单，和订单信息

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/ServiceNumClient.java

@@ -52,6 +52,12 @@ public class ServiceNumClient implements IServiceNumClient {
 		return serviceNumService.findByserviceNum(sn);
 	}
 
+	@Override
+	@PostMapping(API_PREFIX + "/updateServiceNum")
+	public void updateServiceNum(ServiceNumEntity serviceNum) {
+		serviceNumService.updateServiceNum(serviceNum);
+	}
+
 //    @Override
 //    @GetMapping(TOP)
 //    public BladePage<ServiceNumEntity> top(Integer current, Integer size) {

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IServiceNumService.java

@@ -34,4 +34,5 @@ public interface IServiceNumService {
 
     ServiceNumEntity findByserviceNum(String sn);
 
+    void updateServiceNum(ServiceNumEntity serviceNum);
 }

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/ServiceNumServiceImpl.java

@@ -52,4 +52,9 @@ public class ServiceNumServiceImpl implements IServiceNumService {
 		queryWrapper.eq("serviceNum",sn);
 		return serviceNumMapper.selectOne(queryWrapper);
 	}
+
+	@Override
+	public void updateServiceNum(ServiceNumEntity serviceNum) {
+		serviceNumMapper.updateById(serviceNum);
+	}
 }