yewj
							
						 | 
						
							
							
							
							
								
							
								c18d4a907c
								
							
								
							
						 | 
						
							
							
								
								单据上传
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								74501c23ce
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								4975422c12
								
							
								
							
						 | 
						
							
							
								
								修改带校验,库存等
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								0e70cb18eb
								
							
								
							
						 | 
						
							
							
								
								12/12 代码备份 扫码校验1.0
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								b12d1e0a11
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								62dec41a67
								
							
								
							
						 | 
						
							
							
								
								处方按照队列取货
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								qiuyt
							
						 | 
						
							
							
							
							
								
							
								54eeaa4d4f
								
							
								
							
						 | 
						
							
							
								
								1、医保上传转换问题 怎么样都是失败问题
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								3c4e13470d
								
							
								
							
						 | 
						
							
							
								
								12/10 单据审核2.0
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								6add29cf82
								
							
								
							
						 | 
						
							
							
								
								12/9 已完成单-码校验 序列号字段查询
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								17a392e687
								
							
								
							
						 | 
						
							
							
								
								12/9 已完成单扫码校验1.0
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								151ad2ed2d
								
							
								
							
						 | 
						
							
							
								
								审核送货单带入扫码明细,
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								c0363c564e
								
							
								
							
						 | 
						
							
							
								
								扫码数量计算错误问题
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								bfd75a8285
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								9993dd1932
								
							
								
							
						 | 
						
							
							
								
								12/6 已完成单码明细
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								09bbe78f54
								
							
								
							
						 | 
						
							
							
								
								当前产品不支持采集该包装层级追溯码问题修改
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								fb20732839
								
							
								
							
						 | 
						
							
							
								
								长泰上传问题
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								ae7bcaf284
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								5c2ee6d58b
								
							
								
							
						 | 
						
							
							
								
								单据上传供应商问题
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								abf80eeb07
								
							
								
							
						 | 
						
							
							
								
								12/6 字段查询优化
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								qiuyt
							
						 | 
						
							
							
							
							
								
							
								ed9a13f65b
								
							
								
							
						 | 
						
							
							
								
								1、选入药品bug
							
							
							
							
							
							
							
							2、医保上传统计问题 
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								9dbc74c56f
								
							
								
							
						 | 
						
							
							
								
								12/6 现场管理 扫码成功后产品信息展示补齐
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								3fb0422a2b
								
							
								
							
						 | 
						
							
							
								
								拆零库存校验问题,有库存提示问题
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								4a7858a73d
								
							
								
							
						 | 
						
							
							
								
								扫码,拆零,无拆零插入备份表
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								qiuyt
							
						 | 
						
							
							
							
							
								
							
								cba907ba42
								
							
								
							
						 | 
						
							
							
								
								1、选入药品bug
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								qiuyt
							
						 | 
						
							
							
							
							
								
							
								086a0c2354
								
							
								
							
						 | 
						
							
							
								
								1、选入药品bug
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								qiuyt
							
						 | 
						
							
							
							
							
								
							
								d6809e34f5
								
							
								
							
						 | 
						
							
							
								
								1、key使用阿里用户表获取
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								qiuyt
							
						 | 
						
							
							
							
							
								
							
								af003ea3cf
								
							
								
							
						 | 
						
							
							
								
								1、选入药品调用国家库或者阿里接口进行拉取药品码段数据插入我们的表
							
							
							
							
							
							
							
							2、医保接口也没有的时候也调用接口
