chenhc
							
						 | 
						
							
							
							
							
								
							
								d6a9524e11
								
							
								
							
						 | 
						
							
							
								
								fix:修复
							
							
							
							
							
						 | 
						
							10 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								eb24096db7
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							10 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								7ef9325c75
								
							
								
							
						 | 
						
							
							
								
								12/26 药品查询优化
							
							
							
							
							
						 | 
						
							10 months ago | 
						
					
				
					
						
							
							
								 
								qiuyt
							
						 | 
						
							
							
							
							
								
							
								64f3440afd
								
							
								
							
						 | 
						
							
							
								
								下载三方错误
							
							
							
							
							
						 | 
						
							10 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								691eb0b9b2
								
							
								
							
						 | 
						
							
							
								
								12/26 单据审核放弃接口
							
							
							
							
							
						 | 
						
							10 months ago | 
						
					
				
					
						
							
							
								 
								qiuyt
							
						 | 
						
							
							
							
							
								
							
								40e9108d9e
								
							
								
							
						 | 
						
							
							
								
								选入药品层级查询就不查询国家库了  本地查不到直接去阿里拉
							
							
							
							
							
						 | 
						
							10 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								36eb5ad134
								
							
								
							
						 | 
						
							
							
								
								器械拆零问题
							
							
							
							
							
						 | 
						
							10 months ago | 
						
					
				
					
						
							
							
								 
								qiuyt
							
						 | 
						
							
							
							
							
								
							
								dea6b0a780
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_fifo_z' of http://116.204.71.86:3000/UDI/udi-wms-java into dev_fifo_z
							
							
							
							
							
						 | 
						
							10 months ago | 
						
					
				
					
						
							
							
								 
								qiuyt
							
						 | 
						
							
							
							
							
								
							
								03fd8680bf
								
							
								
							
						 | 
						
							
							
								
								从供应商选入药品选入药品层级功能搬到内网
							
							
							
							
							
						 | 
						
							10 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								e50dd6fc73
								
							
								
							
						 | 
						
							
							
								
								feat: 增加发药机的接口对接
							
							
							
							
							
						 | 
						
							10 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								4b48e22345
								
							
								
							
						 | 
						
							
							
								
								feat: 增加发药机的接口对接
							
							
							
							
							
						 | 
						
							10 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								6c9ca5f0d7
								
							
								
							
						 | 
						
							
							
								
								切换分支备份
							
							
							
							
							
						 | 
						
							10 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								52b59b52f4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								3889e77a2c
								
							
								
							
						 | 
						
							
							
								
								工位上货与医保校验相关调整
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								1f791a88e7
								
							
								
							
						 | 
						
							
							
								
								12/23 同步基础数据供应商关联产品呢基础数据1.0
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								qiuyt
							
						 | 
						
							
							
							
							
								
							
								5c04226f78
								
							
								
							
						 | 
						
							
							
								
								1、从供应商选入药品搬到内网
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								f40fca4468
								
							
								
							
						 | 
						
							
							
								
								医保校验
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								1495828521
								
							
								
							
						 | 
						
							
							
								
								医保校验
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								458bf6c817
								
							
								
							
						 | 
						
							
							
								
								补齐checkCode
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								9c5cd64033
								
							
								
							
						 | 
						
							
							
								
								有三期业务单校验改成不校验三期
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								2ba951a513
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								e4433e186a
								
							
								
							
						 | 
						
							
							
								
								扫码问题,器械处方扫码教研问题
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								be0957369b
								
							
								
							
						 | 
						
							
							
								
								12/23 优化
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								daf13f9990
								
							
								
							
						 | 
						
							
							
								
								层级数量换算
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								0d3aa74cda
								
							
								
							
						 | 
						
							
							
								
								自动上货分配槽位
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								d2013db891
								
							
								
							
						 | 
						
							
							
								
								12/20 发票优化
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								e492e33b3b
								
							
								
							
						 | 
						
							
							
								
								12/20 bug修改 现场管理
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								qiuyt
							
						 | 
						
							
							
							
							
								
							
								491256236d
								
							
								
							
						 | 
						
							
							
								
								1、器械拉数据时间格式问题
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								b455c8c6c1
								
							
								
							
						 | 
						
							
							
								
								12/19 界面优化1.0
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								68057172b7
								
							
								
							
						 | 
						
							
							
								
								12/19 字段优化1
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								d21c96facb
								
							
								
							
						 | 
						
							
							
								
								12/19 多余的优化1.0
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								030b7815bd
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								5ebda61a81
								
							
								
							
						 | 
						
							
							
								
								代码备份
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								2d01beb4bb
								
							
								
							
						 | 
						
							
							
								
								12/16 器械选入规格型号字段1.0
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								0256dbf20b
								
							
								
							
						 | 
						
							
							
								
								修改单据
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								7520e93a91
								
							
								
							
						 | 
						
							
							
								
								12/13 码校验调整1.0
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								a987057b46
								
							
								
							
						 | 
						
							
							
								
								单据完成后自动上传
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								71c198668f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql 
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								1dfabbdc42
								
							
								
							
						 | 
						
							
							
								
								12/12 已完成单据 详情优化
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								0f26f7f4d4
								
							
								
							
						 | 
						
							
							
								
								fix: 工位单据类型增加是否上传医保参数
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								920379f15f
								
							
								
							
						 | 
						
							
							
								
								单据上传
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								72699ee8fc
								
							
								
							
						 | 
						
							
							
								
								12/12 字段优化1.0
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								d565cf640e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								c18d4a907c
								
							
								
							
						 | 
						
							
							
								
								单据上传
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								74501c23ce
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								4975422c12
								
							
								
							
						 | 
						
							
							
								
								修改带校验,库存等
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								0e70cb18eb
								
							
								
							
						 | 
						
							
							
								
								12/12 代码备份 扫码校验1.0
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								b12d1e0a11
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								62dec41a67
								
							
								
							
						 | 
						
							
							
								
								处方按照队列取货
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								qiuyt
							
						 | 
						
							
							
							
							
								
							
								54eeaa4d4f
								
							
								
							
						 | 
						
							
							
								
								1、医保上传转换问题 怎么样都是失败问题
							
							
							
							
							
						 | 
						
							11 months ago |