git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@932 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/erp/service/impl/InquiryServiceImpl.java

@@ -163,8 +163,8 @@ public class InquiryServiceImpl implements InquiryService {
 	 */
 	private Vendor addVendor(PurchaseInquiryItem inquiryItem) {
 		Vendor vendor = new Vendor();
-		vendor.setMyEnUU(inquiryItem.getInquiry().getEnUU());
-		if(inquiryItem.getUserUU() != null || inquiryItem.getUserUU() != 0) {
+		vendor.setMyEnUU(SystemSession.getUser().getEnterprise().getUu());
+		if(inquiryItem.getUserUU() != null && inquiryItem.getUserUU() != 0) {
 			vendor.setMyUserUU(inquiryItem.getUserUU());
 		} else {
 			vendor.setMyUserUU(SystemSession.getUser().getUserUU());

src/main/java/com/uas/platform/b2b/model/PurchaseApBill.java

@@ -91,7 +91,7 @@ public class PurchaseApBill implements Serializable {
 	/**
 	 * 日期
 	 */
-	@Column(name = "pab_userName")
+	@Column(name = "pab_username")
 	private String userName;
 
 	/**

src/main/java/com/uas/platform/b2b/model/PurchaseProofingApproval.java

@@ -70,7 +70,7 @@ public class PurchaseProofingApproval implements Serializable {
 	/**
 	 * 供应商UU
 	 */
-	@Column(name = "psa_vendUU")
+	@Column(name = "psa_venduu")
 	private Long vendUU;
 	/**
 	 * 物料编号
@@ -130,7 +130,7 @@ public class PurchaseProofingApproval implements Serializable {
 	/**
 	 * 录入日期
 	 */
-	@Column(name = "psa_inDate")
+	@Column(name = "psa_indate")
 	private Date inDate;
 	/**
 	 * 备注