wangwei
							
						 | 
						
							
							
							
							
								
							
								3287a4f228
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter
							
							
							
							
							
							
							
							# Conflicts:
#	src/views/collect/DealOrder.vue 
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								f82d9ab036
								
							
								
							
						 | 
						
							
							
								
								10/31 上货工位增加货位上架功能
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								91fb39d99c
								
							
								
							
						 | 
						
							
							
								
								工位上货单据按货位上货,处理单据拆零扫码确认
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								f24d422214
								
							
								
							
						 | 
						
							
							
								
								fix:上货修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								08832de135
								
							
								
							
						 | 
						
							
							
								
								工位上货单据按货位上货,处理单据拆零扫码确认
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								b5b91d7018
								
							
								
							
						 | 
						
							
							
								
								10/30 处理单据扫码剔除和工位分格
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								7828bbf1aa
								
							
								
							
						 | 
						
							
							
								
								高拍仪批量扫码问题
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								f6799b0b46
								
							
								
							
						 | 
						
							
							
								
								fix:药品关联关系
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								7e7111c510
								
							
								
							
						 | 
						
							
							
								
								fix:药品关联关系
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								688a238e2b
								
							
								
							
						 | 
						
							
							
								
								10/28 剔除码1.0
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								541cc3770a
								
							
								
							
						 | 
						
							
							
								
								fix:药品关联关系
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								1301c462e3
								
							
								
							
						 | 
						
							
							
								
								fix:药品关联关系
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								qyt
							
						 | 
						
							
							
							
							
								
							
								85cd9d8c91
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								qyt
							
						 | 
						
							
							
							
							
								
							
								0099f2bb4b
								
							
								
							
						 | 
						
							
							
								
								1、物资字典维护的编辑界面产品标识选择编辑一个的时候其他的不能进行修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								51f78cc770
								
							
								
							
						 | 
						
							
							
								
								fix:重置bug
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								f5f4b2c1d3
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								e54251abf4
								
							
								
							
						 | 
						
							
							
								
								10/25 bug优化 1.0
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								56d8be01be
								
							
								
							
						 | 
						
							
							
								
								feat: 多码融合
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								qyt
							
						 | 
						
							
							
							
							
								
							
								d87bb86c4f
								
							
								
							
						 | 
						
							
							
								
								Merge branch '20240912_adapter' of http://116.204.71.86:3000/UDI/udiwms-vue-frame into 20240912_adapter
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								qyt
							
						 | 
						
							
							
							
							
								
							
								57ca055852
								
							
								
							
						 | 
						
							
							
								
								1、查看新增的采购订单时刷新重置问题
							
							
							
							
							
							
							
							2、待校验单据页面查询和重置进行下面的表格刷新 
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								bd123945b5
								
							
								
							
						 | 
						
							
							
								
								feat: 多码融合
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								3df6fea79a
								
							
								
							
						 | 
						
							
							
								
								高拍仪批量扫码问题
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								qyt
							
						 | 
						
							
							
							
							
								
							
								cf7a86d94e
								
							
								
							
						 | 
						
							
							
								
								新增业务单新增编辑时上方扫码栏位信息动态配置隐藏
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								85b68ba192
								
							
								
							
						 | 
						
							
							
								
								9/24 现场管理已完成单 请求改为post
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								a943a81a80
								
							
								
							
						 | 
						
							
							
								
								10/22 优化1.0
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								77edb8a07d
								
							
								
							
						 | 
						
							
							
								
								fix: 修复
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								3011e448d5
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								c99336830e
								
							
								
							
						 | 
						
							
							
								
								单据完成改为post
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								5080a94396
								
							
								
							
						 | 
						
							
							
								
								fix: 修复
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								92eb1dc129
								
							
								
							
						 | 
						
							
							
								
								代码备份
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								4f720babf1
								
							
								
							
						 | 
						
							
							
								
								fix: 修复
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								fb7ce6a6fa
								
							
								
							
						 | 
						
							
							
								
								feat: 药品关联信息
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								34e88afb95
								
							
								
							
						 | 
						
							
							
								
								10/17 单据增加单据类型 基础数据器械界面优化
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								a8eec2cc49
								
							
								
							
						 | 
						
							
							
								
								10-15 基础数据 器械优化1.0
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								qyt
							
						 | 
						
							
							
							
							
								
							
								28754f6c05
								
							
								
							
						 | 
						
							
							
								
								1、从药品字典维护编辑功能移植到耗材字典维护 用他的界面和逻辑
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								ace8a4d295
								
							
								
							
						 | 
						
							
							
								
								feat: 手工、拼箱关联修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								4b6cc4215a
								
							
								
							
						 | 
						
							
							
								
								feat: 拼箱
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								56927debf5
								
							
								
							
						 | 
						
							
							
								
								10/12 bug优化
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								zane
							
						 | 
						
							
							
							
							
								
							
								df7e17875e
								
							
								
							
						 | 
						
							
							
								
								bug
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								zane
							
						 | 
						
							
							
							
							
								
							
								7c69829a27
								
							
								
							
						 | 
						
							
							
								
								全部清空仍可提交bug
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								3fe00231f8
								
							
								
							
						 | 
						
							
							
								
								feat: 拼箱
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								cb027420bb
								
							
								
							
						 | 
						
							
							
								
								feat: 拼箱
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								35d1d14ca2
								
							
								
							
						 | 
						
							
							
								
								feat: 拼箱
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								e646485455
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								5ec4bed9f5
								
							
								
							
						 | 
						
							
							
								
								feat: 拼箱
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								zane
							
						 | 
						
							
							
							
							
								
							
								75d086d9be
								
							
								
							
						 | 
						
							
							
								
								废弃
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								b0db8f8fd3
								
							
								
							
						 | 
						
							
							
								
								feat: 手动关联
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								18d31cf8a9
								
							
								
							
						 | 
						
							
							
								
								feat: 手动关联
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								zane
							
						 | 
						
							
							
							
							
								
							
								faf615eeee
								
							
								
							
						 | 
						
							
							
								
								Merge branch '20240912_adapter' of http://116.204.71.86:3000/UDI/udiwms-vue-frame into 20240912_adapter
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								zane
							
						 | 
						
							
							
							
							
								
							
								9f56d4f294
								
							
								
							
						 | 
						
							
							
								
								暂存
							
							
							
							
							
						 | 
						
							1 year ago |