Просмотр исходного кода

物料编辑,如果有管理单据导入信息不可编辑

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@9747 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
hejq 8 лет назад
Родитель
Сommit
19b6a11b15

+ 4 - 1
src/main/java/com/uas/platform/b2b/controller/BaseInfoController.java

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.account.util.AccountUtils;
 import com.uas.platform.b2b.model.Enterprise;
@@ -190,7 +191,9 @@ public class BaseInfoController {
 	@RequestMapping(value = "/{id}", method = RequestMethod.GET)
 	@ResponseBody
 	public Product getProductInfoById(@PathVariable("id") Long id) {
-		return baseInfoService.findById(id);
+		Product product = baseInfoService.findById(id);
+		System.out.println(JSON.toJSON(product));
+		return product;
 	}
 
 	/**

+ 9 - 0
src/main/java/com/uas/platform/b2b/dao/ProductDao.java

@@ -200,4 +200,13 @@ public interface ProductDao extends JpaSpecificationExecutor<Product>, JpaReposi
 	 */
 	@Procedure(procedureName = "PRODUCT$SWITCH")
 	public void switchProductByEnuuAndTypeAndStatus(Long enuu, String switchtype, Integer switchstatus);
+
+	/**
+	 * 通过id判断是否有业务关系
+	 * 
+	 * @param id
+	 * @return
+	 */
+	@Procedure(procedureName = "PRODUCT$BUSINESSSTATUS")
+	public Integer findProductBusinessStatusById(Long id);
 }

+ 16 - 0
src/main/java/com/uas/platform/b2b/model/Product.java

@@ -284,6 +284,14 @@ public class Product {
 	@Column(name = "pr_downloadstatus")
 	private Integer downloadstatus;
 
+	/**
+	 * 是否有业务逻辑关系<br>
+	 * 1. 是<br>
+	 * 0. 否
+	 */
+	@Column(name = "pr_isbusiness")
+	private Short isbusiness;
+
 	public Product() {
 	}
 
@@ -596,4 +604,12 @@ public class Product {
 		this.downloadstatus = downloadstatus;
 	}
 
+	public Short getIsbusiness() {
+		return isbusiness;
+	}
+
+	public void setIsbusiness(Short isbusiness) {
+		this.isbusiness = isbusiness;
+	}
+
 }