wangwei
							
						 | 
						
							
							
							
							
								
							
								930cc37132
								
							
								
							
						 | 
						
							
							
								
								2/25 业务类型增加类型1.2
							
							
							
							
							
						 | 
						
							8 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								459b422492
								
							
								
							
						 | 
						
							
							
								
								2/25 现场管理增加业务类型 区分
							
							
							
							
							
						 | 
						
							8 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								696c77e2a8
								
							
								
							
						 | 
						
							
							
								
								2/25 优化1.0
							
							
							
							
							
						 | 
						
							8 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								8ca99c1e0b
								
							
								
							
						 | 
						
							
							
								
								2/25 查询优化1.0
							
							
							
							
							
						 | 
						
							8 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								066cb0860e
								
							
								
							
						 | 
						
							
							
								
								2/24 界面优化1.0
							
							
							
							
							
						 | 
						
							8 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								99eeae8b4e
								
							
								
							
						 | 
						
							
							
								
								2/24 灯组信息 槽位信息1.0
							
							
							
							
							
						 | 
						
							8 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								84929e5f93
								
							
								
							
						 | 
						
							
							
								
								确认明细查询
							
							
							
							
							
						 | 
						
							8 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								2b6f1fe39b
								
							
								
							
						 | 
						
							
							
								
								单据明细新增制剂规格
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								bd46bf98c0
								
							
								
							
						 | 
						
							
							
								
								2/21 摆放位置 1.0
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								46c3304a47
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_fifo_z' into dev_2.5_optimize
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/java/com/glxp/api/entity/collect/IoCollectSet.java
#	src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java
#	src/main/resources/schemas/schema_v2.4.sql 
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								b9d1d81e4a
								
							
								
							
						 | 
						
							
							
								
								单据手动触发拉单,不根据配置,直接下载
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								553928b1ba
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_2.5_optimize' into dev_2.5_optimize
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								bb08edeb27
								
							
								
							
						 | 
						
							
							
								
								2/21 sql优化1.4
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								eefa886765
								
							
								
							
						 | 
						
							
							
								
								fix: 修改
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								ba7e50b810
								
							
								
							
						 | 
						
							
							
								
								fix: 修改
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								f144c0729d
								
							
								
							
						 | 
						
							
							
								
								fix: 修改
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								0ece92133b
								
							
								
							
						 | 
						
							
							
								
								2/21 界面优化1.3
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								882d5b6d51
								
							
								
							
						 | 
						
							
							
								
								2/21 界面优话1.0
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								5b93ce92a9
								
							
								
							
						 | 
						
							
							
								
								2/21 同步价格字段修改
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								a72410f669
								
							
								
							
						 | 
						
							
							
								
								2/20 优化1.0 查询正在上货的草稿单据
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								da49286cbc
								
							
								
							
						 | 
						
							
							
								
								fix: 修改
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								dd859ecaeb
								
							
								
							
						 | 
						
							
							
								
								2/20 灯组已满1.0
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								234177ec75
								
							
								
							
						 | 
						
							
							
								
								2/20 优化1.0  槽位区域打印未完成
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								1a375526a0
								
							
								
							
						 | 
						
							
							
								
								fix: 修改
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								7c072a95fe
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								c514bd02e0
								
							
								
							
						 | 
						
							
							
								
								2/20 代码备份1.0
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								7dae516b31
								
							
								
							
						 | 
						
							
							
								
								fix: 修改
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								380495e766
								
							
								
							
						 | 
						
							
							
								
								2/20 高拍仪设置
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								qiuyt
							
						 | 
						
							
							
							
							
								
							
								fd2d2575c4
								
							
								
							
						 | 
						
							
							
								
								兼容阿里关联关系批次号太长的问题
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								0a44048570
								
							
								
							
						 | 
						
							
							
								
								确认明细查询
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								ed749bd370
								
							
								
							
						 | 
						
							
							
								
								2/19 扫码剔除1.0
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								93917c6a88
								
							
								
							
						 | 
						
							
							
								
								工位临时删除
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								60c1bb7b62
								
							
								
							
						 | 
						
							
							
								
								工位临时删除
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								f5439afa55
								
							
								
							
						 | 
						
							
							
								
								工位临时删除
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								1339974ab2
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_2.5_optimize' into dev_2.5_optimize
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/java/com/glxp/api/req/inout/FilterCodeRequest.java 
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								12154b85ab
								
							
								
							
						 | 
						
							
							
								
								新增工位剔除接口
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								717e4973bb
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_2.5_optimize' into dev_2.5_optimize
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								1590d7c2ba
								
							
								
							
						 | 
						
							
							
								
								2/18 优化1.0
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								c63a3eb5c6
								
							
								
							
						 | 
						
							
							
								
								fix: 修改
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								2282072776
								
							
								
							
						 | 
						
							
							
								
								2/18 临时码表查询
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								35deb123ba
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_2.5_optimize' into dev_2.5_optimize
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java 
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								cf8e35d00a
								
							
								
							
						 | 
						
							
							
								
								2/18 临时码表加入行号 增加临时码表查询接口
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								72928b2d9e
								
							
								
							
						 | 
						
							
							
								
								库存,单据,扫码数量修改
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								d4b691d10f
								
							
								
							
						 | 
						
							
							
								
								fix: 修改
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								82e0eb517c
								
							
								
							
						 | 
						
							
							
								
								fix: 修改
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								545bc6e2c7
								
							
								
							
						 | 
						
							
							
								
								fix: 修改推荐上货单导出
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								78cf390d5c
								
							
								
							
						 | 
						
							
							
								
								fix: 修改
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								aec85623d6
								
							
								
							
						 | 
						
							
							
								
								2/18 槽位区域表 --取货架管理打印未完成1.1
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								74eb299633
								
							
								
							
						 | 
						
							
							
								
								2/18 槽位区域表 --取货架管理打印未完成
							
							
							
							
							
						 | 
						
							9 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								9558437f4f
								
							
								
							
						 | 
						
							
							
								
								2/14 高拍仪设置1.0
							
							
							
							
							
						 | 
						
							9 months ago |