Merge branch 'dev' of ssh://10.10.101.21/source/platform-b2b into debug

src/main/java/com/uas/platform/b2b/erp/model/Prod.java

@@ -1,11 +1,12 @@
 package com.uas.platform.b2b.erp.model;
 
-import java.util.Date;
-
 import com.uas.platform.b2b.model.Enterprise;
 import com.uas.platform.b2b.model.Product;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.Constant;
+import com.uas.platform.core.model.Status;
+
+import java.util.Date;
 
 /**
  * ERP系统的产品
@@ -274,13 +275,19 @@ public class Prod {
 		product.setLtinstock(this.pr_ltinstock);
 		product.setSourceId(this.pr_id);
 		product.setBrand(this.pr_brand);
-		// if (this.pr_status != null) {
-		// if (this.pr_status.equals(Status.AUDITED.getPhrase())) {
-		// product.setIsSale((short) 1);
-		// } else if (this.pr_status.equals(Status.DISABLED.getPhrase())) {
-		// product.setIsSale((short) 0);
-		// }
-		// }
+		if (this.pr_status != null) {
+			if (this.pr_status.equals(Status.DISABLED.getPhrase())) {
+				product.setB2benabled(Constant.YES);
+			} else {
+				product.setB2benabled(null);
+			}
+
+//			if (this.pr_status.equals(Status.AUDITED.getPhrase())) {
+//				//product.setIsSale((short) 1);
+//			} else if (this.pr_status.equals(Status.DISABLED.getPhrase())) {
+//				//product.setIsSale((short) 0);
+//			}
+		}
 		if (this.pr_orispeccode != null) {
 			product.setCmpCode(this.pr_orispeccode);
 		} else {