3、医保菜单上传 
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								d2f82fa0b2
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								29672ba005
								
							
								
							
						 | 
						
							
							
								
								12/3 已完成单-码校验
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								3afecad2b4
								
							
								
							
						 | 
						
							
							
								
								业务单生成扫码单修改
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								0069d2dcd9
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								dbd1f1c0f5
								
							
								
							
						 | 
						
							
							
								
								最小数量修改
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								d639d9bd20
								
							
								
							
						 | 
						
							
							
								
								feat: 加定时重载异常单据功能
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								qiuyt
							
						 | 
						
							
							
							
							
								
							
								341fbc9c6b
								
							
								
							
						 | 
						
							
							
								
								扫码自动获取关联关系对象属性变化
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								a761685950
								
							
								
							
						 | 
						
							
							
								
								11/28 内部码分页优化
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								3f1ea341a2
								
							
								
							
						 | 
						
							
							
								
								取货确认问题
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								0d3e5b670b
								
							
								
							
						 | 
						
							
							
								
								现场管理去除掉产品供应商绑定
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								c88e431977
								
							
								
							
						 | 
						
							
							
								
								待审核单据
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								57b60cddc0
								
							
								
							
						 | 
						
							
							
								
								11/27 上货工位-货架打印优化
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								774d2b0366
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								78f395ada5
								
							
								
							
						 | 
						
							
							
								
								11/27 采集工位-自动采集
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								1e1672da9f
								
							
								
							
						 | 
						
							
							
								
								自动赋码任务修改,完成单据兼容自动赋码
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								d987d112ef
								
							
								
							
						 | 
						
							
							
								
								11/27 单据类型加入字段是否自动处理
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								2f798cad04
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql 
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								647d2c553a
								
							
								
							
						 | 
						
							
							
								
								fix:修复自动完成tagStatus为1的单据
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								2e35f6d0eb
								
							
								
							
						 | 
						
							
							
								
								11/27 工位增加是否自动采集字段
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								b07cf1a073
								
							
								
							
						 | 
						
							
							
								
								11/27 是否自动处理
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								34b5dd1dfe
								
							
								
							
						 | 
						
							
							
								
								11/27 查询优化撤回 修改药品选入diType类型
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								eee7553e6b
								
							
								
							
						 | 
						
							
							
								
								11/27 产品查询优化
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								qiuyt
							
						 | 
						
							
							
							
							
								
							
								46e96c44e1
								
							
								
							
						 | 
						
							
							
								
								第三方基础数据拉取查询问题
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								ed2cab2506
								
							
								
							
						 | 
						
							
							
								
								fix:修复
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								edad8988dd
								
							
								
							
						 | 
						
							
							
								
								关联关系临时解决
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								9341f2bdf0
								
							
								
							
						 | 
						
							
							
								
								fix:修复
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								qiuyt
							
						 | 
						
							
							
							
							
								
							
								69d61b87d2
								
							
								
							
						 | 
						
							
							
								
								药品选入bug
							
							
							
							
							
							
							
							单据错误信息字段更改 
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								e838984013
								
							
								
							
						 | 
						
							
							
								
								基础信息选入问题
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								468a7aeb08
								
							
								
							
						 | 
						
							
							
								
								11/25 申购查询显示优化1.0
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								c0111c959b
								
							
								
							
						 | 
						
							
							
								
								fix:修复
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								a1fd086920
								
							
								
							
						 | 
						
							
							
								
								基础信息选入问题,拉单问题
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								ebfd686f09
								
							
								
							
						 | 
						
							
							
								
								11/25 扫码发货方消失bug
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								qiuyt
							
						 | 
						
							
							
							
							
								
							
								e86612240b
								
							
								
							
						 | 
						
							
							
								
								管理系统增加扫码的时候如果码关联关系找不到那就调用外网的阿里接口进行插入关联关系
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								ab3e5a7173
								
							
								
							
						 | 
						
							
							
								
								11/22 临时码表不存在去正式码表搜索1.0
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								bbdf9c5302
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								f89de74fb8
								
							
								
							
						 | 
						
							
							
								
								第三方产品信息修改
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								9aa9c9b509
								
							
								
							
						 | 
						
							
							
								
								11/21 码明细插入批次号 生产日期 失效日期
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								qiuyt
							
						 | 
						
							
							
							
							
								
							
								764d430322
								
							
								
							
						 | 
						
							
							
								
								1、工位上货大码包装只加入下面一级码 一级码就直接加入
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								8cfbfc56e0
								
							
								
							
						 | 
						
							
							
								
								11/21 槽位管理绑定产品进行过滤1.0
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								qiuyt
							
						 | 
						
							
							
							
							
								
							
								8be0b3b5a8
								
							
								
							
						 | 
						
							
							
								
								1、单据上传统计界面增加采购和销售 码数进行计算开发
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								bf931019d6
								
							
								
							
						 | 
						
							
							
								
								11/20 库存查询优化
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								56e74bade8
								
							
								
							
						 | 
						
							
							
								
								11/20 药品带票出入库查询优化1.0
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								97f4c24dc1
								
							
								
							
						 | 
						
							
							
								
								单据处理数量,槽位绑定,扫码明细等
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								qiuyt
							
						 | 
						
							
							
							
							
								
							
								8ddb8d340c
								
							
								
							
						 | 
						
							
							
								
								1、单据上传统计界面开发
							
							
							
							
							
							
							
							2、单据上传设置在呢个价论述时间定时设置 取消起始上传时间更新逻辑 无限循环处理有问题的单据 
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								32851dfa59
								
							
								
							
						 | 
						
							
							
								
								关联关系修改,处方下载修改
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								f469754e17
								
							
								
							
						 | 
						
							
							
								
								处方单分流,单据读取关联关系
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								qiuyt
							
						 | 
						
							
							
							
							
								
							
								122f698004
								
							
								
							
						 | 
						
							
							
								
								上传医保提示优化
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								f6b2f78d46
								
							
								
							
						 | 
						
							
							
								
								代码备份
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								81622f8fcf
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								qiuyt
							
						 | 
						
							
							
							
							
								
							
								4acc72064f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_fifo_z' of http://116.204.71.86:3000/UDI/udi-wms-java into dev_fifo_z
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								qiuyt
							
						 | 
						
							
							
							
							
								
							
								dd2b6b10ce
								
							
								
							
						 | 
						
							
							
								
								采购计划高级查询
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								a6d4913e49
								
							
								
							
						 | 
						
							
							
								
								11/15 采购订单申购明细
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								4db20f6159
								
							
								
							
						 | 
						
							
							
								
								11/15 药品基础信息优化
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								f0be935b0b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								186ccd438a
								
							
								
							
						 | 
						
							
							
								
								11/14 槽位管理高级搜索
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								9115551dfd
								
							
								
							
						 | 
						
							
							
								
								feat: 修复
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								afd6253b7c
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								4a552f3ac8
								
							
								
							
						 | 
						
							
							
								
								11/14 现场管理规格字段展示优化1.0
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								55beb3b285
								
							
								
							
						 | 
						
							
							
								
								处理单据,关联关系问题等
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								7ddccf734f
								
							
								
							
						 | 
						
							
							
								
								11/13 bug优化1.0
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								1b56dc65f1
								
							
								
							
						 | 
						
							
							
								
								11/13 优化1.0
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								924debdaee
								
							
								
							
						 | 
						
							
							
								
								11/13 上货增加虚拟槽位1.0
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								e380c8cf1f
								
							
								
							
						 | 
						
							
							
								
								11/13 供应商发票优化
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								287057e2fb
								
							
								
							
						 | 
						
							
							
								
								多个工位自动拆零问题
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								da4cde26b1
								
							
								
							
						 | 
						
							
							
								
								feat: 修复
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								53aa5e4c85
								
							
								
							
						 | 
						
							
							
								
								药品层级换算,插入等
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								38165b4cc8
								
							
								
							
						 | 
						
							
							
								
								层级校验修改
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								qiuyt
							
						 | 
						
							
							
							
							
								
							
								acc8ee83ea
								
							
								
							
						 | 
						
							
							
								
								基础管理的药品字典维护 增加明细分类逻辑 增加药品层级逻辑更改 选入增加明细分类 增加耗材字典表字段
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								6c541c8ab9
								
							
								
							
						 | 
						
							
							
								
								关联关系问题修改
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								2a4601b681
								
							
								
							
						 | 
						
							
							
								
								feat: 修复
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								2493f0d8a6
								
							
								
							
						 | 
						
							
							
								
								11/12 槽位管理解除产品
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								7b8a4a6555
								
							
								
							
						 | 
						
							
							
								
								feat: 阿里药品加批准文号
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								78bb88d03d
								
							
								
							
						 | 
						
							
							
								
								feat: 药品关联关系查重功能
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								37f27adf68
								
							
								
							
						 | 
						
							
							
								
								fix:阿里药品关系维护
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								c814146f6c
								
							
								
							
						 | 
						
							
							
								
								11/12 上货时对取货槽,产品判断
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								4c0140e05a
								
							
								
							
						 | 
						
							
							
								
								fix:层级文件上传
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								61f775940e
								
							
								
							
						 | 
						
							
							
								
								11/11 bug优化1.0
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								4745da8c22
								
							
								
							
						 | 
						
							
							
								
								fix:暂存
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								19dce5ea32
								
							
								
							
						 | 
						
							
							
								
								11/11 提示优化1.0
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								qiuyt
							
						 | 
						
							
							
							
							
								
							
								9df7b4a90a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_fifo_z' of http://116.204.71.86:3000/UDI/udi-wms-java into dev_fifo_z
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								qiuyt
							
						 | 
						
							
							
							
							
								
							
								be9014f5d1
								
							
								
							
						 | 
						
							
							
								
								1、增加配置 开启就进行单据所有码包括下级的码进行校验有没有传过 传过了就不能再传了
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								c72e45c9ff
								
							
								
							
						 | 
						
							
							
								
								关联关系问题修改
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								8e716c53dd
								
							
								
							
						 | 
						
							
							
								
								fix:槽位关联关系
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								5d7506360b
								
							
								
							
						 | 
						
							
							
								
								fix:槽位关联关系
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								qiuyt
							
						 | 
						
							
							
							
							
								
							
								59818217ce
								
							
								
							
						 | 
						
							
							
								
								1、增加签到字段
							
							
							
							
							
							
							
							2、校验码是和下级所有码否传过了逻辑还没写 
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								d8ac8c152e
								
							
								
							
						 | 
						
							
							
								
								fix:修复
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								9d99ccb322
								
							
								
							
						 | 
						
							
							
								
								拆零数量不足判断
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								8c35a2be71
								
							
								
							
						 | 
						
							
							
								
								出货槽 分页接口
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								8670d53fce
								
							
								
							
						 | 
						
							
							
								
								业务详情关联取货槽编码
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								3cfddaba55
								
							
								
							
						 | 
						
							
							
								
								出货槽增加产品属性id
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								06625600ac
								
							
								
							
						 | 
						
							
							
								
								11/9 增加摆货层高度  根据货架查看摆货层和出货槽
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								a74fe8a6c3
								
							
								
							
						 | 
						
							
							
								
								确认取药全部完成确认
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								25470950c7
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								d0fb49b0bd
								
							
								
							
						 | 
						
							
							
								
								确认取药
							
							
							
							
							
						 | 
						
							12 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								296a094765
								
							
								
							
						 | 
						
							
							
								
								fix:业务类型增加回传参数设置、单据明细card页面
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								4bba7945b1
								
							
								
							
						 | 
						
							
							
								
								扫码关联关系等相关修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								b250e7b930
								
							
								
							
						 | 
						
							
							
								
								扫码关联关系等相关修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								0940619d9c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql 
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								8d6388c62e
								
							
								
							
						 | 
						
							
							
								
								11/8 工位库存增加卡槽编码
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								b97e374e66
								
							
								
							
						 | 
						
							
							
								
								新增取货确认
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								1a2a766a54
								
							
								
							
						 | 
						
							
							
								
								代码备份
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								cc6f9109fa
								
							
								
							
						 | 
						
							
							
								
								11/7 打印功能
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								25a0b9b9a4
								
							
								
							
						 | 
						
							
							
								
								fix:优化关联关系
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								b58e4aae8c
								
							
								
							
						 | 
						
							
							
								
								fix:优化关联关系
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								7651031603
								
							
								
							
						 | 
						
							
							
								
								11/7 取货架删除
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								1e36dfa587
								
							
								
							
						 | 
						
							
							
								
								11/7 摆货层删除
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								5d9f2ced7e
								
							
								
							
						 | 
						
							
							
								
								11/7 卡槽增加货位1.0
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								1bc6c7319c
								
							
								
							
						 | 
						
							
							
								
								货架code
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								d2d57a13ee
								
							
								
							
						 | 
						
							
							
								
								11/7 货架管理1.1
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								9bfc063682
								
							
								
							
						 | 
						
							
							
								
								现场管理单据审核
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								7b87723552
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								af8e236530
								
							
								
							
						 | 
						
							
							
								
								11/6 货架管理1.0
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								ac6dc59303
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								8bdd8ad3b8
								
							
								
							
						 | 
						
							
							
								
								单据审核问题
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								ea5ad5220f
								
							
								
							
						 | 
						
							
							
								
								fix:修复
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								efdc7cb70f
								
							
								
							
						 | 
						
							
							
								
								11/5 增加货架功能,优化货位1.0
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								605287e869
								
							
								
							
						 | 
						
							
							
								
								最后一个码拆零
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								af172bea40
								
							
								
							
						 | 
						
							
							
								
								自动赋码问题修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								ab7a0474d2
								
							
								
							
						 | 
						
							
							
								
								11/4 上货产品是否属于本货位
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								0e441c3bda
								
							
								
							
						 | 
						
							
							
								
								feat: 码明细到国家同步库
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								ed735aa532
								
							
								
							
						 | 
						
							
							
								
								判断当前工位底下是否有其他产品
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								a8db4fcdc3
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								e6b631a5c7
								
							
								
							
						 | 
						
							
							
								
								根据工位货位队列判断是否同一个产品
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								fa706b6abb
								
							
								
							
						 | 
						
							
							
								
								11/01 bug优化1.0
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								f28501c3d8
								
							
								
							
						 | 
						
							
							
								
								fix: 修复
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								23c3b5d288
								
							
								
							
						 | 
						
							
							
								
								fix: 修复
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								370a1c77a3
								
							
								
							
						 | 
						
							
							
								
								平板工位上货问题
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								96f8d0f76d
								
							
								
							
						 | 
						
							
							
								
								平板工位上货问题
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								d885e26775
								
							
								
							
						 | 
						
							
							
								
								平板工位上货问题
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								4bb3ffb274
								
							
								
							
						 | 
						
							
							
								
								平板工位上货问题
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								c6ad3e0bed
								
							
								
							
						 | 
						
							
							
								
								多码提交确认
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								1b1474307d
								
							
								
							
						 | 
						
							
							
								
								处理单据确认
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								63c1f5f351
								
							
								
							
						 | 
						
							
							
								
								10/31 上货工位增加货位
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								a24a8c5348
								
							
								
							
						 | 
						
							
							
								
								feat: 拆零扫码确认
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								abf62a7bc3
								
							
								
							
						 | 
						
							
							
								
								新增工位上货货位编码,新增处理单据扫码确认
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								5d1e073556
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/java/com/glxp/api/controller/auth/SysWorkplaceQueueController.java
#	src/main/java/com/glxp/api/service/basic/SysWorkplaceQueueService.java 
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								b11c7b3d1b
								
							
								
							
						 | 
						
							
							
								
								10/31 工位分格1.0
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								43e8094c40
								
							
								
							
						 | 
						
							
							
								
								新增工位上货货位编码,新增处理单据扫码确认
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								1f92ad7a9a
								
							
								
							
						 | 
						
							
							
								
								10/30 工位分格1.0
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								b183c8c519
								
							
								
							
						 | 
						
							
							
								
								工位添加格子编码
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								346a0b0413
								
							
								
							
						 | 
						
							
							
								
								工位上货扫码移除
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								4d04834a69
								
							
								
							
						 | 
						
							
							
								
								10/28 剔除码1.0
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								a1b5b58845
								
							
								
							
						 | 
						
							
							
								
								批量删除问题
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								1e918222e1
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java 
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								f08e86703a
								
							
								
							
						 | 
						
							
							
								
								单据处理相关修改,代码备份
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								67d6056b66
								
							
								
							
						 | 
						
							
							
								
								feat: 上传多码融合
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								df185518ed
								
							
								
							
						 | 
						
							
							
								
								10/25 bug 优化 1.0
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								906f15b300
								
							
								
							
						 | 
						
							
							
								
								feat: 上传多码融合
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								4f22588cf8
								
							
								
							
						 | 
						
							
							
								
								feat: 多码融合
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								c992490c13
								
							
								
							
						 | 
						
							
							
								
								10/24 bug优化1.0
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								d5f3142c43
								
							
								
							
						 | 
						
							
							
								
								10/24 bug优化1.0
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								e5fd1d64f9
								
							
								
							
						 | 
						
							
							
								
								代码备份
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								e03511d6b8
								
							
								
							
						 | 
						
							
							
								
								feat: 多码融合
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								3c8db94c77
								
							
								
							
						 | 
						
							
							
								
								feat: 多码融合
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								ed48569d2d
								
							
								
							
						 | 
						
							
							
								
								feat: 多码融合
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								0907e42e4e
								
							
								
							
						 | 
						
							
							
								
								10/23 bug优化1.0
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								ace1830bbb
								
							
								
							
						 | 
						
							
							
								
								代码备份
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								93cf1636f3
								
							
								
							
						 | 
						
							
							
								
								feat: 多码融合
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								qyt
							
						 | 
						
							
							
							
							
								
							
								0fbeb2ae09
								
							
								
							
						 | 
						
							
							
								
								仓库逻辑改变仓库详情的逻辑都改成仓库表(第二次更新)
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								qyt
							
						 | 
						
							
							
							
							
								
							
								4168a85ccb
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_fifo_z' of http://116.204.71.86:3000/UDI/udi-wms-java into dev_fifo_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								fdb95857cc
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								3021ca2d16
								
							
								
							
						 | 
						
							
							
								
								10/22 优化1.0
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								0b10eb6610
								
							
								
							
						 | 
						
							
							
								
								代码备份
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								9e318b8f8e
								
							
								
							
						 | 
						
							
							
								
								fix: 修复工位库存
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								f23db0fe4a
								
							
								
							
						 | 
						
							
							
								
								10/22 库存优化
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								7d7ac52514
								
							
								
							
						 | 
						
							
							
								
								修改扫码减一删除,修改扫码数量,以及PDA扫码时流通时,使用时数量计算
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								qyt
							
						 | 
						
							
							
							
							
								
							
								2df7c3fb94
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_fifo_z' of http://116.204.71.86:3000/UDI/udi-wms-java into dev_fifo_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								a0dba60a33
								
							
								
							
						 | 
						
							
							
								
								feat: 码明细
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								321d4ad85e
								
							
								
							
						 | 
						
							
							
								
								选单搜索
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								qyt
							
						 | 
						
							
							
							
							
								
							
								589e368744
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_no_inv' into dev_fifo_z
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java 
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								qyt
							
						 | 
						
							
							
							
							
								
							
								bef6e840ce
								
							
								
							
						 | 
						
							
							
								
								UdiTraceController 接口兼容修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								9f46579a9d
								
							
								
							
						 | 
						
							
							
								
								查询码明细修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								4d4e4e8760
								
							
								
							
						 | 
						
							
							
								
								feat: 内网拉取外网单据
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								7d4e190b05
								
							
								
							
						 | 
						
							
							
								
								单据完成修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								a17b725415
								
							
								
							
						 | 
						
							
							
								
								feat: 拉取外网单据
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								e3f53aabac
								
							
								
							
						 | 
						
							
							
								
								代码备份
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								qyt
							
						 | 
						
							
							
							
							
								
							
								3813dd8295
								
							
								
							
						 | 
						
							
							
								
								仓库逻辑改变仓库详情的逻辑都改成仓库表(第一次更新)
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								5662dc31d6
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								f42eaebbb6
								
							
								
							
						 | 
						
							
							
								
								代码备份
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								d23572b7cf
								
							
								
							
						 | 
						
							
							
								
								10/21 同步单据修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								afed3289bd
								
							
								
							
						 | 
						
							
							
								
								选择已完成单据问题
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								c2b0c69ef3
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								5f915dffe2
								
							
								
							
						 | 
						
							
							
								
								工位上货问题
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								d4e0b66ff4
								
							
								
							
						 | 
						
							
							
								
								feat: 药品关联信息
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								f614074665
								
							
								
							
						 | 
						
							
							
								
								器械扫码拆零问题
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								86ba1f0dfe
								
							
								
							
						 | 
						
							
							
								
								器械扫码拆零问题
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								43c5b1923f
								
							
								
							
						 | 
						
							
							
								
								feat: 修复
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								86f229fd69
								
							
								
							
						 | 
						
							
							
								
								feat: 修复
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								0c7008a8b7
								
							
								
							
						 | 
						
							
							
								
								feat: 药品关联关系是否存在
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								714531279f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								b3291be59c
								
							
								
							
						 | 
						
							
							
								
								拆零管理大改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								3f2f2edf30
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								e66332e4fb
								
							
								
							
						 | 
						
							
							
								
								feat: 药品关联信息上下传输功能
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								2a1ff42fe7
								
							
								
							
						 | 
						
							
							
								
								10/17 代码备份1.0
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								29bfdc9725
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								f6fbc4272b
								
							
								
							
						 | 
						
							
							
								
								器械层级修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								61e784aca3
								
							
								
							
						 | 
						
							
							
								
								10/17 单据增加单据类型(器械/药品)基础数据器械响应优化
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								081bf3c658
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								bfaae7675e
								
							
								
							
						 | 
						
							
							
								
								feat: 药品关联关系功能
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								987fb774c0
								
							
								
							
						 | 
						
							
							
								
								药品暂时不校验序列号,有bug,药品扫码序列号没有识别到
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								cd2f580e0a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								08c4123483
								
							
								
							
						 | 
						
							
							
								
								库存拆零
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								dcfa320847
								
							
								
							
						 | 
						
							
							
								
								fix: 拉取外网药品关联信息
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								qyt
							
						 | 
						
							
							
							
							
								
							
								fa02aaa439
								
							
								
							
						 | 
						
							
							
								
								1、耗材字典信息表 备注有误修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								d313d19f35
								
							
								
							
						 | 
						
							
							
								
								删除库存明细
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								df00fdc69e
								
							
								
							
						 | 
						
							
							
								
								10/15 基础数据 器械优化
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								5387561d2b
								
							
								
							
						 | 
						
							
							
								
								器械工位上货等相关问题修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								23e199af6d
								
							
								
							
						 | 
						
							
							
								
								fix: 修复原始单据下载本地单据
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								77b0bb79ce
								
							
								
							
						 | 
						
							
							
								
								fix: 修复原始单据下载本地单据
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								a250ce1700
								
							
								
							
						 | 
						
							
							
								
								备份
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								0c21bd46a3
								
							
								
							
						 | 
						
							
							
								
								fix: 修复
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								qyt
							
						 | 
						
							
							
							
							
								
							
								a8b853ef96
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_fifo_z' of http://116.204.71.86:3000/UDI/udi-wms-java into dev_fifo_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								qyt
							
						 | 
						
							
							
							
							
								
							
								8927680db7
								
							
								
							
						 | 
						
							
							
								
								1、增加流通层级默认值为1
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								432882d8ff
								
							
								
							
						 | 
						
							
							
								
								fix: 修复
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								e938cc0c7a
								
							
								
							
						 | 
						
							
							
								
								fix: 修复
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								2bb5f8b116
								
							
								
							
						 | 
						
							
							
								
								fix: 修复
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								dbf696db1e
								
							
								
							
						 | 
						
							
							
								
								feat: 手工、拼箱关联修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								9782e2a47d
								
							
								
							
						 | 
						
							
							
								
								备份
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								18418fa8f0
								
							
								
							
						 | 
						
							
							
								
								feat: 手工、拼箱关联修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								5edf979164
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								7f8a26354e
								
							
								
							
						 | 
						
							
							
								
								重复扫码相关问题
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								f1f8847bfe
								
							
								
							
						 | 
						
							
							
								
								feat: 手工、拼箱关联修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								14ae99a760
								
							
								
							
						 | 
						
							
							
								
								feat: 拼箱关联
							
							
							
							
							
						 | 
						
							1 year ago |