wj
							
						 | 
						
							
							
							
							
								
							
								7b3cf5a9d1
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								6111d7c580
								
							
								
							
						 | 
						
							
							
								
								insertIgnoreBatch/replaceBatch改造
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								f7d09c1ec4
								
							
								
							
						 | 
						
							
							
								
								第三方接口相关修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								39f3fbf14d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' into test
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								1bed2cf9fd
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								598b58d8d4
								
							
								
							
						 | 
						
							
							
								
								下载第三方产品信息
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								7b2f82c151
								
							
								
							
						 | 
						
							
							
								
								耗材批量导入问题修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								2d685b75d9
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								4099c75d05
								
							
								
							
						 | 
						
							
							
								
								物资去掉放回id提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								21b81c5e40
								
							
								
							
						 | 
						
							
							
								
								bug修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								e3fdd85986
								
							
								
							
						 | 
						
							
							
								
								bug修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								1496bb4bda
								
							
								
							
						 | 
						
							
							
								
								bug修复--改方法名
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								1f3ba38e22
								
							
								
							
						 | 
						
							
							
								
								bug修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								8096c1933e
								
							
								
							
						 | 
						
							
							
								
								bug修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								e1bf9bad81
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								6e6b56085c
								
							
								
							
						 | 
						
							
							
								
								代码备份
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								64fcfe9c22
								
							
								
							
						 | 
						
							
							
								
								bug修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								bec086ca4c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								83baf6d325
								
							
								
							
						 | 
						
							
							
								
								打印代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								1178634255
							
						 | 
						
							
							
							
							
								
							
								46d5cb0181
								
							
								
							
						 | 
						
							
							
								
								内部码标签打印
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								1178634255
							
						 | 
						
							
							
							
							
								
							
								c5182c1965
								
							
								
							
						 | 
						
							
							
								
								修复查询采购计划删除报错
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								d02dc617a8
								
							
								
							
						 | 
						
							
							
								
								sql记录
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								ab780d007f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								dc0a842edf
								
							
								
							
						 | 
						
							
							
								
								ThrSystemDetailEntity增加表名,ThrProductsEntity增加字段[生产厂家编码,配送企业编码]
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								ddf0a1866f
								
							
								
							
						 | 
						
							
							
								
								内部码报表打印代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								5619aa362c
								
							
								
							
						 | 
						
							
							
								
								代码备份
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								bd15235a99
								
							
								
							
						 | 
						
							
							
								
								单据报表打印代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								fe4b0082e3
								
							
								
							
						 | 
						
							
							
								
								单据报表打印代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								1178634255
							
						 | 
						
							
							
							
							
								
							
								56aa7faa57
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								1178634255
							
						 | 
						
							
							
							
							
								
							
								ed08449b2c
								
							
								
							
						 | 
						
							
							
								
								修复审核申购单报错
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								schry
							
						 | 
						
							
							
							
							
								
							
								301e5812fa
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								schry
							
						 | 
						
							
							
							
							
								
							
								f0b8407c29
								
							
								
							
						 | 
						
							
							
								
								选入领用单据:“往来单位”查询框查询不到数据 230522
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								4a6f792398
								
							
								
							
						 | 
						
							
							
								
								多次使用出库新增功能代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								d0a507981f
								
							
								
							
						 | 
						
							
							
								
								物资新增多次出库设置
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								schry
							
						 | 
						
							
							
							
							
								
							
								c669d89eb4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								schry
							
						 | 
						
							
							
							
							
								
							
								68782d1619
								
							
								
							
						 | 
						
							
							
								
								业务单自动补单的单据类型名称不支持模糊查询 230519
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								1178634255
							
						 | 
						
							
							
							
							
								
							
								e58e49b816
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								1178634255
							
						 | 
						
							
							
							
							
								
							
								9f1f491db3
								
							
								
							
						 | 
						
							
							
								
								修复入账库查询列表不会显示‘计量单位’,生产企业与单据类型的不一致
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								d72625c5cd
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/zmlDev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								7bbd253d1a
								
							
								
							
						 | 
						
							
							
								
								多次使用出库新增功能代码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								1178634255
							
						 | 
						
							
							
							
							
								
							
								8451e223fe
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								3a26eafb7d
								
							
								
							
						 | 
						
							
							
								
								多次使用出库新增功能代码提交
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								ee89548201
								
							
								
							
						 | 
						
							
							
								
								排序相关修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								de758b0fce
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								b0d1ddda6c
								
							
								
							
						 | 
						
							
							
								
								采购订单修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								schry
							
						 | 
						
							
							
							
							
								
							
								f75b8fdd86
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								schry
							
						 | 
						
							
							
							
							
								
							
								a6a68cb35f
								
							
								
							
						 | 
						
							
							
								
								解决不显示计量单位
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								14c4bd0248
								
							
								
							
						 | 
						
							
							
								
								多次使用出库新增功能代码提交
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								1178634255
							
						 | 
						
							
							
							
							
								
							
								f8b5a58e33
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								f2968bf275
								
							
								
							
						 | 
						
							
							
								
								单据复制,单据流转带业务单信息,采购订单新增价格
							
							
							
							
							
						 | 
						
							3 years ago |