| 
					
				 | 
			
			
				@@ -96,7 +96,7 @@ public class RepairBusiness { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         /*if (1 == 1) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             return; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+       */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<ItfTblAssignDownload> repairRec = new ArrayList<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<Long> pgids = new ArrayList<>(); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -242,7 +242,7 @@ public class RepairBusiness { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // 基础表数据同步 总部的修改时间必须晚于本地系统时间才可以修改 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (item.getLastModifiedDate().compareTo(oldOrder.getUpdateTime())>0){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            upOrderBase(brand, item, oldOrder.getId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            upOrderBase(brand, item, oldOrder.getId(), oldOrder.getMainId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             oldOrder = orderBaseService.lambdaQuery() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     .eq(OrderBase::getPgid, item.getPgid()) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     .eq(OrderBase::getOrderType, OrderTypeEnum.ORDER_TYPE_REPAIR.getCode()).one(); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -507,23 +507,33 @@ public class RepairBusiness { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return flag; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    private void upOrderBase(Brand brand, ItfTblAssignDownload item, String id) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    private void upOrderBase(Brand brand, ItfTblAssignDownload item, String id, String mainId) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // 获取维修工单主表要修改的数据 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        OrderBase upOrder = getUpOrderBase(brand, item, id); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        OrderBase upOrder = getUpOrderBase(brand, item, id,mainId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // 省市区单独处理 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         orderService.getPCAS(upOrder); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         orderBaseService.updateById(upOrder); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @NotNull 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    private OrderBase getUpOrderBase(Brand brand, ItfTblAssignDownload item, String id) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    private OrderBase getUpOrderBase(Brand brand, ItfTblAssignDownload item, String id,String mainId) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        WebsitSH websitSH = new WebsitSH(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         OrderPar orderPar = new OrderPar(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         orderPar.setSynReqId(item.getSynReqId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         orderPar.setBrandId(brand.getBrandId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         OrderBase upOrder = repairDownloadMapper.getUpOrderBase(orderPar); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         upOrder.setId(id); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         upOrder.setOutUpdateSynReqId(item.getSynReqId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         upOrder.setOutUpdateSynReqTime(new Date()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        // 销售网点处理 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        websitSH = publicService.shxswdToptxswd(upOrder.getSaleWebsitId(),mainId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        upOrder.setSaleWebsitId(websitSH.getWdId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        upOrder.setSaleWebsitName(websitSH.getWdmc()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        // 这里为商户的系统网点编号 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        upOrder.setSaleWebsitSysNumber(websitSH.getBrandSysWebsitNumber()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // upOrder.setUpdateTime(new Date()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return upOrder; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1086,6 +1096,7 @@ public class RepairBusiness { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<ItfTblAssignMxDownload> mxRec = new ArrayList<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<OrderProduct> addmx = new ArrayList<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<ItfTblAssignMxDownload> ups = new ArrayList<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        WebsitSH websitSH = new WebsitSH(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // 提取明细表数据 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1100,6 +1111,13 @@ public class RepairBusiness { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             mxreq.setSynReqId(Long.valueOf(rec.getSynReqId())); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             mxreq.setBrandId(brand.getBrandId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             OrderProduct op = repairMxDownloadMapper.getMx(mxreq); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            // 销售单位处理 sale_websit 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            websitSH = publicService.shxswdToptxswd(op.getSaleWebsit(),order.getMainId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            op.setSaleWebsit(websitSH.getWdId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            // 服务单位处理 service_websit 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            websitSH = publicService.shshwdToptshwd(op.getServiceWebsit(),order.getMainId(),order); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            op.setServiceWebsit(websitSH.getWdId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             // 其他部分参数赋值 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             op.setOrderBaseId(order.getId()); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1221,9 +1239,17 @@ public class RepairBusiness { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @NotNull 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private OrderProduct getOrderProduct(ItfTblAssignDownload item, OrderBase order, Map<String, List<SysDictRef>> sysDictRefDLMap, Map<String, List<SysDictRef>> sysDictRefXLMap, Map<String, List<SysDictRef>> sysDictRefXiLieMap, ItfTblAssignMxDownload rec, OrderPar mxreq) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        WebsitSH websitSH = new WebsitSH(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         OrderProduct op = repairMxDownloadMapper.getMx(mxreq); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // 其他部分参数赋值 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        // 销售单位处理 sale_websit 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        websitSH = publicService.shxswdToptxswd(op.getSaleWebsit(),order.getMainId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        op.setSaleWebsit(websitSH.getWdId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        // 服务单位处理 service_websit 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        websitSH = publicService.shshwdToptshwd(op.getServiceWebsit(),order.getMainId(),order); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        op.setServiceWebsit(websitSH.getWdId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         op.setOrderBaseId(order.getId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         op.setPgguid(item.getPgguid()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         op.setMainId(sysDictRefDLMap.get(String.valueOf(rec.getSpid())).get(0).getDictCode()); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1277,7 +1303,7 @@ public class RepairBusiness { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             order.setIsChildInfo("YES"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // 部分属性值重置 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        orderService.setParame(brand, order); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        orderService.setParame(brand, order, item); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // 新增 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         orderBaseService.save(order); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return order; 
			 |