|  |  | @ -409,10 +409,8 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode | 
			
		
	
		
		
			
				
					
					|  |  |  |                         collectOrderBiz = scanGenOrder(udiRelevanceResponses, collectOrderBizs, udiEntity, collectOrder); |  |  |  |                         collectOrderBiz = scanGenOrder(udiRelevanceResponses, collectOrderBizs, udiEntity, collectOrder); | 
			
		
	
		
		
			
				
					
					|  |  |  |                         collectOrderBiz.setOrderIdFk(collectOrder.getBillNo()); |  |  |  |                         collectOrderBiz.setOrderIdFk(collectOrder.getBillNo()); | 
			
		
	
		
		
			
				
					
					|  |  |  |                     } else { |  |  |  |                     } else { | 
			
		
	
		
		
			
				
					
					|  |  |  | //                        collectOrderBiz.setScanCount(IntUtil.value(collectOrderBiz.getScanCount()) + 1);
 |  |  |  |                         collectOrderBiz.setAddScanCount(1); | 
			
				
				
			
		
	
		
		
			
				
					
					|  |  |  | //                        collectOrderBiz.setScanActCount(IntUtil.value(collectOrderBiz.getScanActCount()) + scanCount);
 |  |  |  |                         collectOrderBiz.setAddScanActCount(scanCount); | 
			
				
				
			
		
	
		
		
			
				
					
					|  |  |  |                         collectOrderBiz.setAddScanCount(IntUtil.value(collectOrderBiz.getScanCount()) + 1); |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |                         collectOrderBiz.setAddScanActCount(IntUtil.value(collectOrderBiz.getScanActCount()) + scanCount); |  |  |  |  | 
			
		
	
		
		
	
		
		
	
		
		
			
				
					
					|  |  |  |                     } |  |  |  |                     } | 
			
		
	
		
		
			
				
					
					|  |  |  |                     break; |  |  |  |                     break; | 
			
		
	
		
		
			
				
					
					|  |  |  |                 case 2: //不插入
 |  |  |  |                 case 2: //不插入
 | 
			
		
	
	
		
		
			
				
					|  |  | @ -430,10 +428,8 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode | 
			
		
	
		
		
			
				
					
					|  |  |  |                         } |  |  |  |                         } | 
			
		
	
		
		
			
				
					
					|  |  |  |                         throw new JsonException(500, collectOrderBiz.getCpmctymc() + "扫码数量超出!"); |  |  |  |                         throw new JsonException(500, collectOrderBiz.getCpmctymc() + "扫码数量超出!"); | 
			
		
	
		
		
			
				
					
					|  |  |  |                     } |  |  |  |                     } | 
			
		
	
		
		
			
				
					
					|  |  |  | //                    collectOrderBiz.setScanCount(count);
 |  |  |  |                     collectOrderBiz.setAddScanCount(1); | 
			
				
				
			
		
	
		
		
			
				
					
					|  |  |  | //                    collectOrderBiz.setScanActCount(actCount);
 |  |  |  |                     collectOrderBiz.setAddScanActCount(scanCount); | 
			
				
				
			
		
	
		
		
			
				
					
					|  |  |  |                     collectOrderBiz.setAddScanCount(count); |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |                     collectOrderBiz.setAddScanActCount(actCount); |  |  |  |  | 
			
		
	
		
		
	
		
		
	
		
		
			
				
					
					|  |  |  |                     break; |  |  |  |                     break; | 
			
		
	
		
		
			
				
					
					|  |  |  |                 case 3: //提醒是否插入
 |  |  |  |                 case 3: //提醒是否插入
 | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
	
		
		
			
				
					|  |  | @ -461,26 +457,21 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode | 
			
		
	
		
		
			
				
					
					|  |  |  |                             } |  |  |  |                             } | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |                         } |  |  |  |                         } | 
			
		
	
		
		
			
				
					
					|  |  |  | //                        collectOrderBiz.setScanCount(count1);
 |  |  |  |                         collectOrderBiz.setAddScanCount(1); | 
			
				
				
			
		
	
		
		
			
				
					
					|  |  |  | //                        collectOrderBiz.setScanActCount(actCount1);
 |  |  |  |                         collectOrderBiz.setAddScanActCount(scanCount); | 
			
				
				
			
		
	
		
		
			
				
					
					|  |  |  |                         collectOrderBiz.setAddScanCount(count1); |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |                         collectOrderBiz.setAddScanActCount(actCount1); |  |  |  |  | 
			
		
	
		
		
	
		
		
	
		
		
			
				
					
					|  |  |  |                     } else { |  |  |  |                     } else { | 
			
		
	
		
		
			
				
					
					|  |  |  |                         if (collectOrderBiz == null) { |  |  |  |                         if (collectOrderBiz == null) { | 
			
		
	
		
		
			
				
					
					|  |  |  |                             collectOrderBiz = scanGenOrder(udiRelevanceResponses, collectOrderBizs, udiEntity, collectOrder); |  |  |  |                             collectOrderBiz = scanGenOrder(udiRelevanceResponses, collectOrderBizs, udiEntity, collectOrder); | 
			
		
	
		
		
			
				
					
					|  |  |  |                             collectOrderBiz.setOrderIdFk(collectOrder.getBillNo()); |  |  |  |                             collectOrderBiz.setOrderIdFk(collectOrder.getBillNo()); | 
			
		
	
		
		
			
				
					
					|  |  |  |                         } else { |  |  |  |                         } else { | 
			
		
	
		
		
			
				
					
					|  |  |  | //                            collectOrderBiz.setScanCount(IntUtil.value(collectOrderBiz.getScanCount()) + 1);
 |  |  |  |                             collectOrderBiz.setAddScanCount(1); | 
			
				
				
			
		
	
		
		
			
				
					
					|  |  |  | //                            collectOrderBiz.setScanActCount(IntUtil.value(collectOrderBiz.getScanActCount()) + scanCount);
 |  |  |  |                             collectOrderBiz.setAddScanActCount(scanCount); | 
			
				
				
			
		
	
		
		
			
				
					
					|  |  |  |                             collectOrderBiz.setAddScanCount(IntUtil.value(collectOrderBiz.getScanCount()) + 1); |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |                             collectOrderBiz.setAddScanActCount(IntUtil.value(collectOrderBiz.getScanActCount()) + scanCount); |  |  |  |  | 
			
		
	
		
		
	
		
		
	
		
		
			
				
					
					|  |  |  |                         } |  |  |  |                         } | 
			
		
	
		
		
			
				
					
					|  |  |  |                     } |  |  |  |                     } | 
			
		
	
		
		
			
				
					
					|  |  |  |                     break; |  |  |  |                     break; | 
			
		
	
		
		
			
				
					
					|  |  |  |                 default: |  |  |  |                 default: | 
			
		
	
		
		
			
				
					
					|  |  |  |                     break; |  |  |  |                     break; | 
			
		
	
		
		
			
				
					
					|  |  |  |             } |  |  |  |             } | 
			
		
	
		
		
			
				
					
					|  |  |  | //            collectOrderBiz.setAddScanCount(1);
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |             collectOrderBizService.insertOrUpdate(collectOrderBiz); |  |  |  |             collectOrderBizService.insertOrUpdate(collectOrderBiz); | 
			
		
	
		
		
			
				
					
					|  |  |  |         } |  |  |  |         } | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
	
		
		
			
				
					|  |  | 
 |