anthonywj
							
						 | 
						
							
							
							
							
								
							
								9f1fb1553d
								
							
								
							
						 | 
						
							
							
								
								仓库列表分页
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								e07922d3b2
								
							
								
							
						 | 
						
							
							
								
								数据库语句缺漏问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								b4f09051b5
								
							
								
							
						 | 
						
							
							
								
								1.补全合并丢失代码
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								8f09c46796
								
							
								
							
						 | 
						
							
							
								
								1.整合MyBatis Plus
							
							
							
							
							
							
							
							2.合并api-admin和api-common模块,精简目录层级
3.删除无用和重复的依赖及目录 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								7349a95508
								
							
								
							
						 | 
						
							
							
								
								部门关联用户
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								c067a3ed17
								
							
								
							
						 | 
						
							
							
								
								用户权限和仓库相关接口修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								b4581dc0e6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'orderChange' into newFrame
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								5001f9a8dc
								
							
								
							
						 | 
						
							
							
								
								数据相关功能备份
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								513faef851
								
							
								
							
						 | 
						
							
							
								
								1.修复设备领用记录更新后创建人字段被置空的问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								a907451348
								
							
								
							
						 | 
						
							
							
								
								1.修复新建扫码单据校验库存不包含当前单据扫码信息导致超出未提示问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								dd5c776809
								
							
								
							
						 | 
						
							
							
								
								1.添加设备领用养护自动建表语句
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								aeb91b295c
								
							
								
							
						 | 
						
							
							
								
								1.修复盘点转单条码绑定多个供应商时自动绑定的问题
							
							
							
							
							
							
							
							2.修复更新单据备注信息无效问题 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								b566889c71
								
							
								
							
						 | 
						
							
							
								
								1.修复养护等相关的bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								f7d0ee91d5
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/orderChange' into zhairh
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								7ae0b81529
								
							
								
							
						 | 
						
							
							
								
								1.修复盘点转单数量错误问题,库存统计无法分页的问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								2d90648548
								
							
								
							
						 | 
						
							
							
								
								申购,采购计划相关bug修改,业务单据校验问题,自助平台一些代码同步
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								81306eb072
								
							
								
							
						 | 
						
							
							
								
								1.修复部分接口查询参数缺失或无效问题
							
							
							
							
							
							
							
							2.领用单据实体类补充缺失字段 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								0faa2ea82e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/orderChange' into zhairh
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								e60684d968
								
							
								
							
						 | 
						
							
							
								
								1.修复查询条件拼接问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								c97b4188b8
								
							
								
							
						 | 
						
							
							
								
								首营资质同步问题解决
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								661fbb7cf5
								
							
								
							
						 | 
						
							
							
								
								1.修复异常单据码详情选择供应商查询无法使用名称查询的问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								a880113dd5
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/orderChange' into zhairh
							
							
							
							
							
							
							
							# Conflicts:
#	api-admin/src/main/resources/schemas/schema_v2.1.sql 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								f9cf57fcd8
								
							
								
							
						 | 
						
							
							
								
								1.修复无法删除盘点单据问题
							
							
							
							
							
							
							
							2.修复分库列表查询接口重复数据问题 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								66bea1c27f
								
							
								
							
						 | 
						
							
							
								
								修改bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								4bbc2eef44
								
							
								
							
						 | 
						
							
							
								
								扫码单据查询提示未选择仓库bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								be32ac29da
								
							
								
							
						 | 
						
							
							
								
								修复单据流转缺量补单和全量补单问题,修复平衡补单问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								e529d22acd
								
							
								
							
						 | 
						
							
							
								
								1.调整查询分库列表sql
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								00917e51d8
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/orderChange' into zhairh
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								7fb4bbb438
								
							
								
							
						 | 
						
							
							
								
								修改bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								7dbc2aa8e2
								
							
								
							
						 | 
						
							
							
								
								1.调整删除表sql
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								d3bdc7bb1d
								
							
								
							
						 | 
						
							
							
								
								1.添加立即下载自助平台数据接口
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								de98f063c5
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/orderChange' into orderChange
							
							
							
							
							
							
							
							# Conflicts:
#	api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								064ccaef2b
								
							
								
							
						 | 
						
							
							
								
								1.移除提交单据到自助平台功能代码
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								8615658570
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/orderChange' into zhairh
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								5ffa258f9b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'feature-order-fix' into orderChange
							
							
							
							
							
							
							
							# Conflicts:
#	api-admin/src/main/resources/schemas/schema_v2.1.sql 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								258bddc213
								
							
								
							
						 | 
						
							
							
								
								修改bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								bdc5773f44
								
							
								
							
						 | 
						
							
							
								
								系统操作日志,菜单列表问题修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								d9578b597f
								
							
								
							
						 | 
						
							
							
								
								1.修复部分bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								27c5f093c2
								
							
								
							
						 | 
						
							
							
								
								1.调整设备养护功能
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								f07c4a7c48
								
							
								
							
						 | 
						
							
							
								
								之前优化问题代码迁移
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								2fee84c091
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/orderChange' into zhairh
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								b822dcad01
								
							
								
							
						 | 
						
							
							
								
								1.调整设备领用功能
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								e0dd8b712e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'feature-order-fix' into orderChange
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								324487b913
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/orderChange' into zhairh
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								02461f77eb
								
							
								
							
						 | 
						
							
							
								
								修改配送企业资质新增问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								340a02bfc7
								
							
								
							
						 | 
						
							
							
								
								1.添加更新用户同步添加部门信息
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								609b9e6bb6
								
							
								
							
						 | 
						
							
							
								
								更新定时删除任务
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								77957dc94a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/orderChange' into orderChange
							
							
							
							
							
							
							
							# Conflicts:
#	api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderServiceImpl.java 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								b55295451f
								
							
								
							
						 | 
						
							
							
								
								同步管理系统busUser上的bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								3ec33511ce
								
							
								
							
						 | 
						
							
							
								
								1.设备领用记录添加领用人字段
							
							
							
							
							
						 | 
						
							3 years ago |