chenhc
							
						 | 
						
							
							
							
							
								
							
								79c5ac8ef4
								
							
								
							
						 | 
						
							
							
								
								feat: 代码保存
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								17c2f222e5
								
							
								
							
						 | 
						
							
							
								
								高值出库明细生成库存校验等
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								38257800c0
								
							
								
							
						 | 
						
							
							
								
								高值出库明细生成单据优化
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								13ac0d742f
								
							
								
							
						 | 
						
							
							
								
								普耗,收费出库生成单据优化
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								e685fb17dc
								
							
								
							
						 | 
						
							
							
								
								往来类型为患者,根据患者进行拆单
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								ddb5a981a4
								
							
								
							
						 | 
						
							
							
								
								收费明细添加供应商ID
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								207f3324d4
								
							
								
							
						 | 
						
							
							
								
								项目组套新增供应商ID
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								a706fd8952
								
							
								
							
						 | 
						
							
							
								
								添加供应商是否关联校验
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								2053441176
								
							
								
							
						 | 
						
							
							
								
								登录界面标题配置
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								394ee7e585
								
							
								
							
						 | 
						
							
							
								
								feat: 高耗码校验 代码todo
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								ab3f8f57c6
								
							
								
							
						 | 
						
							
							
								
								feat: 高耗生成码校验 代码todo
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								fe1aa8230a
								
							
								
							
						 | 
						
							
							
								
								feat: 三方出入库明细功能优化url获取
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								8e68e2d8d2
								
							
								
							
						 | 
						
							
							
								
								feat: 三方出入库明细功能
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								9e75867541
								
							
								
							
						 | 
						
							
							
								
								feat: 三方出入库明细功能
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								eea1eab737
								
							
								
							
						 | 
						
							
							
								
								ThrInvResultResponse 字段修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								1f116efd92
								
							
								
							
						 | 
						
							
							
								
								feat: 三方出入库明细功能
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								8c0e5a73ba
								
							
								
							
						 | 
						
							
							
								
								feat: 三方出入库明细功能
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								96dba85918
								
							
								
							
						 | 
						
							
							
								
								feat: 三方出入库明细功能
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								d4ac5e9fcf
								
							
								
							
						 | 
						
							
							
								
								feat: 增加产品-产品属性字段
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								9b652cd815
								
							
								
							
						 | 
						
							
							
								
								feat: 保存代码
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								c3c232ccf8
								
							
								
							
						 | 
						
							
							
								
								ThrInvResultResponse 字段修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								f9dc77b126
								
							
								
							
						 | 
						
							
							
								
								feat: 删除测试代码
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								63958a1963
								
							
								
							
						 | 
						
							
							
								
								feat: 删除测试代码
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								4db974d0df
								
							
								
							
						 | 
						
							
							
								
								feat: 代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								eb02f7b4cc
								
							
								
							
						 | 
						
							
							
								
								Merge branch '20231126-yw' into dev_ksck
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java
#	src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java
#	src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								8a1f122230
								
							
								
							
						 | 
						
							
							
								
								feat: 代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								c30ba149f9
								
							
								
							
						 | 
						
							
							
								
								切换分支备份
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								da429ea7dc
								
							
								
							
						 | 
						
							
							
								
								feat: 产品新增
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								a0b6eb4b27
								
							
								
							
						 | 
						
							
							
								
								新增产品字典字段补齐
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								9e79e7cda9
								
							
								
							
						 | 
						
							
							
								
								Merge branch '20231126-yw' into dev_ksck
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/java/com/glxp/api/dao/thrsys/ThrInvOrderDetailMapper.java
#	src/main/java/com/glxp/api/dao/thrsys/ThrInvOrderMapper.java
#	src/main/java/com/glxp/api/service/thrsys/ThrInvOrderDetailService.java
#	src/main/java/com/glxp/api/service/thrsys/ThrInvOrderService.java
#	src/main/resources/mybatis/mapper/thrsys/ThrInvOrderDetailMapper.xml
#	src/main/resources/mybatis/mapper/thrsys/ThrInvOrderMapper.xml 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								1aa81fe5de
								
							
								
							
						 | 
						
							
							
								
								科室出库,集采拆单
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								85c9db2ae5
								
							
								
							
						 | 
						
							
							
								
								feat: 项目组套和三方出入库明细
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								2de35f3091
								
							
								
							
						 | 
						
							
							
								
								feat: 项目组套和三方出入库明细
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								34ac7603bd
								
							
								
							
						 | 
						
							
							
								
								Merge branch '20231126-yw' into dev_ksck
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								e3fc4cd3dc
								
							
								
							
						 | 
						
							
							
								
								第三方出入库明细
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								a20becfb13
								
							
								
							
						 | 
						
							
							
								
								feat: 耗材字典新增功能
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								be5ce3104b
								
							
								
							
						 | 
						
							
							
								
								新增产品属性
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								584bbcaed6
								
							
								
							
						 | 
						
							
							
								
								临床使用出库修改,新增采购类型,使用出库拆单补单等
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								a83523fe58
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								87600e2b3e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_price' into dev_price
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								6c859a9470
								
							
								
							
						 | 
						
							
							
								
								fix: 修复临床出库过滤库存数0的供应商
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								ea708c5303
								
							
								
							
						 | 
						
							
							
								
								预验收库存校验问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								fa6aaa0fe6
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/20231126-yw' into 20231126-yw
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								yuanwei
							
						 | 
						
							
							
							
							
								
							
								65cd5b0ec5
								
							
								
							
						 | 
						
							
							
								
								合并冲突
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								yuanwei
							
						 | 
						
							
							
							
							
								
							
								7a74235bcd
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								04f790caf8
								
							
								
							
						 | 
						
							
							
								
								单据重复上传问题,东山第三方产品信息新增库房代码
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								6b22bfb862
								
							
								
							
						 | 
						
							
							
								
								第三方产品信息过滤问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								yuanwei
							
						 | 
						
							
							
							
							
								
							
								7ffe727deb
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								04534e3f43
								
							
								
							
						 | 
						
							
							
								
								第三方产品信息过滤问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								805c82e972
								
							
								
							
						 | 
						
							
							
								
								新增生产企业字典维护
							
							
							
							
							
						 | 
						
							2 years ago |