f

Signed-off-by: shjstudy-pc <sunhaijun@skyseaok.com>
整合
Merge branch 'master' of git@github.com:shjstudy-pc/HNXC_WCS.git

Conflicts:
	THOK.MCP.Service.Siemens/Config/Configuration.cs
	THOK.XC.Dispatching.WCS/Crane.xml
	THOK.XC.Dispatching.WCS/DB.xml
	THOK.XC.Process/Process_01/StockInRequestProcess.cs
	THOK.XC.Process/Process_Crane/CraneProcess.cs