anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								09557b6a0f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'fengcang' into busUser
							
							
							
							
							
							
							
							# Conflicts:
#	api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml
#	api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDao.xml
#	api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								dfe651487c
								
							
								
							
						 | 
						
							
							
								
								单据添加部门
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								461691fb5e
								
							
								
							
						 | 
						
							
							
								
								备份
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								334f91ecfb
								
							
								
							
						 | 
						
							
							
								
								1.修复菜单数据返回状态值丢失问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								6c3eb81fdb
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								c088c32e37
								
							
								
							
						 | 
						
							
							
								
								自动下载,或手动下载第三方产品信息,自动导入到耗材字典
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								b1c8d95d61
								
							
								
							
						 | 
						
							
							
								
								打印新增部门
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								fef9a9707c
								
							
								
							
						 | 
						
							
							
								
								切换分支备份
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								2f31ac1423
								
							
								
							
						 | 
						
							
							
								
								备份
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								6a283d9a07
								
							
								
							
						 | 
						
							
							
								
								1.修改DI查询条件,多级包装的DI均可查询数据
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								a332175496
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								546e546f56
								
							
								
							
						 | 
						
							
							
								
								1.修复单据日期查询问题
							
							
							
							
							
							
							
							2.检查产品是否存在,添加第三方系统标识条件 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								3393944f93
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								1a9dcb3c9b
								
							
								
							
						 | 
						
							
							
								
								1.修复预验收库库存查询问题
							
							
							
							
							
							
							
							2.修复分页失败问题
3.UDI码流向查询添加时间排序 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								6227f8dfd1
								
							
								
							
						 | 
						
							
							
								
								库存插入问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								f291d47863
								
							
								
							
						 | 
						
							
							
								
								代码备份
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								b0bf4a0d10
								
							
								
							
						 | 
						
							
							
								
								1.库存统计增加批次号分组
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								9339ac4f8f
								
							
								
							
						 | 
						
							
							
								
								1.部分接口添加数据重复校验
							
							
							
							
							
							
							
							2.修复部分sql模糊查询写法错误导致无数据问题 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								909194a54b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'fengcang' into busUser
							
							
							
							
							
							
							
							# Conflicts:
#	api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								454180ccbe
								
							
								
							
						 | 
						
							
							
								
								备份
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								8e827f5032
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								fc6f5ff488
								
							
								
							
						 | 
						
							
							
								
								bug修改,单据补单未添加仓库号问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								1577c191d4
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								211ba9eef6
								
							
								
							
						 | 
						
							
							
								
								自助平台bug修复同步(二级bug修复)
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								dd88f1905a
								
							
								
							
						 | 
						
							
							
								
								预验收单据删除bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								628f3bccee
								
							
								
							
						 | 
						
							
							
								
								单据删除问题,批次号大小写不匹配问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								77297f5d0f
								
							
								
							
						 | 
						
							
							
								
								用户关联单据类型bug,以及同步问题,部门同步问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								cff8e2ce24
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'fengcang' into busUser
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								f097bd9674
								
							
								
							
						 | 
						
							
							
								
								1.修复库存统计未添加分库条件的问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								209a9bec7d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'fengcang' into busUser
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								e7427bc1d9
								
							
								
							
						 | 
						
							
							
								
								新增部门,修改,代码备份
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								8be5da50d6
								
							
								
							
						 | 
						
							
							
								
								1.码表添加实际数量
							
							
							
							
							
							
							
							2.码详情响应类数据添加单据ID字段 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								eaa7229cc5
								
							
								
							
						 | 
						
							
							
								
								1.临时码表添加实际数量字段
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								71d1cf46d7
								
							
								
							
						 | 
						
							
							
								
								新增单据同步时同时同步业务单据详情信息
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								6441034775
								
							
								
							
						 | 
						
							
							
								
								1.是否可以补单判断增加单据类型平衡补单有无值判断
							
							
							
							
							
							
							
							2.修复删除分库有无用户判断错误问题 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								49d109d559
								
							
								
							
						 | 
						
							
							
								
								代码备份
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								915014b5b9
								
							
								
							
						 | 
						
							
							
								
								1.单据打印实体增加分库字段
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								9272eaf564
								
							
								
							
						 | 
						
							
							
								
								新增单据上传时间控制
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								a1b9309508
								
							
								
							
						 | 
						
							
							
								
								1.修复bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								97c9c6429f
								
							
								
							
						 | 
						
							
							
								
								bug修改,缺量,全量补单等
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								b214cf908c
								
							
								
							
						 | 
						
							
							
								
								1.修复单据上传日志根据上传时间查询无效问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								130aa0587b
								
							
								
							
						 | 
						
							
							
								
								1.查询第三方子仓库信息返回父级仓库名称
							
							
							
							
							
							
							
							2.修复单据上传列表接口使用单据号查询无数据的问题 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								2810beb4bd
								
							
								
							
						 | 
						
							
							
								
								1.修复查询单据类型错误问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								c82931dcb8
								
							
								
							
						 | 
						
							
							
								
								1.部分接口添加分页查询功能
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								049bd7a42b
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								62e0e5aa60
								
							
								
							
						 | 
						
							
							
								
								1.仓库添加关联用户和单据类型候选列表页添加分页功能
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								6e18732ea4
								
							
								
							
						 | 
						
							
							
								
								1.仓库关联用户和单据类型查询接口增加分页查询功能
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								6803357b06
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/fengcang' into fengcang
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 anthonyywj2
							
						 | 
						
							
							
							
							
								
							
								05591c1ff9
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								9f69fade66
								
							
								
							
						 | 
						
							
							
								
								1.修改第三方系统启用状态时限制必须启用至少一个第三方系统
							
							
							
							
							
						 | 
						
							3 years ago |