wangwei
							
						 | 
						
							
							
							
							
								
							
								aec2e392fe
								
							
								
							
						 | 
						
							
							
								
								修改bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								642430e499
								
							
								
							
						 | 
						
							
							
								
								修改仓库取消绑定用户以及耗材字典查询问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								0a28d48bea
								
							
								
							
						 | 
						
							
							
								
								修复仓库绑定用户bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								d0f8db5dcb
								
							
								
							
						 | 
						
							
							
								
								同步管理系统1.0问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								0bde171a06
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/orderChange' into zhairh
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								03c7106035
								
							
								
							
						 | 
						
							
							
								
								1.修复单据流转设置接口查询单据类型无效问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								867d1d2287
								
							
								
							
						 | 
						
							
							
								
								1.修复部分bug,添加养护记录打印功能
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								6c7d8a142f
								
							
								
							
						 | 
						
							
							
								
								1.修复设备养护无生产日期问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								2831601d9d
								
							
								
							
						 | 
						
							
							
								
								产品信息编辑问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								b72ca9e07d
								
							
								
							
						 | 
						
							
							
								
								修改扫码单据产品出现多个供应商时没有实际数量问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								e3dda6df25
								
							
								
							
						 | 
						
							
							
								
								1.优化设备养护功能
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								098da1241b
								
							
								
							
						 | 
						
							
							
								
								1.修复设备养护备注字段未保存的问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								e6839a4caf
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/orderChange' into zhairh
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								49769b13e8
								
							
								
							
						 | 
						
							
							
								
								1.修复设备领用养护功能的bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								aadc15662a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/orderChange' into orderChange
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								2260eca219
								
							
								
							
						 | 
						
							
							
								
								修改bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								7942520fa3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'ww' into orderChange
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								1afd2b28c9
								
							
								
							
						 | 
						
							
							
								
								修改bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								9c52af8755
								
							
								
							
						 | 
						
							
							
								
								1.调整领用设备自定义序列号产品自定义码生成时间为提交审核
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								16bbae8bf9
								
							
								
							
						 | 
						
							
							
								
								1.修复设备领用记录更新后创建人字段被置空的问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								86e64cec5e
								
							
								
							
						 | 
						
							
							
								
								1.修复新建扫码单据校验库存不包含当前单据扫码信息导致超出未提示问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								118efa8b27
								
							
								
							
						 | 
						
							
							
								
								1.添加设备领用养护自动建表语句
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								be6e05d87c
								
							
								
							
						 | 
						
							
							
								
								1.修复盘点转单条码绑定多个供应商时自动绑定的问题
							
							
							
							
							
							
							
							2.修复更新单据备注信息无效问题 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								95a2747c09
								
							
								
							
						 | 
						
							
							
								
								1.修复养护等相关的bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								badf66be39
								
							
								
							
						 | 
						
							
							
								
								申购,采购计划相关bug修改,业务单据校验问题,自助平台一些代码同步
							
							
							
							
							
						 | 
						
							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 |