| 
					
				 | 
			
			
				@@ -138,6 +138,17 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		return maps; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	List<String> getDateNos(int size){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		List<String> times=new ArrayList<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		//获取100个单据号, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		for (int i=1;i<=size;i++){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			SimpleDateFormat sf = new SimpleDateFormat("yyMMddHHmmssSSS"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			String dateNo ="ML"+sf.format(System.currentTimeMillis())+String.format("%03d", i); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			times.add(dateNo); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		return times; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	/** 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	 * 通过参照出运明细添加数据  添加方式1 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	 * @param syPackingListFabric 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -147,7 +158,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	@Transactional 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	public synchronized SyPackingListFabric saveMain(SyPackingListFabric syPackingListFabric,String token) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		SimpleDateFormat sf = new SimpleDateFormat("yyMMddHHmmssSSS"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		String dateNo ="ML"+sf.format(System.currentTimeMillis());//获取单据号 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		String dateNo ="ML"+sf.format(System.currentTimeMillis())+String.format("%03d", 1);//获取单据号 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		syPackingListFabric.setDelFlag("0"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		syPackingListFabric.setStatus("0"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		syPackingListFabric.setDocumentNo(dateNo);//单据号 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -631,7 +642,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			queryWrapperCount.like("create_time", new SimpleDateFormat("yyyy-MM-dd").format(System.currentTimeMillis())); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			queryWrapperCount.eq("is_U8_Data","0");//判断是不是面料 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			queryWrapperCount.select("lpad(count(0)+1,6,0) as id");*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			String dateNo ="ML"+sf.format(System.currentTimeMillis());//获取单据号 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			String dateNo ="ML"+sf.format(System.currentTimeMillis())+String.format("%03d", 1);//获取单据号 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			syPackingListFabric.setDocumentNo(dateNo);//单据号 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			syPackingListFabric.setDataSource("云工厂推送");//云工厂推送的数据 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			syPackingListFabric.setWhetherCloudFactoryPush("1");//1代表是云工厂推送的 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -740,9 +751,11 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	public boolean excelAdd(Map<String,SyPackingListFabric> maps,String token) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		boolean bool=false; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		try{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			List<String> documentNos=getDateNos(maps.size()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			int num=0; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			for (String str : maps.keySet()){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-				SimpleDateFormat sf = new SimpleDateFormat("yyMMddHHmmssSSS"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-				String dateNo ="ML"+sf.format(System.currentTimeMillis());//获取单据号 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+				//SimpleDateFormat sf = new SimpleDateFormat("yyMMddHHmmssSSS"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+				//String dateNo ="ML"+sf.format(System.currentTimeMillis());//获取单据号 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				SyPackingListFabric syPackingListFabric =maps.get(str); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				List<String> ids=new ArrayList<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				for (SyPackingListFabricItem item : syPackingListFabric.getSyPackingListFabricItem()){ 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -753,7 +766,8 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					throw new JeecgBootException("手工匹配订单不能跟普通销售订单混合在一起,手工匹配订单是:"+maps.get("手工同步订单")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				//syPackingListFabric.setGarmentFactory(str);//成衣工厂 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-				syPackingListFabric.setDocumentNo(dateNo);//单据号 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+				syPackingListFabric.setDocumentNo(documentNos.get(num));//单据号 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+				num++; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				syPackingListFabric.setStatus("0");//状态 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				syPackingListFabric.setDataSource("excel导入");//excel导入 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				syPackingListFabric.setPreparedBy(getUsername(token));//将admin设置为制单人 
			 |