chenhc
							
						 | 
						
							
							
							
							
								
							
								11270c57dc
								
							
								
							
						 | 
						
							
							
								
								feat: 第三方明细下载增加字段
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								26ae4069bc
								
							
								
							
						 | 
						
							
							
								
								feat: 科室医保分类功能
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								879b532494
								
							
								
							
						 | 
						
							
							
								
								dev_ksck → origin/dev_ksck
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								f4bcdbb267
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								a58e9e6229
								
							
								
							
						 | 
						
							
							
								
								盘点修改,审核重复提交问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								a273cbce06
								
							
								
							
						 | 
						
							
							
								
								feat: 部门与医保耗材信息分类接口开发
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								961bd20bbc
								
							
								
							
						 | 
						
							
							
								
								feat: 部门与医保耗材信息分类关联关系初始化
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								600dc8edf8
								
							
								
							
						 | 
						
							
							
								
								盘点问题,service类生成
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								e7ae556f8d
								
							
								
							
						 | 
						
							
							
								
								新增配送产品,申请与审核,创建后回填
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								5e62af17e7
								
							
								
							
						 | 
						
							
							
								
								平潭收费生成单据问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								4b5be8fb3b
								
							
								
							
						 | 
						
							
							
								
								feat: 增加定时扫描三方的明细表-生成单据
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								d1743d12b4
								
							
								
							
						 | 
						
							
							
								
								feat: 增加定时扫描三方的明细表-生成单据
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								b50b981c65
								
							
								
							
						 | 
						
							
							
								
								feat: 增加页面的医保耗材信息调用功能
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								371c37c35f
								
							
								
							
						 | 
						
							
							
								
								feat: 设备管理-卡片开发
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								255b6f1826
								
							
								
							
						 | 
						
							
							
								
								feat: 设备管理开发
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								07be51ee6f
								
							
								
							
						 | 
						
							
							
								
								feat: 审核开关-业务页面修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								9acdef9af4
								
							
								
							
						 | 
						
							
							
								
								feat: 审核开关
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								e6b51b0637
								
							
								
							
						 | 
						
							
							
								
								收费项目添加价格与计量单位
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								45b7fad953
								
							
								
							
						 | 
						
							
							
								
								feat: 审核流程配置功能-sql删除
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								54d3d3244a
								
							
								
							
						 | 
						
							
							
								
								feat: 审核流程配置功能
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								79496895ad
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_20240306' into dev_fifo
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								778258acec
								
							
								
							
						 | 
						
							
							
								
								第三方出库明细
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								1551cd46e2
								
							
								
							
						 | 
						
							
							
								
								长泰添加异常UDI码
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								53585f97a6
								
							
								
							
						 | 
						
							
							
								
								新增耗材分类
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								04cbe6afc8
								
							
								
							
						 | 
						
							
							
								
								业务单生成扫码单执行先进先出原则
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								8c150bdd3b
								
							
								
							
						 | 
						
							
							
								
								出入库明细下载问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								79c5ac8ef4
								
							
								
							
						 | 
						
							
							
								
								feat: 代码保存
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								207f3324d4
								
							
								
							
						 | 
						
							
							
								
								项目组套新增供应商ID
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								a706fd8952
								
							
								
							
						 | 
						
							
							
								
								添加供应商是否关联校验
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								9e75867541
								
							
								
							
						 | 
						
							
							
								
								feat: 三方出入库明细功能
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								1f116efd92
								
							
								
							
						 | 
						
							
							
								
								feat: 三方出入库明细功能
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								8c0e5a73ba
								
							
								
							
						 | 
						
							
							
								
								feat: 三方出入库明细功能
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								96dba85918
								
							
								
							
						 | 
						
							
							
								
								feat: 三方出入库明细功能
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								9b652cd815
								
							
								
							
						 | 
						
							
							
								
								feat: 保存代码
							
							
							
							
							
						 | 
						
							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 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								 
								yuanwei
							
						 | 
						
							
							
							
							
								
							
								7a74235bcd
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								04f790caf8
								
							
								
							
						 | 
						
							
							
								
								单据重复上传问题,东山第三方产品信息新增库房代码
							
							
							
							
							
						 | 
						
							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
							
						 | 
						
							
							
							
							
								
							
								805c82e972
								
							
								
							
						 | 
						
							
							
								
								新增生产企业字典维护
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								1ed3360997
								
							
								
							
						 | 
						
							
							
								
								新增第三方生产企业
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								c065ed3a6d
								
							
								
							
						 | 
						
							
							
								
								集采拆单问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								d970162fca
								
							
								
							
						 | 
						
							
							
								
								库存对比修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								640e3ed137
								
							
								
							
						 | 
						
							
							
								
								校验后处方结果保存
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								bc4b627077
								
							
								
							
						 | 
						
							
							
								
								患者信息远程下载,提供中医院设备查询界面
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								77525665e9
								
							
								
							
						 | 
						
							
							
								
								设备入库,变更,销毁等修改,自定义汇总统修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								5fad9e2835
								
							
								
							
						 | 
						
							
							
								
								新增自定义库存明细汇总
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								f6ecc65386
								
							
								
							
						 | 
						
							
							
								
								患者处方相关修改优化
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								d345794cdb
								
							
								
							
						 | 
						
							
							
								
								患者处方相关修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								c73e2bf1f2
								
							
								
							
						 | 
						
							
							
								
								第三方接口修改,第三接口容错处理,患者信息相关修改,单据类型患者相关修改,临床出库患者信息选择,是否对照处方等相关配置
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								5f110bea39
								
							
								
							
						 | 
						
							
							
								
								患者处方相关修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								1df50657b0
								
							
								
							
						 | 
						
							
							
								
								设备相关
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								27cc68ff98
								
							
								
							
						 | 
						
							
							
								
								新增库存出库模式,总库库存,上级库存,当前库存
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								yuanwei
							
						 | 
						
							
							
							
							
								
							
								b5108288a5
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								be1475a5da
								
							
								
							
						 | 
						
							
							
								
								新增库存出库模式,总库库存,上级库存,当前库存
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								yuanwei
							
						 | 
						
							
							
							
							
								
							
								508e93bb91
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								yuanwei
							
						 | 
						
							
							
							
							
								
							
								9b4ac353f7
								
							
								
							
						 | 
						
							
							
								
								单据管理
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								f79458bb45
								
							
								
							
						 | 
						
							
							
								
								长泰新增配送产品,物资分类问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								yuanwei
							
						 | 
						
							
							
							
							
								
							
								1ad478b286
								
							
								
							
						 | 
						
							
							
								
								初始化动态配置
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								yuanwei
							
						 | 
						
							
							
							
							
								
							
								1eab520dfd
								
							
								
							
						 | 
						
							
							
								
								初始化动态配置
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								677f368635
								
							
								
							
						 | 
						
							
							
								
								退货补单,多级仓库补单修改,新增灭菌批号,灭菌日期
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								7de61eb509
								
							
								
							
						 | 
						
							
							
								
								预验收入库单区分带回与不带回
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								7450916af4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_price' into dev_price
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								5085b66a7f
								
							
								
							
						 | 
						
							
							
								
								新增物价类别
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								d817527800
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								fc4cbf3cf3
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_price' into dev_price
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								a83e44fad4
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								d7109caf5a
								
							
								
							
						 | 
						
							
							
								
								物资分类添加仓库与部门
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								f23c0136dd
								
							
								
							
						 | 
						
							
							
								
								新增退货补单流程,诏安两个分库问题,单据明细打印问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								30813b31bd
								
							
								
							
						 | 
						
							
							
								
								新增库存过滤方式,新增内网版本更新
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								b34ad7e181
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								41babe7e64
								
							
								
							
						 | 
						
							
							
								
								库存对比相关--未完结
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								4b0d54ba71
								
							
								
							
						 | 
						
							
							
								
								添加患者相关操作类,打印问题修改,项目、定数包相关修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								a038cac875
								
							
								
							
						 | 
						
							
							
								
								领用相关问题修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								450dcbf2a2
								
							
								
							
						 | 
						
							
							
								
								申购修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								4f35b8365f
								
							
								
							
						 | 
						
							
							
								
								库存仓库领用等修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								e319a9888d
								
							
								
							
						 | 
						
							
							
								
								汇总统计
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								9fd6e1a41b
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								94e09d6d8d
								
							
								
							
						 | 
						
							
							
								
								盘点相关功能--盘点方式,部分盘点修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								0074c56c9d
								
							
								
							
						 | 
						
							
							
								
								盘点相关功能
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								474971fb2f
								
							
								
							
						 | 
						
							
							
								
								新增盘点功能代码
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								1b3c16482a
								
							
								
							
						 | 
						
							
							
								
								移除盘点相关功能
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								1b6eb549d8
								
							
								
							
						 | 
						
							
							
								
								设备管理相关代码整理
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								12f1851bba
								
							
								
							
						 | 
						
							
							
								
								业务单据打印等,出入库明细打印等
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								21a94967d8
								
							
								
							
						 | 
						
							
							
								
								业务单直接生成扫码单
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								1c202156b4
								
							
								
							
						 | 
						
							
							
								
								价格相关修改,新增库存定量设置
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								d9d4ca1771
								
							
								
							
						 | 
						
							
							
								
								新增价格相关处理
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								5f3aca56b2
								
							
								
							
						 | 
						
							
							
								
								超时修改密码
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								dbd58892ee
								
							
								
							
						 | 
						
							
							
								
								单据类型初始化问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								54c7b550a2
								
							
								
							
						 | 
						
							
							
								
								单据类型添加编辑类型
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								2806032885
								
							
								
							
						 | 
						
							
							
								
								系统升级bug修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								3847e021b2
								
							
								
							
						 | 
						
							
							
								
								登录菜单问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								cfdfe112ed
								
							
								
							
						 | 
						
							
							
								
								预验收价格问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								f835362043
								
							
								
							
						 | 
						
							
							
								
								设备代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								d8a88547fe
								
							
								
							
						 | 
						
							
							
								
								pda带配/拣货单据修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								06ebf55ed0
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev2.0' into dev2.0
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/resources/schemas/schema_v2.2.sql 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								af21cfdf13
								
							
								
							
						 | 
						
							
							
								
								设备代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								90f7f1f927
								
							
								
							
						 | 
						
							
							
								
								PDA手持终端相关接口
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								c62383ff51
								
							
								
							
						 | 
						
							
							
								
								自定义头部参数代码备份
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								70483edee8
								
							
								
							
						 | 
						
							
							
								
								设备代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								4a8fb12b43
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev2.0' into dev2.0
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								dec79c047d
								
							
								
							
						 | 
						
							
							
								
								新增已执行次数字段;
							
							
							
							
							
							
							
							自定义前端表头字段相关操作类 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								3e43f5f1c4
								
							
								
							
						 | 
						
							
							
								
								设备管理-设备资质
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								24cd753745
								
							
								
							
						 | 
						
							
							
								
								设备明细表字段补充
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								ceb2ac74a8
								
							
								
							
						 | 
						
							
							
								
								设备管理-设备资质
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								a77d2ca199
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev2.0' into dev2.0
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								e16a34bc39
								
							
								
							
						 | 
						
							
							
								
								巡检计划定时任务补充(未完成)
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								48431be244
								
							
								
							
						 | 
						
							
							
								
								设备领用审核代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								ba5731260b
								
							
								
							
						 | 
						
							
							
								
								设备管理设备位置字典表
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								795cd78540
								
							
								
							
						 | 
						
							
							
								
								生产企业字典相关代码
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								98951a39f0
								
							
								
							
						 | 
						
							
							
								
								设备使用记录相关操作类
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								024431999a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev2.0' into dev2.0
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								d31eee08c3
								
							
								
							
						 | 
						
							
							
								
								设备相关人员操作类
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								671131105a
								
							
								
							
						 | 
						
							
							
								
								设备领用代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								14254daeb7
								
							
								
							
						 | 
						
							
							
								
								设备资质相关操作类
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								5c5f667cf5
								
							
								
							
						 | 
						
							
							
								
								设备代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								1931ece8a3
								
							
								
							
						 | 
						
							
							
								
								修改设备任务ID为雪花ID(自增同步会有问题)
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								d28b4f1699
								
							
								
							
						 | 
						
							
							
								
								同步任务备份
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								a7725c066c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev2.0' into dev2.0
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								1b271cab9d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev2.0
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								2ac43431a4
								
							
								
							
						 | 
						
							
							
								
								第三方业务单据下载重复问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								b400a08d83
								
							
								
							
						 | 
						
							
							
								
								同步删除基础数据
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								df219f13c4
								
							
								
							
						 | 
						
							
							
								
								切换分支代码备份
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								4eb14efc5f
								
							
								
							
						 | 
						
							
							
								
								手持终端获取单据类型
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								e3dae86c72
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev2.0
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								a268df2cdb
								
							
								
							
						 | 
						
							
							
								
								设备bug修改提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								1514065484
								
							
								
							
						 | 
						
							
							
								
								库存代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								40f8701bc2
								
							
								
							
						 | 
						
							
							
								
								新增同步操作日志相关方法
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								cc2cd0b511
								
							
								
							
						 | 
						
							
							
								
								新增同步操作日志相关方法
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								13ada50cc3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' into ywj_dev
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/resources/application-dev.yml
#	src/main/resources/schemas/schema_v2.2.sql 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								c959fc118d
								
							
								
							
						 | 
						
							
							
								
								报修详情接口
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								8be3506529
								
							
								
							
						 | 
						
							
							
								
								设备巡检任务新增任务级别和保修类型字段
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								f6f9b599a5
								
							
								
							
						 | 
						
							
							
								
								设备保修详情代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								32c2798027
								
							
								
							
						 | 
						
							
							
								
								设备巡检任务代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								5d8e8861b9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' into ywj_dev
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
#	src/main/resources/application-dev.yml
#	src/main/resources/schemas/schema_v2.2.sql 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								1a87f29e4d
								
							
								
							
						 | 
						
							
							
								
								我的巡检任务
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								8e102c1659
								
							
								
							
						 | 
						
							
							
								
								第三方产品信息异常问题(回滚)
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								6c66ec37ca
								
							
								
							
						 | 
						
							
							
								
								设备代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								5a22d137d8
								
							
								
							
						 | 
						
							
							
								
								预验收选入时增加过滤条件
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								b27758f8db
								
							
								
							
						 | 
						
							
							
								
								报修单  维保设备清单
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								1476a0f894
								
							
								
							
						 | 
						
							
							
								
								新增websocket通信(中继服务同步相关)
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								d9371c48f5
								
							
								
							
						 | 
						
							
							
								
								新增设备管理相关实体类与字段
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								0b613af049
								
							
								
							
						 | 
						
							
							
								
								bug修改,物资字典boolean ->Boolean
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								c5f47f8139
								
							
								
							
						 | 
						
							
							
								
								bug修改,新增单据验收补单校验
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								80c5d58787
								
							
								
							
						 | 
						
							
							
								
								单据上传(回传自助单据号)
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								9afe11946b
								
							
								
							
						 | 
						
							
							
								
								批次号为空时插入库存出现空字符串
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								0dec5c2ed0
								
							
								
							
						 | 
						
							
							
								
								生成不了多级的内部码,会自动变成一级的内部码(片仔癀诊断和管理系统都有这个问题)
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								596a46130e
								
							
								
							
						 | 
						
							
							
								
								去除废弃字段
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								4f25b9ee57
								
							
								
							
						 | 
						
							
							
								
								新增备注字段查询时查备注或病人信息
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								d53c9e87ab
								
							
								
							
						 | 
						
							
							
								
								新增第三方单据自动下载与配置,日志生成等
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								89732532fa
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_ywj' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								98c0d2c69f
								
							
								
							
						 | 
						
							
							
								
								去除临时表的没有用的字段
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								1178634255
							
						 | 
						
							
							
							
							
								
							
								999430aa52
								
							
								
							
						 | 
						
							
							
								
								新增往来类型为客户的医疗机构,新增出库单不会显示该信息
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								dbbf5a8811
								
							
								
							
						 | 
						
							
							
								
								定数包去掉无用代码
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								8d377e8839
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' into dev_ywj
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/java/com/glxp/api/constant/Constant.java
#	src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java
#	src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java
#	src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java
#	src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java
#	src/main/java/com/glxp/api/service/sync/HeartService.java
#	src/main/java/com/glxp/api/task/SyncHeartTask.java
#	src/main/java/com/glxp/api/task/SyncThirdSysTask.java
#	src/main/java/com/glxp/api/util/udi/UdiInfoUtil.java
#	src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								b1fc3a50ef
								
							
								
							
						 | 
						
							
							
								
								修改bug
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								883084f4c5
								
							
								
							
						 | 
						
							
							
								
								定数包代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								de55970ff8
								
							
								
							
						 | 
						
							
							
								
								定数包加工代码初始化
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								dad49893d3
								
							
								
							
						 | 
						
							
							
								
								定数包设置代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								b3b935c0fe
								
							
								
							
						 | 
						
							
							
								
								根据单据类型查询问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								ce801cd27c
								
							
								
							
						 | 
						
							
							
								
								单据带校验比对逻辑修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								29df3286de
								
							
								
							
						 | 
						
							
							
								
								申购单流转价格问题修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								ae4ff7d291
								
							
								
							
						 | 
						
							
							
								
								单据校验备份
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								c50bd49100
								
							
								
							
						 | 
						
							
							
								
								多次出库bug修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								e3bb14f114
								
							
								
							
						 | 
						
							
							
								
								定数包实体初始化
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								f66705d82b
								
							
								
							
						 | 
						
							
							
								
								采购计划,采购订单等相关修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								950301315d
								
							
								
							
						 | 
						
							
							
								
								更新审核人,核对人,供应商编辑信息bug
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								86f084836e
								
							
								
							
						 | 
						
							
							
								
								选入第三方业务单据修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								77256a1516
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								5c0a78e70c
								
							
								
							
						 | 
						
							
							
								
								基础信息相关修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								c5b7ba7db5
								
							
								
							
						 | 
						
							
							
								
								客户管理功能代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								2127c2f170
								
							
								
							
						 | 
						
							
							
								
								物资类别功能代码初始化
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								11be2ef830
								
							
								
							
						 | 
						
							
							
								
								修改货位上架按当前仓库筛选,和汇总导出加上仓库字段
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								68fd6641ba
								
							
								
							
						 | 
						
							
							
								
								同步代码 发票优化
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								bfbb85eb57
								
							
								
							
						 | 
						
							
							
								
								统计汇总代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								690d415779
								
							
								
							
						 | 
						
							
							
								
								新增申购 调整产品录入多选
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								d61ee07461
								
							
								
							
						 | 
						
							
							
								
								业务单据修改产品id类型(long)
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								d1eb441bca
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								90f1b6c334
								
							
								
							
						 | 
						
							
							
								
								产品名称转拼音首字母
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								545905a5f3
								
							
								
							
						 | 
						
							
							
								
								新增申购产品录入多选问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								bb43c32a1e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								d3697401a2
								
							
								
							
						 | 
						
							
							
								
								单据上传重盖
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								46a981040a
								
							
								
							
						 | 
						
							
							
								
								业务单据功能修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								eb3f48ce04
								
							
								
							
						 | 
						
							
							
								
								代码合并
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								1178634255
							
						 | 
						
							
							
							
							
								
							
								f0cd926013
								
							
								
							
						 | 
						
							
							
								
								上传设置备份
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								f51054ea40
								
							
								
							
						 | 
						
							
							
								
								第三方单据上传类型修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								6b004099d3
								
							
								
							
						 | 
						
							
							
								
								业务单据功能优化
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								17a7d9859f
								
							
								
							
						 | 
						
							
							
								
								物资拜放bug修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								4b4d6beb7a
								
							
								
							
						 | 
						
							
							
								
								第三方bug修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								f81471d4e6
								
							
								
							
						 | 
						
							
							
								
								新增扫码单据排序
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								847de9c01b
								
							
								
							
						 | 
						
							
							
								
								汇总代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								1178634255
							
						 | 
						
							
							
							
							
								
							
								c5182c1965
								
							
								
							
						 | 
						
							
							
								
								修复查询采购计划删除报错
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								ab780d007f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								dc0a842edf
								
							
								
							
						 | 
						
							
							
								
								ThrSystemDetailEntity增加表名,ThrProductsEntity增加字段[生产厂家编码,配送企业编码]
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								4a6f792398
								
							
								
							
						 | 
						
							
							
								
								多次使用出库新增功能代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								d0a507981f
								
							
								
							
						 | 
						
							
							
								
								物资新增多次出库设置
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								d72625c5cd
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/zmlDev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								3a26eafb7d
								
							
								
							
						 | 
						
							
							
								
								多次使用出库新增功能代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								14c4bd0248
								
							
								
							
						 | 
						
							
							
								
								多次使用出库新增功能代码提交
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								f2968bf275
								
							
								
							
						 | 
						
							
							
								
								单据复制,单据流转带业务单信息,采购订单新增价格
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								4ef46ec1b0
								
							
								
							
						 | 
						
							
							
								
								增加表名
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								c3d9c20bc6
								
							
								
							
						 | 
						
							
							
								
								新增多次使用出库功能
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								4b917f22fd
								
							
								
							
						 | 
						
							
							
								
								冷链报告
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								d166dd09d7
								
							
								
							
						 | 
						
							
							
								
								采购订单按供应商创建
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								75f346c7a7
								
							
								
							
						 | 
						
							
							
								
								用户库存代码提交
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								92e2a0fe89
								
							
								
							
						 | 
						
							
							
								
								inv_user_product,inv_user_product_detail表初始化代码提交
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								f22fc931f2
								
							
								
							
						 | 
						
							
							
								
								inv_user_product,inv_user_product_detail表初始化代码提交
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								db3e3bd2ca
								
							
								
							
						 | 
						
							
							
								
								相关界面调整修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								59a0078a84
								
							
								
							
						 | 
						
							
							
								
								新增按货位出库功能
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								3b29b7f804
								
							
								
							
						 | 
						
							
							
								
								物资摆放下架代码提交
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								1003d2ec8f
								
							
								
							
						 | 
						
							
							
								
								业务单据详情改成雪花ID
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								f4d9f19a6b
								
							
								
							
						 | 
						
							
							
								
								idtype  auto改为input
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								23dacbc0d7
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								972ed90e40
								
							
								
							
						 | 
						
							
							
								
								同步 优化发票代码
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								40c9648762
								
							
								
							
						 | 
						
							
							
								
								物质摆放变更功能代码提交
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								f45d18ec7f
								
							
								
							
						 | 
						
							
							
								
								同步发票代码
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								1071b496dd
								
							
								
							
						 | 
						
							
							
								
								物质摆放按单功能代码提交
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								1bf136848f
								
							
								
							
						 | 
						
							
							
								
								同步发票代码
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								e880330e7c
								
							
								
							
						 | 
						
							
							
								
								物质摆放功能代码提交
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								9ac295028b
								
							
								
							
						 | 
						
							
							
								
								物质摆放功能代码提交
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								75077b05a4
								
							
								
							
						 | 
						
							
							
								
								同步相关问题修改。用户选入物资字典相关修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								94118141b5
								
							
								
							
						 | 
						
							
							
								
								发票修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								cc248bab94
								
							
								
							
						 | 
						
							
							
								
								上线bug修改,同步修改,发票修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								0214b2cf94
								
							
								
							
						 | 
						
							
							
								
								代码调整
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								ef0c71b1e5
								
							
								
							
						 | 
						
							
							
								
								记录执行结果
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								4b08aa2a4e
								
							
								
							
						 | 
						
							
							
								
								bug修改,上架摆货修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								3cae7526bc
								
							
								
							
						 | 
						
							
							
								
								摆货相关修改,添加货位查询,预验收,寄售等相关库存摆货
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								dbaa3cf85e
								
							
								
							
						 | 
						
							
							
								
								修改  维护往来id问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								5b970dc4c7
								
							
								
							
						 | 
						
							
							
								
								修改id问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								14e43730de
								
							
								
							
						 | 
						
							
							
								
								ID相关修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								90340e2607
								
							
								
							
						 | 
						
							
							
								
								1.调整摆放功能代码,添加上架记录
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								37af4d2462
								
							
								
							
						 | 
						
							
							
								
								合并同步 分支
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								e62c88dfbe
								
							
								
							
						 | 
						
							
							
								
								合并git 分支
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								1c6ebe2899
								
							
								
							
						 | 
						
							
							
								
								调整
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								c85d0f445d
								
							
								
							
						 | 
						
							
							
								
								上传及下载写入文件
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								19d156e2c4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/generId' into generId
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java
#	src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java
#	src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								0499617822
								
							
								
							
						 | 
						
							
							
								
								系统设置同步
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								4ea1efaa92
								
							
								
							
						 | 
						
							
							
								
								同步数据bug相关修复
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								6ba113593b
								
							
								
							
						 | 
						
							
							
								
								数据同步bug修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								54dc7cd0eb
								
							
								
							
						 | 
						
							
							
								
								同步数据修改为雪花ID
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								9e25fc5036
								
							
								
							
						 | 
						
							
							
								
								bug修改代码备份
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								1f6a08e74c
								
							
								
							
						 | 
						
							
							
								
								新增三期拣货,无三期拣货,为配货等页面
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								0dc4a2a419
								
							
								
							
						 | 
						
							
							
								
								关键字属性增加``
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								57dce301ec
								
							
								
							
						 | 
						
							
							
								
								剔除属性
							
							
							
							
							
						 | 
						
							3 years ago |