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
							
						 | 
						
							
							
							
							
								
							
								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 | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								76ceab7a45
								
							
								
							
						 | 
						
							
							
								
								1.修复转单问题,条码添加供应商信息
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								zhengmingliang
							
						 | 
						
							
							
							
							
								
							
								61248fc682
								
							
								
							
						 | 
						
							
							
								
								同步自助平台代码
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								9590135888
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/busUser' into zhairh
							
							
							
							
							
							
							
							# Conflicts:
#	api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								2cd2d87ed1
								
							
								
							
						 | 
						
							
							
								
								1.盘点单据码详情,添加扫码数量字段
							
							
							
							
							
							
							
							2.重写盘点单据转扫码单逻辑 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								29a33df20e
								
							
								
							
						 | 
						
							
							
								
								1.调整盘点转单功能
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								f2b7d009da
								
							
								
							
						 | 
						
							
							
								
								1.添加库存养护功能代码
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								763ec2992f
								
							
								
							
						 | 
						
							
							
								
								1.修复生成盘点单据时单据类型错误问题
							
							
							
							
							
							
							
							2.调整单据来源数值,修复重复问题 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								879de858f9
								
							
								
							
						 | 
						
							
							
								
								1.修复盘点转单产品数量错误问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								cfcdc1a2da
								
							
								
							
						 | 
						
							
							
								
								1.修复盘点生成单据的bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								b3057f8a1e
								
							
								
							
						 | 
						
							
							
								
								1.修复管理员账号分库查询无数据的问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								4585ed9dda
								
							
								
							
						 | 
						
							
							
								
								1.合并盘点功能,解决代码合并冲突
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								3012af591f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/zhairh' into busUser
							
							
							
							
							
							
							
							# Conflicts:
#	api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								1989fb27e5
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/busUser' into zhairh
							
							
							
							
							
							
							
							# Conflicts:
#	api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								c56ed7d5b0
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/zhairh' into zhairh
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								a02846b562
								
							
								
							
						 | 
						
							
							
								
								1.修复盘点转单bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								a5147bd4f7
								
							
								
							
						 | 
						
							
							
								
								同步设置报错问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								affd380b00
								
							
								
							
						 | 
						
							
							
								
								同步设置报错问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								6c071984c4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/zhairh' into zhairh
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								zhengmingliang
							
						 | 
						
							
							
							
							
								
							
								7e185e74d8
								
							
								
							
						 | 
						
							
							
								
								同步自助平台代码
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								d84b4ff437
								
							
								
							
						 | 
						
							
							
								
								1.修复盘点bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								324cb6569c
								
							
								
							
						 | 
						
							
							
								
								同步设置报错问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								d08464a4c6
								
							
								
							
						 | 
						
							
							
								
								备份
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								76166a9628
								
							
								
							
						 | 
						
							
							
								
								1.盘点码详情添加批次号字段
							
							
							
							
							
							
							
							2.修复盘点的bug 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								9f8e17dec0
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/busUser' into zhairh
							
							
							
							
							
							
							
							# Conflicts:
#	api-admin/src/main/resources/application-dev.properties 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								0f61a6bdd9
								
							
								
							
						 | 
						
							
							
								
								1.提交手持终端保存单据接口
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								fff7f81125
								
							
								
							
						 | 
						
							
							
								
								1.盘点单据查询接口添加盘点单号参数
							
							
							
							
							
							
							
							2.添加手持终端提交盘点单据接口 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								08ca7b0463
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								c6e4b922da
								
							
								
							
						 | 
						
							
							
								
								1.提交代码
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								6b88b3f244
								
							
								
							
						 | 
						
							
							
								
								1.修复盘点功能bug
							
							
							
							
							
						 | 
						
							3 years ago |