yewj
							
						 | 
						
							
							
							
							
								
							
								0b50dafd8e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_2.5_scan' into dev_2.5_mutiscan
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/java/com/glxp/api/task/SyncHeartService.java 
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								17bbaef1d7
								
							
								
							
						 | 
						
							
							
								
								扫码重复,单据下载多线程问题,
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								qiuyt
							
						 | 
						
							
							
							
							
								
							
								c4d5c0c92c
								
							
								
							
						 | 
						
							
							
								
								获取关联关系所有码
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								4ce7bcb950
								
							
								
							
						 | 
						
							
							
								
								feat: 同步任务和线程池参数的自定义配置
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								7415b0c02d
								
							
								
							
						 | 
						
							
							
								
								代码备份
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								da6eb90bdb
								
							
								
							
						 | 
						
							
							
								
								扫码校验非此单产品
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								qiuyt
							
						 | 
						
							
							
							
							
								
							
								712461142e
								
							
								
							
						 | 
						
							
							
								
								优化
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								qiuyt
							
						 | 
						
							
							
							
							
								
							
								1a6a39d1a4
								
							
								
							
						 | 
						
							
							
								
								优化
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								81d6f8e2c2
								
							
								
							
						 | 
						
							
							
								
								优化1.3
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								423debcf86
								
							
								
							
						 | 
						
							
							
								
								扫码上货问题,拉单优化
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								816a071c79
								
							
								
							
						 | 
						
							
							
								
								库存批次问题,扫码问题,扫码冲突问题
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								48a37c363c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_2.5_scan' into dev_2.5_scan
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								bc6446ae9f
								
							
								
							
						 | 
						
							
							
								
								入库修改
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								qiuyt
							
						 | 
						
							
							
							
							
								
							
								8ba83e5c57
								
							
								
							
						 | 
						
							
							
								
								优化
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								d9195fef7b
								
							
								
							
						 | 
						
							
							
								
								、采购单据修改
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								f7138b90dd
								
							
								
							
						 | 
						
							
							
								
								4/1 单据未对照处理
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								b1d66c1c54
								
							
								
							
						 | 
						
							
							
								
								feat: 优化单据存在未对照产品提示
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								791311fe99
								
							
								
							
						 | 
						
							
							
								
								4/1 优化退货1.0
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								f0dcbf0717
								
							
								
							
						 | 
						
							
							
								
								feat: 建阳入账库报表
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								4853a96313
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_2.5_scan' into dev_2.5_scan
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java 
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								2a3cc2f59a
								
							
								
							
						 | 
						
							
							
								
								完成单据提交,提示
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								5a93342a61
								
							
								
							
						 | 
						
							
							
								
								feat: 采集数量提示
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								a234c88796
								
							
								
							
						 | 
						
							
							
								
								feat: 采集数量提示
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								154f6de244
								
							
								
							
						 | 
						
							
							
								
								feat: 盘点补丁
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								244c1f4d11
								
							
								
							
						 | 
						
							
							
								
								feat: 优化提示
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								qiuyt
							
						 | 
						
							
							
							
							
								
							
								992db539c9
								
							
								
							
						 | 
						
							
							
								
								无码库定时优化 补齐三期优化
							
							
							
							
							
							
							
							上传医保优化 
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								f9b1879a3a
								
							
								
							
						 | 
						
							
							
								
								拉取单据问题
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								2660556a2c
								
							
								
							
						 | 
						
							
							
								
								3/30 单据退货 和 统计页面
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								477b0c86a3
								
							
								
							
						 | 
						
							
							
								
								feat: 通过发票获取单据
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								ec864a735a
								
							
								
							
						 | 
						
							
							
								
								上传医保
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								b8623cc49f
								
							
								
							
						 | 
						
							
							
								
								feat: 阳采
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								f02e23e532
								
							
								
							
						 | 
						
							
							
								
								feat: 阳采
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								5c6bc7f430
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_2.5_scan' into dev_2.5_scan
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								0526213b63
								
							
								
							
						 | 
						
							
							
								
								feat: 阳采
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								c8a1472553
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_2.5_scan' into dev_2.5_scan
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								f3763d28b5
								
							
								
							
						 | 
						
							
							
								
								待处理单据
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								qiuyt
							
						 | 
						
							
							
							
							
								
							
								d463916154
								
							
								
							
						 | 
						
							
							
								
								自动赋码补充批次号
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								ecb3110b1e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_2.5_scan' into dev_2.5_scan
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								771aa6ba5f
								
							
								
							
						 | 
						
							
							
								
								feat: 阳采
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								16bade660a
								
							
								
							
						 | 
						
							
							
								
								扫码重复提交
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								qiuyt
							
						 | 
						
							
							
							
							
								
							
								c383b5632e
								
							
								
							
						 | 
						
							
							
								
								建阳-库存问题
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								qiuyt
							
						 | 
						
							
							
							
							
								
							
								69d9b1fe14
								
							
								
							
						 | 
						
							
							
								
								补齐码
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								qiuyt
							
						 | 
						
							
							
							
							
								
							
								3a9c19fd7a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_2.5_scan' of http://116.204.71.86:3000/UDI/udi-wms-java into dev_2.5_scan
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								qiuyt
							
						 | 
						
							
							
							
							
								
							
								48920c1d9f
								
							
								
							
						 | 
						
							
							
								
								补齐码
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								49142d5183
								
							
								
							
						 | 
						
							
							
								
								重复提交
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								77ff8ea85d
								
							
								
							
						 | 
						
							
							
								
								3/28 处理单据优化1.0
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								be27747962
								
							
								
							
						 | 
						
							
							
								
								ID重复问题
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								ef43ef193f
								
							
								
							
						 | 
						
							
							
								
								药品出入库单批量扫码问题
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								qiuyt
							
						 | 
						
							
							
							
							
								
							
								c5cfb3740a
								
							
								
							
						 | 
						
							
							
								
								定时获取工位库存码三期
							
							
							
							
							
						 | 
						
							7 months ago | 
						
					
				
					
						
							
							
								 
								qiuyt
							
						 | 
						
							
							
							
							
								
							
								a75251df93
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_2.5_scan' into dev_2.5_scan
							
							
							
							
							
						 | 
						
							7 months ago |