wangwei
							
						 | 
						
							
							
							
							
								
							
								71c198668f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql 
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								1dfabbdc42
								
							
								
							
						 | 
						
							
							
								
								12/12 已完成单据 详情优化
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								0f26f7f4d4
								
							
								
							
						 | 
						
							
							
								
								fix: 工位单据类型增加是否上传医保参数
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								920379f15f
								
							
								
							
						 | 
						
							
							
								
								单据上传
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								72699ee8fc
								
							
								
							
						 | 
						
							
							
								
								12/12 字段优化1.0
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								d565cf640e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								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
							
						 | 
						
							
							
							
							
								
							
								14875c39a2
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								151ad2ed2d
								
							
								
							
						 | 
						
							
							
								
								审核送货单带入扫码明细,
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								2cf859a630
								
							
								
							
						 | 
						
							
							
								
								12/9 价格显示问题1.0
							
							
							
							
							
						 | 
						
							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 | 
						
					
				
					
						
							
							
								 
								qiuyt
							
						 | 
						
							
							
							
							
								
							
								3e9eb6de76
								
							
								
							
						 | 
						
							
							
								
								1、菜单更新
							
							
							
							
							
						 | 
						
							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
							
						 | 
						
							
							
							
							
								
							
								b145bd513a
								
							
								
							
						 | 
						
							
							
								
								11/27 脚本
							
							
							
							
							
						 | 
						
							11 months ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								774d2b0366
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
							
							
							
							
							
						 | 
						
							11 months ago |