业务入库类型转换完成
Merge branch 'develop' into feature_zsrk

Conflicts:
	src/lnyswz/jxc/service/impl/YwrkServiceImpl.java
Merge branch 'develop' into feature_zsrk
Merge branch 'develop' into feature_zsrk
==
直送入库生成提货单完成
==
==
Merge branch 'feature_zsrk' into develop

Conflicts:
	WebRoot/jxc/cgjh.jsp
	WebRoot/jxc/xsth.jsp
	WebRoot/jxc/ywrk.jsp
	resources/config.properties
	src/lnyswz/jxc/bean/Cgjh.java
	src/lnyswz/jxc/bean/YwrkDet.java
	src/lnyswz/jxc/model/TYwrkDet.java
	src/lnyswz/jxc/service/impl/CgjhServiceImpl.java
	src/lnyswz/jxc/service/impl/XskpServiceImpl.java
	src/lnyswz/jxc/service/impl/XsthServiceImpl.java
	src/lnyswz/jxc/service/impl/YwrkServiceImpl.java