anthonywj
							
						 | 
						
							
							
							
							
								
							
								6b60cc0244
								
							
								
							
						 | 
						
							
							
								
								代码备份
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								b2983b6c77
								
							
								
							
						 | 
						
							
							
								
								工位搜索
							
							
							
							
							
						 | 
						
							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
							
						 | 
						
							
							
							
							
								
							
								a5c6d5b44e
								
							
								
							
						 | 
						
							
							
								
								feat: 首页复制
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								4cfe42b996
								
							
								
							
						 | 
						
							
							
								
								feat: 首页复制
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								fda2478831
								
							
								
							
						 | 
						
							
							
								
								切换分支备份
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								c268e0d067
								
							
								
							
						 | 
						
							
							
								
								feat: 库存预警
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								b481843d24
								
							
								
							
						 | 
						
							
							
								
								切换分支备份
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								5af357d158
								
							
								
							
						 | 
						
							
							
								
								专为平潭写的删除所有科室出库单据的接口
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								b30a908894
								
							
								
							
						 | 
						
							
							
								
								重写采集点代码
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								9278b88162
								
							
								
							
						 | 
						
							
							
								
								采集点代码生成
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								8f67e20d19
								
							
								
							
						 | 
						
							
							
								
								缺了个预出库队列校验
							
							
							
							
							
						 | 
						
							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
							
						 | 
						
							
							
							
							
								
							
								e3410ca4c2
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								95cd6628f5
								
							
								
							
						 | 
						
							
							
								
								8/9 药品管理字段优化,生成单据的时候设置产品类型,响应字段,带票出入库根据订单号分组过滤
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								c8c57e2f86
								
							
								
							
						 | 
						
							
							
								
								新增产品上传
							
							
							
							
							
						 | 
						
							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
							
						 | 
						
							
							
							
							
								
							
								aeffbc51ab
								
							
								
							
						 | 
						
							
							
								
								切换分支备份
							
							
							
							
							
						 | 
						
							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
							
						 | 
						
							
							
							
							
								
							
								c2b8f4bf2e
								
							
								
							
						 | 
						
							
							
								
								处方分配工位修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								0f1ee49172
								
							
								
							
						 | 
						
							
							
								
								预出库扫码修改,处方赋码修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								26d23af14a
								
							
								
							
						 | 
						
							
							
								
								8/02 选入收费项目
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								2860529256
								
							
								
							
						 | 
						
							
							
								
								feat: 处方下载
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								01d873f317
								
							
								
							
						 | 
						
							
							
								
								基础数据修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								3bf34db4f8
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								a6e0e99ec5
								
							
								
							
						 | 
						
							
							
								
								切换分支备份
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								cf6978979b
								
							
								
							
						 | 
						
							
							
								
								切换分支备份
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								4b6ac18da9
								
							
								
							
						 | 
						
							
							
								
								feat: 带票出入库明细
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								701d39e3ba
								
							
								
							
						 | 
						
							
							
								
								feat: 就诊卡
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								771886a42d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								f1cd9fd1d6
								
							
								
							
						 | 
						
							
							
								
								四级库库存查询
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								8fdd2a487d
								
							
								
							
						 | 
						
							
							
								
								feat: 带票出入库明细
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								b329488995
								
							
								
							
						 | 
						
							
							
								
								单据查看药品字典详情
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								4e21a083b2
								
							
								
							
						 | 
						
							
							
								
								新增拆零队列
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								0cc61f9f59
								
							
								
							
						 | 
						
							
							
								
								新增拆零队列
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								17b98d8ab0
								
							
								
							
						 | 
						
							
							
								
								药品信息编辑以及层级包装数量换算
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								0ec915d253
								
							
								
							
						 | 
						
							
							
								
								平潭收费出库明细
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								4409ea42e3
								
							
								
							
						 | 
						
							
							
								
								药品字典修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								791f8c09fd
								
							
								
							
						 | 
						
							
							
								
								切换分支备份,选择库存自定义界面
							
							
							
							
							
						 | 
						
							1 year ago |