郑明梁
							
						 | 
						
							
							
							
							
								
							
								02461f77eb
								
							
								
							
						 | 
						
							
							
								
								修改配送企业资质新增问题
							
							
							
							
							
						 | 
						
							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 | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								9856b83d4d
								
							
								
							
						 | 
						
							
							
								
								1.同步busUser分支的bug修复
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								121003e42b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/orderChange' into zhairh
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								83599ef8b7
								
							
								
							
						 | 
						
							
							
								
								单据回退问题,补单时间改为审核时间往后
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								78a040565f
								
							
								
							
						 | 
						
							
							
								
								1.修复撤回未验收单据后未置空扫码单据关联业务单据号问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								f26bce6ece
								
							
								
							
						 | 
						
							
							
								
								1.添加盘点单号打印功能
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								6e1a461a36
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/orderChange' into zhairh
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								2e814bfc63
								
							
								
							
						 | 
						
							
							
								
								1.完成设备养护功能
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								1794802bd7
								
							
								
							
						 | 
						
							
							
								
								1.提交设备养护实体类和查询接口文件
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								d219f3d78e
								
							
								
							
						 | 
						
							
							
								
								1.修改设备养护表及相关接口
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								fe3483f3bd
								
							
								
							
						 | 
						
							
							
								
								系统优化
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								7c88ebc0de
								
							
								
							
						 | 
						
							
							
								
								1.修复设备领用的bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								d6d4cc27f6
								
							
								
							
						 | 
						
							
							
								
								1.调整设备领用接口,优化逻辑,修复部分bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								526bb57f63
								
							
								
							
						 | 
						
							
							
								
								1.完善添加设备领用详情接口逻辑
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								f10b0f29c1
								
							
								
							
						 | 
						
							
							
								
								1.添加设备养护记录相关接口逻辑代码
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								b11e8fdd57
								
							
								
							
						 | 
						
							
							
								
								1.添加设备养护记录详情接口
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								889cd671f6
								
							
								
							
						 | 
						
							
							
								
								1.保存代码
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								6ce835f118
								
							
								
							
						 | 
						
							
							
								
								1.保存代码
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								7ba27b3445
								
							
								
							
						 | 
						
							
							
								
								1.保存代码
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								aab56b818d
								
							
								
							
						 | 
						
							
							
								
								1.添加设备领用养护记录接口和对应实现基础代码
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								3a8288df0b
								
							
								
							
						 | 
						
							
							
								
								1.提交设备领用养护记录查询接口
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								5305354837
								
							
								
							
						 | 
						
							
							
								
								1.添加设备领用养护功能相关的实体类和xml文件以及表sql
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								b932e8ff24
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/orderChange' into zhairh
							
							
							
							
							
							
							
							# Conflicts:
#	api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								9905450be6
								
							
								
							
						 | 
						
							
							
								
								1.库存养护详情添加养护时间和更新时间字段
							
							
							
							
							
							
							
							2.修复库存养护功能bug 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								2c3d8de691
								
							
								
							
						 | 
						
							
							
								
								同步busUser上的bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								d8bc7ad30f
								
							
								
							
						 | 
						
							
							
								
								测试
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								bd4ae76e61
								
							
								
							
						 | 
						
							
							
								
								1.完成新增库存养护记录及详情接口
							
							
							
							
							
							
							
							2.修改库存养护记录功能数据库表sql 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								dc85b6559e
								
							
								
							
						 | 
						
							
							
								
								1.完成新增盘点单接口编写
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								7f8cc54b32
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/orderChange' into zhairh
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								a437f4a5d7
								
							
								
							
						 | 
						
							
							
								
								注释
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								1bee746e3b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/orderChange' into zhairh
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								65c505b4bd
								
							
								
							
						 | 
						
							
							
								
								1.添加库存养护查询库存详情接口
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								f8b044e9cd
								
							
								
							
						 | 
						
							
							
								
								1.调整库存养护记录和详情查询
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								dda99de27d
								
							
								
							
						 | 
						
							
							
								
								1.调整库存养护记录列表查询接口根据更新时间排序
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								78eede1aef
								
							
								
							
						 | 
						
							
							
								
								单据流转设置改动,采购管理优化,bug处理
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								3b8e7b1972
								
							
								
							
						 | 
						
							
							
								
								切换分支代码备份
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								d26c7b3964
								
							
								
							
						 | 
						
							
							
								
								1.初步完成养护记录详情接口
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								ca02062f6e
								
							
								
							
						 | 
						
							
							
								
								1.修改扫码添加库存养护记录详情接口判断逻辑
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								fdc7adb9f3
								
							
								
							
						 | 
						
							
							
								
								1.添加库存养护记录详情接口
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								86367efddd
								
							
								
							
						 | 
						
							
							
								
								1.添加库存养护记录接口
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								1b47936969
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/busUser' into zhairh
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								425752bfd9
								
							
								
							
						 | 
						
							
							
								
								1.修复盘点转单问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								zhengmingliang
							
						 | 
						
							
							
							
							
								
							
								8f2d6fcb34
								
							
								
							
						 | 
						
							
							
								
								修改sql问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								zhengmingliang
							
						 | 
						
							
							
							
							
								
							
								c860f06157
								
							
								
							
						 | 
						
							
							
								
								同步自助平台代码
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								7aff6d4b46
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/busUser' into busUser
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								76ceab7a45
								
							
								
							
						 | 
						
							
							
								
								1.修复转单问题,条码添加供应商信息
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								zhengmingliang
							
						 | 
						
							
							
							
							
								
							
								61248fc682
								
							
								
							
						 | 
						
							
							
								
								同步自助平台代码
							
							
							
							
							
						 | 
						
							3 years ago |