wms入库和移库显示主表添加总数量
wes部分代码删除和修改
Signed-off-by: loou <loou@vip.qq.com>
Merge branch 'master' of https://github.com/THOK-SW/wms_rfid.git
Merge branch 'master' of https://github.com/THOK-SW/wms_rfid.git
Merge branch 'master' of https://github.com/THOK-SW/wms_rfid.git
改动wms根据条件查询数据
Signed-off-by: loou <loou@vip.qq.com>
Merge branch 'master' of https://github.com/THOK-SW/wms_rfid.git

Conflicts:
	code/Authority/THOK.Wms.AutomotiveSystems/Models/BillDetail.cs
	code/THOK.WES/THOK.WES/THOK.WES.Interface/Model/BillDetail.cs
Merge remote-tracking branch 'refs/remotes/zxl/master'