修改货位图表按钮的显示条件
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/THOK.WES/THOK.WES/THOK.WES/View/1/BaseTaskForm.Designer.cs
Signed-off-by: zqloon <zqloon@gmail.com>
Merge branch 'master' of git://github.com/zqloon/wms_rfid.git

Conflicts:
	code/THOK.WES/THOK.WES/THOK.WES/View/1/BaseTaskForm.cs
Merge branch 'zxl/master'
修复修改数据结构文件丢失；
Merge branch 'master' of https://github.com/THOK-SW/wms_rfid.git into TestBranch
更新浪潮接口 返回值
Signed-off-by: git1207 <git1302@163.com>