| 
					
				 | 
			
			
				@@ -12,6 +12,8 @@ import com.ruoyi.common.utils.StringUtils; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ruoyi.orderManagement.domain.*; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ruoyi.orderManagement.mapper.*; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ruoyi.orderManagement.service.IftmsorderbillsService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import com.ruoyi.orderManagement.statusTracking.domain.Ftmsorderbillsfees; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import com.ruoyi.orderManagement.statusTracking.mapper.FtmsorderbillsfeesMapper; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ruoyi.warehouseBusiness.service.impl.BillnoSerialServiceImpl; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.springframework.beans.factory.annotation.Autowired; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.springframework.stereotype.Service; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -66,7 +68,7 @@ public class FtmsorderbillsServiceImpl implements IftmsorderbillsService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<Ftmsorderbillscntrs> tmsorderbillsList = ftmsorderbillscntrsMapper.selectftmsorderbillscntrsList(ftmsorderbillscntrs); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // 查询费用明细 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         Ftmsorderbillsfees ftmsorderbillsfees = new Ftmsorderbillsfees(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        ftmsorderbillsfees.setFPid(id); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        ftmsorderbillsfees.setfPid(id); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<Ftmsorderbillsfees> tmsorderbillsfeesList = ftmsorderbillsfeesMapper.selectFTmsorderbillsfeesList(ftmsorderbillsfees); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // 查询调度安排明细 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         Ftmsorderbillsplans ftmsorderbillsplans = new Ftmsorderbillsplans(); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -128,11 +130,11 @@ public class FtmsorderbillsServiceImpl implements IftmsorderbillsService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             JSONArray feesJson = JSONArray.parseArray(fees); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             List<Ftmsorderbillsfees> tmsorderbillsfeesList = JSONObject.parseArray(feesJson.toJSONString(), Ftmsorderbillsfees.class); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             for (Ftmsorderbillsfees f : tmsorderbillsfeesList) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                f.setFId(null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                f.setFPid(pId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                f.setfId(null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                f.setfPid(pId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 f.setOrgId(pId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 f.setActId(1000L); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                f.setFStatus(itemstatus); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                f.setfStatus(itemstatus); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 f.setCreateBy(loginUser.getUsername()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 f.setCreateTime(new Date()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 if (ftmsorderbillsfeesMapper.insertFTmsorderbillsfees(f) <= 0) { 
			 |