|  wangwei | 4a8f320746 | 4/9 代码优化1.0 | 7 months ago | 
				
					
						|  wangwei | 6936e65961 | Merge remote-tracking branch 'origin/dev_2.5_mutiscan' into dev_2.5_mutiscan # Conflicts:
#	src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java | 7 months ago | 
				
					
						|  yewj | b6d705030f | 拆零后置赋码问题 | 7 months ago | 
				
					
						|  wangwei | f9175b2f2d | 4/9 优化1.0 | 7 months ago | 
				
					
						|  yewj | c46cd4204a | 无码拆零问题 | 7 months ago | 
				
					
						|  wangwei | cfff3b7b94 | 4/8 youahu 1.6 | 7 months ago | 
				
					
						|  wangwei | b97ac405b9 | 4/8 优化1.3 追溯码采集核对 | 7 months ago | 
				
					
						|  yewj | b065f502b2 | Merge remote-tracking branch 'origin/dev_2.5_mutiscan' into dev_2.5_mutiscan | 7 months ago | 
				
					
						|  yewj | 6402d2391a | 无码类型上货控制 | 7 months ago | 
				
					
						|  wangwei | c1bf5bd8b2 | 4/8 优化选入已完成单据1.0 | 7 months ago | 
				
					
						|  wangwei | 7a1d42ce62 | Merge remote-tracking branch 'origin/dev_2.5_mutiscan' into dev_2.5_mutiscan | 7 months ago | 
				
					
						|  wangwei | dedb8d8851 | 4/8 新增单据统计页面 新增业务类型增加是否强制提交1.0 | 7 months ago | 
				
					
						|  chenhc | aa18a6658a | feat: 增加扫码冲突日志和待拆零赋码页面 | 7 months ago | 
				
					
						|  yewj | 08610634a4 | Merge branch 'dev_2.5_csconfilt' into dev_2.5_mutiscan # Conflicts:
#	src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
#	src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
#	src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java | 7 months ago | 
				
					
						|  yewj | e8b6397294 | 延时赋码问题,提交单据空单号问题 | 7 months ago | 
				
					
						|  qiuyt | 146638c6a3 | 汇总单号 判断空 | 7 months ago | 
				
					
						|  wangwei | 37f104fd2b | 4/8 退货优化1.0 | 7 months ago | 
				
					
						|  yewj | 6ae643f0d4 | 汇总单扫码校验,与单据提交校验修改 | 7 months ago | 
				
					
						|  chenhc | 621c9f4115 | feat: 汇总单号优化代码 | 7 months ago | 
				
					
						|  yewj | 6b8e839da8 | Merge branch 'dev_2.5_mutiscan' into dev_2.5_csconfilt | 7 months ago | 
				
					
						|  yewj | c59fa07587 | 退货扫码冲突 | 7 months ago | 
				
					
						|  chenhc | ce0d312ea9 | feat: 汇总单号 | 7 months ago | 
				
					
						|  yewj | 172385ad89 | 扫码冲突处理 | 7 months ago | 
				
					
						|  yewj | 29bfb16806 | 切换分支,备份 | 7 months ago | 
				
					
						|  yewj | 34d50e3d3f | 切换分支,备份 | 7 months ago | 
				
					
						|  yewj | 50f92a5efb | 后置拆零功能 | 7 months ago | 
				
					
						|  wangwei | 4710f909cc | Merge remote-tracking branch 'origin/dev_2.5_mutiscan' into dev_2.5_mutiscan | 7 months ago | 
				
					
						|  wangwei | eefbf467ce | 4/5 帅哥说帮他删掉break,不然会导致后面没有自动完成的单没有赋码 | 7 months ago | 
				
					
						|  qiuyt | 3846d1b1fa | 调用医保接口增加日志 | 7 months ago | 
				
					
						|  wangwei | 933970a05c | 4/5 扫码退货优化1.0 | 7 months ago | 
				
					
						|  qiuyt | b4c065a14f | 药品功能复制 | 7 months ago | 
				
					
						|  chenhc | 845bfafdb6 | fix: 选入药品的异常响应 | 7 months ago | 
				
					
						|  yewj | e5d446d001 | 代码备份 | 7 months ago | 
				
					
						|  yewj | ae615e8ebb | 代码备份 | 7 months ago | 
				
					
						|  yewj | c7a1cb31e2 | 代码备份 | 7 months ago | 
				
					
						|  wangwei | 5987b9a8bb | 4/4 优化1.0 | 7 months ago | 
				
					
						|  yewj | 319d163890 | 手动扫码拆零整取标志问题 | 7 months ago | 
				
					
						|  wangwei | 68c9284da2 | 4/4 扫码显示优化1.0 | 7 months ago | 
				
					
						|  yewj | 2e188d5dd6 | 扫码问题 | 7 months ago | 
				
					
						|  yewj | 20514d1e76 | 代码备份 | 7 months ago | 
				
					
						|  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 |