qyt
							
						 | 
						
							
							
							
							
								
							
								2df7c3fb94
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_fifo_z' of http://116.204.71.86:3000/UDI/udi-wms-java into dev_fifo_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								a0dba60a33
								
							
								
							
						 | 
						
							
							
								
								feat: 码明细
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								321d4ad85e
								
							
								
							
						 | 
						
							
							
								
								选单搜索
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								qyt
							
						 | 
						
							
							
							
							
								
							
								589e368744
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_no_inv' into dev_fifo_z
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java 
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								qyt
							
						 | 
						
							
							
							
							
								
							
								bef6e840ce
								
							
								
							
						 | 
						
							
							
								
								UdiTraceController 接口兼容修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								9f46579a9d
								
							
								
							
						 | 
						
							
							
								
								查询码明细修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								4d4e4e8760
								
							
								
							
						 | 
						
							
							
								
								feat: 内网拉取外网单据
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								7d4e190b05
								
							
								
							
						 | 
						
							
							
								
								单据完成修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								a17b725415
								
							
								
							
						 | 
						
							
							
								
								feat: 拉取外网单据
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								e3f53aabac
								
							
								
							
						 | 
						
							
							
								
								代码备份
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								qyt
							
						 | 
						
							
							
							
							
								
							
								3813dd8295
								
							
								
							
						 | 
						
							
							
								
								仓库逻辑改变仓库详情的逻辑都改成仓库表(第一次更新)
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								5662dc31d6
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								f42eaebbb6
								
							
								
							
						 | 
						
							
							
								
								代码备份
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								d23572b7cf
								
							
								
							
						 | 
						
							
							
								
								10/21 同步单据修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								ffe80daf04
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								afed3289bd
								
							
								
							
						 | 
						
							
							
								
								选择已完成单据问题
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								c6bbaf8b3b
								
							
								
							
						 | 
						
							
							
								
								工位上货问题
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								c2b0c69ef3
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								5f915dffe2
								
							
								
							
						 | 
						
							
							
								
								工位上货问题
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								d4e0b66ff4
								
							
								
							
						 | 
						
							
							
								
								feat: 药品关联信息
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								f614074665
								
							
								
							
						 | 
						
							
							
								
								器械扫码拆零问题
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								86ba1f0dfe
								
							
								
							
						 | 
						
							
							
								
								器械扫码拆零问题
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								43c5b1923f
								
							
								
							
						 | 
						
							
							
								
								feat: 修复
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								86f229fd69
								
							
								
							
						 | 
						
							
							
								
								feat: 修复
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								0c7008a8b7
								
							
								
							
						 | 
						
							
							
								
								feat: 药品关联关系是否存在
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								714531279f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								b3291be59c
								
							
								
							
						 | 
						
							
							
								
								拆零管理大改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								3f2f2edf30
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								e66332e4fb
								
							
								
							
						 | 
						
							
							
								
								feat: 药品关联信息上下传输功能
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								2a1ff42fe7
								
							
								
							
						 | 
						
							
							
								
								10/17 代码备份1.0
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								29bfdc9725
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								f6fbc4272b
								
							
								
							
						 | 
						
							
							
								
								器械层级修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								61e784aca3
								
							
								
							
						 | 
						
							
							
								
								10/17 单据增加单据类型(器械/药品)基础数据器械响应优化
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								081bf3c658
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								bfaae7675e
								
							
								
							
						 | 
						
							
							
								
								feat: 药品关联关系功能
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								987fb774c0
								
							
								
							
						 | 
						
							
							
								
								药品暂时不校验序列号,有bug,药品扫码序列号没有识别到
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								cd2f580e0a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								08c4123483
								
							
								
							
						 | 
						
							
							
								
								库存拆零
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								dcfa320847
								
							
								
							
						 | 
						
							
							
								
								fix: 拉取外网药品关联信息
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								qyt
							
						 | 
						
							
							
							
							
								
							
								fa02aaa439
								
							
								
							
						 | 
						
							
							
								
								1、耗材字典信息表 备注有误修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								d313d19f35
								
							
								
							
						 | 
						
							
							
								
								删除库存明细
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								df00fdc69e
								
							
								
							
						 | 
						
							
							
								
								10/15 基础数据 器械优化
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								5387561d2b
								
							
								
							
						 | 
						
							
							
								
								器械工位上货等相关问题修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								23e199af6d
								
							
								
							
						 | 
						
							
							
								
								fix: 修复原始单据下载本地单据
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								77b0bb79ce
								
							
								
							
						 | 
						
							
							
								
								fix: 修复原始单据下载本地单据
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								a250ce1700
								
							
								
							
						 | 
						
							
							
								
								备份
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								0c21bd46a3
								
							
								
							
						 | 
						
							
							
								
								fix: 修复
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								qyt
							
						 | 
						
							
							
							
							
								
							
								a8b853ef96
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_fifo_z' of http://116.204.71.86:3000/UDI/udi-wms-java into dev_fifo_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								qyt
							
						 | 
						
							
							
							
							
								
							
								8927680db7
								
							
								
							
						 | 
						
							
							
								
								1、增加流通层级默认值为1
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								432882d8ff
								
							
								
							
						 | 
						
							
							
								
								fix: 修复
							
							
							
							
							
						 | 
						
							1 year ago |