x_z
							
						 | 
						
							
							
							
							
								
							
								8ef71b7116
								
							
								
							
						 | 
						
							
							
								
								1.添加上传单据到第三方系统结果字段,并通过中继服务进行同步
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								3d93d23683
								
							
								
							
						 | 
						
							
							
								
								1.单据表,同步任务记录表添加标记字段
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								ccfacf81f3
								
							
								
							
						 | 
						
							
							
								
								数据库初始化版本更新
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								c2bb2dc2ae
								
							
								
							
						 | 
						
							
							
								
								1.修复提交单据到自助平台控制字段缺失问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								98eac62666
								
							
								
							
						 | 
						
							
							
								
								修改bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								de89880fa6
								
							
								
							
						 | 
						
							
							
								
								缺量补单问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								44a61ea77e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/zhairh' into busUser
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								a36642b8bb
								
							
								
							
						 | 
						
							
							
								
								1.修复盘点转单问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								5a7b0f3928
								
							
								
							
						 | 
						
							
							
								
								1.修复转单问题,条码添加供应商信息
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								871bba930c
								
							
								
							
						 | 
						
							
							
								
								1.盘点单据码详情,添加扫码数量字段
							
							
							
							
							
							
							
							2.重写盘点单据转扫码单逻辑 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								15fc169e2d
								
							
								
							
						 | 
						
							
							
								
								1.调整盘点转单功能
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								2590935346
								
							
								
							
						 | 
						
							
							
								
								1.添加库存养护功能代码
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								1a67d39d9a
								
							
								
							
						 | 
						
							
							
								
								1.修复生成盘点单据时单据类型错误问题
							
							
							
							
							
							
							
							2.调整单据来源数值,修复重复问题 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								85bef770fc
								
							
								
							
						 | 
						
							
							
								
								1.修复盘点转单产品数量错误问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								e6e7d92c96
								
							
								
							
						 | 
						
							
							
								
								1.修复盘点生成单据的bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								f498080657
								
							
								
							
						 | 
						
							
							
								
								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
							
						 | 
						
							
							
							
							
								
							
								42e7953ddb
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/zhairh' into zhairh
							
							
							
							
							
							
							
							# Conflicts:
#	api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiRelevanceDao.java
#	api-admin/src/main/resources/application-dev.properties
#	api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								6b88b3f244
								
							
								
							
						 | 
						
							
							
								
								1.修复盘点功能bug
							
							
							
							
							
						 | 
						
							3 years ago |