wangwei
							
						 | 
						
							
							
							
							
								
							
								12070e3c36
								
							
								
							
						 | 
						
							
							
								
								9/5  第三方产品增加制剂规格和制剂单位
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								65d6d718c1
								
							
								
							
						 | 
						
							
							
								
								自动赋码逻辑修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								00788a0597
								
							
								
							
						 | 
						
							
							
								
								代码备份
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								f032261e1f
								
							
								
							
						 | 
						
							
							
								
								8/2 损耗出库库存修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								zane
							
						 | 
						
							
							
							
							
								
							
								94abad9642
								
							
								
							
						 | 
						
							
							
								
								单据上传
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								e83a0ecdb7
								
							
								
							
						 | 
						
							
							
								
								医保单据上传修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								bcbcda9ebb
								
							
								
							
						 | 
						
							
							
								
								代码备份
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								1b36ce9bb2
								
							
								
							
						 | 
						
							
							
								
								8/91 优化
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								27b1a4e5ee
								
							
								
							
						 | 
						
							
							
								
								8/31 损耗出库修改 业务类型增加 是否独占
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								ace5595719
								
							
								
							
						 | 
						
							
							
								
								fix: 是否自动赋码
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								a9c306c0a7
								
							
								
							
						 | 
						
							
							
								
								库存明细ID外键
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								f864bd6503
								
							
								
							
						 | 
						
							
							
								
								新增码替换字段
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								241f7901fc
								
							
								
							
						 | 
						
							
							
								
								8/30 损耗出库
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								6bb1edad56
								
							
								
							
						 | 
						
							
							
								
								库存添加业务类型
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								3b7b118370
								
							
								
							
						 | 
						
							
							
								
								1.待处理单据库存锁定修改,2.单据拆零出库锁定修改,3;单据上下货库存修改,4.上货后触发单据锁定
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								e80fe8c083
								
							
								
							
						 | 
						
							
							
								
								库存添加字段
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								00210b6a6b
								
							
								
							
						 | 
						
							
							
								
								8/29 业务类型修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								60e7d28ed0
								
							
								
							
						 | 
						
							
							
								
								损耗出库方式损耗方式:1:库存选入;2:扫码添加
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								b0248b2642
								
							
								
							
						 | 
						
							
							
								
								新增库存选入与扫码添加接口
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								3c4d1c16e1
								
							
								
							
						 | 
						
							
							
								
								新增损耗出库码表
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								1b214aafcb
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								983741a6ff
								
							
								
							
						 | 
						
							
							
								
								损耗出库添加库存
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								f5932c79e1
								
							
								
							
						 | 
						
							
							
								
								8/29 损耗日志
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								f03fd0f1e1
								
							
								
							
						 | 
						
							
							
								
								损耗出库添加产品
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								004e6972f8
								
							
								
							
						 | 
						
							
							
								
								新增拆零销毁出库相关方法接口
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								f4d1ef4b9b
								
							
								
							
						 | 
						
							
							
								
								新增拆零销毁出库相关方法接口
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								7cfe54fa39
								
							
								
							
						 | 
						
							
							
								
								8/28 药品数据维护第三方药品
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								204f95f610
								
							
								
							
						 | 
						
							
							
								
								fix: 库存预警修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								zane
							
						 | 
						
							
							
							
							
								
							
								42628fd6b7
								
							
								
							
						 | 
						
							
							
								
								库存预警
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								2e2ac0116e
								
							
								
							
						 | 
						
							
							
								
								生成库存统计表
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								a40ad38414
								
							
								
							
						 | 
						
							
							
								
								补充库存字段
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								c14d32bf57
								
							
								
							
						 | 
						
							
							
								
								耗材字典使用单元,流通单元等配置修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								0c9c81bc49
								
							
								
							
						 | 
						
							
							
								
								操作码明细更新
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								fa80a765a5
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								7542711f97
								
							
								
							
						 | 
						
							
							
								
								库存问题
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								12ad4f6e00
								
							
								
							
						 | 
						
							
							
								
								8/26 追溯码查询 以及工位bug修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								c9df2458cc
								
							
								
							
						 | 
						
							
							
								
								fix: 单据库存预警字段
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								5bccbd41cc
								
							
								
							
						 | 
						
							
							
								
								fix: 自动分配工位存量到单据明细
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								4a79d728e2
								
							
								
							
						 | 
						
							
							
								
								8/26 耗材加入工位预警数量 是否拆零
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								5e215abf0a
								
							
								
							
						 | 
						
							
							
								
								库存详情
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								zane
							
						 | 
						
							
							
							
							
								
							
								6a37fede1f
								
							
								
							
						 | 
						
							
							
								
								置顶 排序时间
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								201d03bf4e
								
							
								
							
						 | 
						
							
							
								
								扫码作业问题
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								b1eca2aab3
								
							
								
							
						 | 
						
							
							
								
								代码备份
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								4dac4209af
								
							
								
							
						 | 
						
							
							
								
								后端相关修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								1360a8463c
								
							
								
							
						 | 
						
							
							
								
								feat: 单据备注字段
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								d71bb120f8
								
							
								
							
						 | 
						
							
							
								
								单据流程修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								e7fbdab3c0
								
							
								
							
						 | 
						
							
							
								
								拆零整取数量重新计算
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								9609d4a343
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								6ae6c1c329
								
							
								
							
						 | 
						
							
							
								
								8/22 现场管理工位调整,单据
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								f79c6de737
								
							
								
							
						 | 
						
							
							
								
								数据初始化计算计量单元数量
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								88513a51f4
								
							
								
							
						 | 
						
							
							
								
								feat: 修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								1150a2bec9
								
							
								
							
						 | 
						
							
							
								
								feat: 修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								1bb1291753
								
							
								
							
						 | 
						
							
							
								
								8/20 工位绑定单据类型
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								e04b28efe1
								
							
								
							
						 | 
						
							
							
								
								代码备份
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								2284b641b7
								
							
								
							
						 | 
						
							
							
								
								feat: 修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								1a3d5dbc9a
								
							
								
							
						 | 
						
							
							
								
								代码备份
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								44b8a8d04b
								
							
								
							
						 | 
						
							
							
								
								代码备份
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								243a6c3be9
								
							
								
							
						 | 
						
							
							
								
								feat: 修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								8abe46cd10
								
							
								
							
						 | 
						
							
							
								
								优化 绑定工位
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								f32ac0d5a7
								
							
								
							
						 | 
						
							
							
								
								单据生成问题
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								fed1c4174d
								
							
								
							
						 | 
						
							
							
								
								调整工位单据类型维护 1.0 8/17
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								5e7af56b93
								
							
								
							
						 | 
						
							
							
								
								自动拆零查询详情
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								e9b939e99d
								
							
								
							
						 | 
						
							
							
								
								单据拆零赋码优化修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								7a219014e1
								
							
								
							
						 | 
						
							
							
								
								7/11 优化工位
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								21e3e4e4d7
								
							
								
							
						 | 
						
							
							
								
								自动拆零问题
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								595651c193
								
							
								
							
						 | 
						
							
							
								
								1.2 增加往来单位类型
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								70c109e0ee
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								d79001655c
								
							
								
							
						 | 
						
							
							
								
								代码备份
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								67726020ec
								
							
								
							
						 | 
						
							
							
								
								8/15 搜索用户加入仓库字段
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								dcd227d367
								
							
								
							
						 | 
						
							
							
								
								校验方式修改,1.三期,无三期,扫码单生成业务单,等一些功能修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								4cbd788597
								
							
								
							
						 | 
						
							
							
								
								备份
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								6b60cc0244
								
							
								
							
						 | 
						
							
							
								
								代码备份
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								0a28aa21f6
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								4db6d15acf
								
							
								
							
						 | 
						
							
							
								
								工位管理
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								2ff822c07a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								904e8a9950
								
							
								
							
						 | 
						
							
							
								
								8/14 工位单据管理
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								b697699668
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo_z
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java
#	src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java
#	src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java
#	src/main/java/com/glxp/api/req/inv/FilterInvProductRequest.java
#	src/main/java/com/glxp/api/res/inv/InvProductResponse.java
#	src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java
#	src/main/resources/application-dev.yml
#	src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
#	src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
#	src/main/resources/mybatis/mapper/inv/invProductDao.xml
#	src/main/resources/schemas/schema_v2.4.sql 
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								4cfe42b996
								
							
								
							
						 | 
						
							
							
								
								feat: 首页复制
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								c268e0d067
								
							
								
							
						 | 
						
							
							
								
								feat: 库存预警
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								b30a908894
								
							
								
							
						 | 
						
							
							
								
								重写采集点代码
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								9278b88162
								
							
								
							
						 | 
						
							
							
								
								采集点代码生成
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								bae3fb9c30
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								d4e2b85982
								
							
								
							
						 | 
						
							
							
								
								拆零优化
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								b757ab2ffb
								
							
								
							
						 | 
						
							
							
								
								8/12 药品字段数据
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								d96d75634f
								
							
								
							
						 | 
						
							
							
								
								切换分支备份
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								7e021afe6e
								
							
								
							
						 | 
						
							
							
								
								药品扫码相关修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								e645d38789
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql 
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								e7d743faa0
								
							
								
							
						 | 
						
							
							
								
								切换分支备份
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								f9a09de847
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql 
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								dfe7b8769e
								
							
								
							
						 | 
						
							
							
								
								8/8 药品搜索字段以及插入字段维护
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								274aefa911
								
							
								
							
						 | 
						
							
							
								
								处方相关修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								0f1ee49172
								
							
								
							
						 | 
						
							
							
								
								预出库扫码修改,处方赋码修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								3bf34db4f8
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								cf6978979b
								
							
								
							
						 | 
						
							
							
								
								切换分支备份
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								701d39e3ba
								
							
								
							
						 | 
						
							
							
								
								feat: 就诊卡
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								0cc61f9f59
								
							
								
							
						 | 
						
							
							
								
								新增拆零队列
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								17b98d8ab0
								
							
								
							
						 | 
						
							
							
								
								药品信息编辑以及层级包装数量换算
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								0ec915d253
								
							
								
							
						 | 
						
							
							
								
								平潭收费出库明细
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								4409ea42e3
								
							
								
							
						 | 
						
							
							
								
								药品字典修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								58a8377531
								
							
								
							
						 | 
						
							
							
								
								7/29 1.1 更改药品
							
							
							
							
							
						 | 
						
							1 year ago |