|  |  | @ -118,42 +118,24 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku | 
			
		
	
		
		
			
				
					
					|  |  |  |         for (CollectOrderBizResponse collectOrderBiz : list) { |  |  |  |         for (CollectOrderBizResponse collectOrderBiz : list) { | 
			
		
	
		
		
			
				
					
					|  |  |  |             CollectOrderBizResponse collectOrderBizResponse = new CollectOrderBizResponse(); |  |  |  |             CollectOrderBizResponse collectOrderBizResponse = new CollectOrderBizResponse(); | 
			
		
	
		
		
			
				
					
					|  |  |  |             BeanUtils.copyProperties(collectOrderBiz, collectOrderBizResponse); |  |  |  |             BeanUtils.copyProperties(collectOrderBiz, collectOrderBizResponse); | 
			
		
	
		
		
			
				
					
					|  |  |  |             //拆零
 |  |  |  |             //查询自动赋码的code
 | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |             for (IoCollectOrderCodeAuto collectOrderCodeAuto : splitCodes) { |  |  |  |             for (IoCollectOrderCodeAuto collectOrderCodeAuto : splitCodes) { | 
			
		
	
		
		
			
				
					
					|  |  |  |                 if (IntUtil.value(collectOrderCodeAuto.getBizIdFk()) == IntUtil.value(collectOrderBiz.getId())) { |  |  |  |                 if (IntUtil.value(collectOrderCodeAuto.getBizIdFk()) == IntUtil.value(collectOrderBiz.getId())) { | 
			
		
	
		
		
			
				
					
					|  |  |  |                     collectOrderBizResponse.setSplitUdiCode(StrUtil.trimToEmpty(collectOrderBizResponse.getSplitUdiCode()) + "," + collectOrderCodeAuto.getUdiCode()); |  |  |  |                     collectOrderBizResponse.setSplitUdiCode(StrUtil.trimToEmpty(collectOrderBizResponse.getSplitUdiCode()) + "," + collectOrderCodeAuto.getUdiCode()); | 
			
		
	
		
		
			
				
					
					|  |  |  |                 } |  |  |  |                 } | 
			
		
	
		
		
			
				
					
					|  |  |  |             } |  |  |  |             } | 
			
		
	
		
		
			
				
					
					|  |  |  |             if (StrUtil.isNotEmpty(collectOrderBizResponse.getSplitUdiCode())) { |  |  |  |             //查询手动赋码的code
 | 
			
				
				
			
		
	
		
		
			
				
					
					|  |  |  |                 collectOrderBizResponse.setSplitUdiCode(collectOrderBizResponse.getSplitUdiCode().substring(1)); |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |             } |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | //            //整取
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | //            for (IoCollectOrderCodeAuto collectOrderCodeAuto : unSplitCodes) {
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | //                if (IntUtil.value(collectOrderCodeAuto.getBizIdFk()) == IntUtil.value(collectOrderBiz.getId())) {
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | //                    collectOrderBizResponse.setUnSplitUdiCode(StrUtil.trimToEmpty(collectOrderBizResponse.getUnSplitUdiCode()) + "," + collectOrderCodeAuto.getUdiCode());
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | //                }
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | //            }
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |             if (StrUtil.isNotEmpty(collectOrderBizResponse.getUnSplitUdiCode())) { |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |                 collectOrderBizResponse.setUnSplitUdiCode(collectOrderBizResponse.getUnSplitUdiCode().substring(1)); |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |             } |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |             //手动
 |  |  |  |  | 
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |             for (IoCollectOrderCodeMan collectOrderCodeMan : manList) { |  |  |  |             for (IoCollectOrderCodeMan collectOrderCodeMan : manList) { | 
			
		
	
		
		
			
				
					
					|  |  |  |                 if (IntUtil.value(collectOrderCodeMan.getBizIdFk()) == IntUtil.value(collectOrderBiz.getId())) { |  |  |  |                 if (IntUtil.value(collectOrderCodeMan.getBizIdFk()) == IntUtil.value(collectOrderBiz.getId())) { | 
			
		
	
		
		
			
				
					
					|  |  |  |                     collectOrderBizResponse.setScanUdiCode(StrUtil.trimToEmpty(collectOrderBizResponse.getScanUdiCode()) + "," + collectOrderCodeMan.getUdiCode()); |  |  |  |                     collectOrderBizResponse.setScanUdiCode(StrUtil.trimToEmpty(collectOrderBizResponse.getScanUdiCode()) + "," + collectOrderCodeMan.getUdiCode()); | 
			
		
	
		
		
			
				
					
					|  |  |  |                 } |  |  |  |                 } | 
			
		
	
		
		
			
				
					
					|  |  |  |             } |  |  |  |             } | 
			
		
	
		
		
			
				
					
					|  |  |  |             if (StrUtil.isNotEmpty(collectOrderBizResponse.getScanUdiCode())) { |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |                 collectOrderBizResponse.setScanUdiCode(collectOrderBizResponse.getScanUdiCode().substring(1)); |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |             } |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |             if (StrUtil.isNotEmpty(collectOrderBizResponse.getReplaceCode())) { |  |  |  |             if (StrUtil.isNotEmpty(collectOrderBizResponse.getReplaceCode())) { | 
			
		
	
		
		
			
				
					
					|  |  |  |                 collectOrderBizResponse.setFinishUdiCode(collectOrderBizResponse.getReplaceCode()); |  |  |  |                 collectOrderBizResponse.setFinishUdiCode(collectOrderBizResponse.getReplaceCode()); | 
			
		
	
		
		
			
				
					
					|  |  |  |             } else if (StrUtil.isNotEmpty(collectOrderBizResponse.getScanUdiCode())) { |  |  |  |             } else if (StrUtil.isNotEmpty(collectOrderBizResponse.getScanUdiCode())) { | 
			
		
	
		
		
			
				
					
					|  |  |  |                 collectOrderBizResponse.setFinishUdiCode(collectOrderBizResponse.getScanUdiCode()); |  |  |  |                 collectOrderBizResponse.setFinishUdiCode(collectOrderBizResponse.getScanUdiCode()); | 
			
		
	
		
		
			
				
					
					|  |  |  |             } else if (StrUtil.isNotEmpty(collectOrderBizResponse.getSplitUdiCode())) { |  |  |  |             } else if (StrUtil.isNotEmpty(collectOrderBizResponse.getSplitUdiCode())) { | 
			
		
	
		
		
			
				
					
					|  |  |  |                 collectOrderBizResponse.setFinishUdiCode(collectOrderBizResponse.getSplitUdiCode()); |  |  |  |                 collectOrderBizResponse.setFinishUdiCode(collectOrderBizResponse.getSplitUdiCode()); | 
			
		
	
		
		
			
				
					
					|  |  |  |             } else if (StrUtil.isNotEmpty(collectOrderBizResponse.getUnSplitUdiCode())) { |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |                 collectOrderBizResponse.setFinishUdiCode(collectOrderBizResponse.getUnSplitUdiCode()); |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |             } |  |  |  |             } | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |             collectOrderBizResponses.add(collectOrderBizResponse); |  |  |  |             collectOrderBizResponses.add(collectOrderBizResponse); | 
			
		
	
	
		
		
			
				
					|  |  | 
 |