Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql

pom.xml

@@ -73,11 +73,6 @@
 			<artifactId>b2c-erp-api</artifactId>
 			<version>0.0.2-SNAPSHOT</version>
 		</dependency>
-		<dependency>
-			<groupId>com.uas.api</groupId>
-			<artifactId>b2c-manage-api</artifactId>
-			<version>0.0.1</version>
-		</dependency>
 		<dependency>
 			<groupId>com.caucho</groupId>
 			<artifactId>hessian</artifactId>

src/main/java/com/uas/platform/b2c/external/erp/product/util/ModelConverter.java

@@ -567,8 +567,8 @@ public class ModelConverter {
         productReplace.setErpId(replace.getBPR_ID());
         //设置替代关系状态
         productReplace.setStatus(replace.getBPR_STATUSCODE());
-        //设置物料号
-        productReplace.setProductId(replace.getBPR_PRODCODE());
+        //TODO 设置物料号
+        productReplace.setProductId(Long.parseLong(replace.getBPR_PRODCODE()));
         //设置替代料号
         productReplace.setReplaceId(replace.getBPR_REPCODE());
         //设置原品牌

src/main/java/com/uas/platform/b2c/prod/commodity/model/ProductReplace.java

@@ -48,7 +48,7 @@ public class ProductReplace implements Serializable{
      * 物料id
      */
     @Column(name = "ptr_prid")
-    private String productId;
+    private Long productId;
 
     /***
      * 替代料号
@@ -155,11 +155,11 @@ public class ProductReplace implements Serializable{
         this.userUU = userUU;
     }
 
-    public String getProductId() {
+    public Long getProductId() {
         return productId;
     }
 
-    public void setProductId(String productId) {
+    public void setProductId(Long productId) {
         this.productId = productId;
     }