Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git

Conflicts:
	code/Authority/Wms/Wms.csproj
修改货位图表按钮的显示条件
Signed-off-by: zqloon <zqloon@gmail.com>
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
合并要更改数据库（分拣线、罚没区等）库区的layer、col两个字段，不要让两个货位重合
Signed-off-by: zqloon <zqloon@gmail.com>
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git

Conflicts:
	code/Authority/Wms/Wms.csproj

Signed-off-by: zqb <940658539@qq.com>
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
路径信息的编辑、删除功能的bug修改
Signed-off-by: Dong-Yang <772369620@qq.com>
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
货位信息编辑，删除BUG修改完成，区域信息BUG删除修改完成

Signed-off-by: yaojianfeng <759775741@qq.com>
Merge branch 'master' of git@github.com:THOK-SW/wms_rfid.git
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git

Conflicts:
	code/THOK.WES/THOK.WES/THOK.WES/View/1/BaseTaskForm.Designer.cs
Signed-off-by: zqloon <zqloon@gmail.com>
WCS路径信息查询界面修改完成

Signed-off-by: yaojianfeng <759775741@qq.com>
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
Merge branch 'zxl/master'
损益单 单位选择
Signed-off-by: zqb <940658539@qq.com>