Merge branch 'feature_release-tomysql' into dev-mysql

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

@@ -66,12 +66,6 @@ public class V_ProductPerson implements Serializable{
     @Column(name = "pr_minpack")
     private Double minPackQty;
 
-    /**
-     * 库存数 erp的库存数
-     */
-    @Column(name = "pr_stock")
-    private Double stock;
-
     /**
      * ERP空闲库存
      */
@@ -189,22 +183,6 @@ public class V_ProductPerson implements Serializable{
     @Column(name = "pr_standard")
     private Integer standard;
 
-    /**
-     * 对应Goods是否已在售
-     * 1.YES<br>
-     * 0.NO
-     */
-    @Column(name = "pr_sold")
-    private Integer sold;
-
-    /**
-     * 是否可上架，是否有对应的Good信息
-     * 1.YES<br>
-     * 0.NO
-     */
-    @Column(name = "pr_can_sell")
-    private Integer canSell;
-
     /**
      * 匹配状态（记录匹配状态，方便下次查看）
      * 111 匹配成功 ->变为标准
@@ -243,36 +221,6 @@ public class V_ProductPerson implements Serializable{
     @Column(name = "pr_manufacturedate")
     private String produceDate;
 
-    /**
-     * 企业的币别信息
-     */
-    @Column(name = "pr_currency")
-    private String currency;
-
-    /**
-     * 在售数量
-     */
-    @Column(name = "pro_onsale")
-    private Double onSaleQty;
-
-    /**
-     * 锁库数
-     */
-    @Column(name = "pr_lockqty")
-    private Double lockQty;
-
-    /**
-     * 可上架数量
-     */
-    @Column(name = "pr_availableonsale")
-    private Double availableOnSale;
-
-    /**
-     * 仓库数量
-     */
-    @Column(name = "pr_repositoryqty")
-    private Double repositoryQty;
-
     /**
      * 器件的图片
      */
@@ -325,6 +273,14 @@ public class V_ProductPerson implements Serializable{
     @Column(name = "user_uu")
     private Long ppUserUU;
 
+    public Long getPpId() {
+        return ppId;
+    }
+
+    public void setPpId(Long ppId) {
+        this.ppId = ppId;
+    }
+
     public Long getId() {
         return id;
     }
@@ -381,14 +337,6 @@ public class V_ProductPerson implements Serializable{
         this.minPackQty = minPackQty;
     }
 
-    public Double getStock() {
-        return stock;
-    }
-
-    public void setStock(Double stock) {
-        this.stock = stock;
-    }
-
     public Double getErpReserve() {
         return erpReserve;
     }
@@ -533,22 +481,6 @@ public class V_ProductPerson implements Serializable{
         this.standard = standard;
     }
 
-    public Integer getSold() {
-        return sold;
-    }
-
-    public void setSold(Integer sold) {
-        this.sold = sold;
-    }
-
-    public Integer getCanSell() {
-        return canSell;
-    }
-
-    public void setCanSell(Integer canSell) {
-        this.canSell = canSell;
-    }
-
     public Integer getMatchstatus() {
         return matchstatus;
     }
@@ -597,46 +529,6 @@ public class V_ProductPerson implements Serializable{
         this.produceDate = produceDate;
     }
 
-    public String getCurrency() {
-        return currency;
-    }
-
-    public void setCurrency(String currency) {
-        this.currency = currency;
-    }
-
-    public Double getOnSaleQty() {
-        return onSaleQty;
-    }
-
-    public void setOnSaleQty(Double onSaleQty) {
-        this.onSaleQty = onSaleQty;
-    }
-
-    public Double getLockQty() {
-        return lockQty;
-    }
-
-    public void setLockQty(Double lockQty) {
-        this.lockQty = lockQty;
-    }
-
-    public Double getAvailableOnSale() {
-        return availableOnSale;
-    }
-
-    public void setAvailableOnSale(Double availableOnSale) {
-        this.availableOnSale = availableOnSale;
-    }
-
-    public Double getRepositoryQty() {
-        return repositoryQty;
-    }
-
-    public void setRepositoryQty(Double repositoryQty) {
-        this.repositoryQty = repositoryQty;
-    }
-
     public String getCmpImg() {
         return cmpImg;
     }
@@ -700,12 +592,4 @@ public class V_ProductPerson implements Serializable{
     public void setPpUserUU(Long ppUserUU) {
         this.ppUserUU = ppUserUU;
     }
-
-    public Long getPpId() {
-        return ppId;
-    }
-
-    public void setPpId(Long ppId) {
-        this.ppId = ppId;
-    }
 }

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

@@ -59,12 +59,6 @@ public class V_ProductPrivate implements Serializable {
     @Column(name = "pr_minpack")
     private Double minPackQty;
 
-    /**
-     * 库存数 erp的库存数
-     */
-    @Column(name = "pr_stock")
-    private Double stock;
-
     /**
      * ERP空闲库存
      */
@@ -182,22 +176,6 @@ public class V_ProductPrivate implements Serializable {
     @Column(name = "pr_standard")
     private Integer standard;
 
-    /**
-     * 对应Goods是否已在售
-     * 1.YES<br>
-     * 0.NO
-     */
-    @Column(name = "pr_sold")
-    private Integer sold;
-
-    /**
-     * 是否可上架，是否有对应的Good信息
-     * 1.YES<br>
-     * 0.NO
-     */
-    @Column(name = "pr_can_sell")
-    private Integer canSell;
-
     /**
      * 匹配状态（记录匹配状态，方便下次查看）
      * 111 匹配成功 ->变为标准
@@ -236,36 +214,6 @@ public class V_ProductPrivate implements Serializable {
     @Column(name = "pr_manufacturedate")
     private String produceDate;
 
-    /**
-     * 企业的币别信息
-     */
-    @Column(name = "pr_currency")
-    private String currency;
-
-    /**
-     * 在售数量
-     */
-    @Column(name = "pro_onsale")
-    private Double onSaleQty;
-
-    /**
-     * 锁库数
-     */
-    @Column(name = "pr_lockqty")
-    private Double lockQty;
-
-    /**
-     * 可上架数量
-     */
-    @Column(name = "pr_availableonsale")
-    private Double availableOnSale;
-
-    /**
-     * 仓库数量
-     */
-    @Column(name = "pr_repositoryqty")
-    private Double repositoryQty;
-
     /**
      * 器件的图片
      */
@@ -312,7 +260,6 @@ public class V_ProductPrivate implements Serializable {
     @Column(name = "pr_batchcount")
     private Integer batchCount;
 
-
     public Long getId() {
         return id;
     }
@@ -369,14 +316,6 @@ public class V_ProductPrivate implements Serializable {
         this.minPackQty = minPackQty;
     }
 
-    public Double getStock() {
-        return stock;
-    }
-
-    public void setStock(Double stock) {
-        this.stock = stock;
-    }
-
     public Double getErpReserve() {
         return erpReserve;
     }
@@ -521,22 +460,6 @@ public class V_ProductPrivate implements Serializable {
         this.standard = standard;
     }
 
-    public Integer getSold() {
-        return sold;
-    }
-
-    public void setSold(Integer sold) {
-        this.sold = sold;
-    }
-
-    public Integer getCanSell() {
-        return canSell;
-    }
-
-    public void setCanSell(Integer canSell) {
-        this.canSell = canSell;
-    }
-
     public Integer getMatchstatus() {
         return matchstatus;
     }
@@ -585,46 +508,6 @@ public class V_ProductPrivate implements Serializable {
         this.produceDate = produceDate;
     }
 
-    public String getCurrency() {
-        return currency;
-    }
-
-    public void setCurrency(String currency) {
-        this.currency = currency;
-    }
-
-    public Double getOnSaleQty() {
-        return onSaleQty;
-    }
-
-    public void setOnSaleQty(Double onSaleQty) {
-        this.onSaleQty = onSaleQty;
-    }
-
-    public Double getLockQty() {
-        return lockQty;
-    }
-
-    public void setLockQty(Double lockQty) {
-        this.lockQty = lockQty;
-    }
-
-    public Double getAvailableOnSale() {
-        return availableOnSale;
-    }
-
-    public void setAvailableOnSale(Double availableOnSale) {
-        this.availableOnSale = availableOnSale;
-    }
-
-    public Double getRepositoryQty() {
-        return repositoryQty;
-    }
-
-    public void setRepositoryQty(Double repositoryQty) {
-        this.repositoryQty = repositoryQty;
-    }
-
     public String getCmpImg() {
         return cmpImg;
     }

src/main/webapp/resources/view/vendor/forstore/vendor_material.html

@@ -1550,8 +1550,8 @@
 	<div class="pro_management device">
 		<div class="com_tab">
 			<ul class="fl" style="width: 100%">
-				<li ng-class="{'active': tab == 'material_person'}"><a ui-sref="vendor_material_person">个人产品库</a></li>
 				<li ng-class="{'active': tab == 'material'}"><a ui-sref="vendor_material">企业产品库</a></li>
+				<li ng-class="{'active': tab == 'material_person'}"><a ui-sref="vendor_material_person">个人产品库</a></li>
 				<li ng-class="{'active': tab == 'onSale'}"><a ui-sref="vendor_onSale">在售产品</a></li>
 				<li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage">上下架历史</a></li>
 			</ul>

src/main/webapp/resources/view/vendor/forstore/vendor_material_person.html

@@ -1493,8 +1493,8 @@
 	<div class="pro_management device">
 		<div class="com_tab">
 			<ul class="fl" style="width: 100%">
-				<li ng-class="{'active': tab == 'material_person'}"><a ui-sref="vendor_material_person">个人产品库</a></li>
 				<li ng-class="{'active': tab == 'material'}"><a ui-sref="vendor_material">企业产品库</a></li>
+				<li ng-class="{'active': tab == 'material_person'}"><a ui-sref="vendor_material_person">个人产品库</a></li>
 				<li ng-class="{'active': tab == 'onSale'}"><a ui-sref="vendor_onSale">在售产品</a></li>
 				<li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage">上下架历史</a></li>
 			</ul>

src/main/webapp/resources/view/vendor/forstore/vendor_onSale.html

@@ -728,8 +728,8 @@
     <div class="pro_management device">
         <div class="com_tab">
             <ul class="fl" style="width: 100%">
-                <li ng-class="{'active': tab == 'material_person'}"><a ui-sref="vendor_material_person">个人产品库</a></li>
                 <li ng-class="{'active': tab == 'material'}"><a ui-sref="vendor_material">企业产品库</a></li>
+                <li ng-class="{'active': tab == 'material_person'}"><a ui-sref="vendor_material_person">个人产品库</a></li>
                 <li ng-class="{'active': tab == 'onSale'}"><a ui-sref="vendor_onSale">在售产品</a></li>
                 <li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage">上下架历史</a></li>
                 <li class="down-goods">

src/main/webapp/resources/view/vendor/forstore/vendor_undercarriage.html

@@ -553,8 +553,8 @@
     <div class="pro_management device">
         <div class="com_tab">
             <ul class="fl" style="width: 100%">
-                <li ng-class="{'active': tab == 'material_person'}"><a ui-sref="vendor_material_person">个人产品库</a></li>
                 <li ng-class="{'active': tab == 'vendor_material'}"><a ui-sref="vendor_material">企业产品库</a></li>
+                <li ng-class="{'active': tab == 'material_person'}"><a ui-sref="vendor_material_person">个人产品库</a></li>
                 <li ng-class="{'active': tab == 'onSale'}"><a ui-sref="vendor_onSale">在售产品</a></li>
                 <li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage">上下架历史</a></li>
             </ul>

src/main/webapp/resources/view/vendor/left_nav.html

@@ -57,7 +57,7 @@
 	<!--	<li ng-class="{'active' : active == 'vendor_productOn'}"><span  ui-sref="vendor_productOn">产品导入</span></li>-->
 		<li ng-class="{'active' : active == 'vendor_productOn'}"><span  ui-sref="vendor_upload">产品导入</span></li>
 		<!--<li ng-class="{'active' : active == 'vendor_repository'}"><span  ui-sref="vendor_repository">仓库管理</span></li>-->
-		<li ng-class="{'active' : active == 'vendor_material_person'}"><span  ui-sref="vendor_material_person">产品管理</span></li>
+		<li ng-class="{'active' : active == 'vendor_material'}"><span  ui-sref="vendor_material">产品管理</span></li>
 		<!--<li ng-class="{'active' : active == 'vendor_after_sale'}" class="undo">-->
 		<!--&lt;!&ndash;<span  ui-sref="vendor_after_sale">售后处理</span>&ndash;&gt;-->
 		<!--售后处理-->
@@ -87,7 +87,7 @@
 			<!--	<li ng-class="{'active' : active == 'vendor_productOn'}"><span  ui-sref="vendor_productOn">产品导入</span></li>-->
 			<li ng-class="{'active' : active == 'vendor_productOn'}"><span ng-click="promptUpdate()" class="disabled" >产品导入</span></li>
 			<!--<li ng-class="{'active' : active == 'vendor_repository'}"><span  ui-sref="vendor_repository">仓库管理</span></li>-->
-			<li ng-class="{'active' : active == 'vendor_material_person'}"><span ng-click="promptUpdate()" class="disabled" >产品管理</span></li>
+			<li ng-class="{'active' : active == 'vendor_material'}"><span ng-click="promptUpdate()" class="disabled" >产品管理</span></li>
 			<!--<li ng-class="{'active' : active == 'vendor_after_sale'}" class="undo">-->
 			<!--&lt;!&ndash;<span  ui-sref="vendor_after_sale">售后处理</span>&ndash;&gt;-->
 			<!--售后处理-->