Signed-off-by: jerry <mahaiping@skyseaok.com>
Merge branch 'master' of git@github.com:shjstudy/HNXC_WCS.git
Merge branch 'master' of git@github.com:XMTHOK/HNXC_WCS.git
作业改动
c
Merge branch 'master' of git@github.com:shjstudy/HNXC_WCS.git

Conflicts:
	THOK.XC.Dispatching/OperateView/StockOutWorkQueryDialog.cs