Signed-off-by: jerry <mahaiping@skyseaok.com>
Merge branch 'master' of git@github.com:shjstudy/HNXC_WCS.git

Conflicts:
	THOK.MCP.Service.Siemens/Config/Configuration.cs
	THOK.OPC/OPCServer.cs
	THOK.XC.Dispatching.WCS/StockPLC_01.xml
Signed-off-by: jerry <mahaiping@skyseaok.com>
Merge branch 'master' of git@github.com:shjstudy/HNXC_WCS.git
Signed-off-by: shjstudy <shjstudy@163.com>