feat:增加物料承认状态(漳州万利达需求)展示

src/main/java/com/uas/platform/b2b/controller/SaleOrderController.java

@@ -569,6 +569,7 @@ public class SaleOrderController {
 		if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
 			filter.setDistribute(distribute.getDistribute());
 		}
+		purchaseOrderService.findEndOrders(pageInfo, filter);
 		return purchaseOrderService.findEndOrders(pageInfo, filter);
 	}
 

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

@@ -299,6 +299,12 @@ public class PurchaseOrderAllItem extends AbstractRedDotKey {
 	@Column(name = "pd_prodoldspec")
 	private String prodOldSpec;
 
+	/**
+	 * 物料承认状态(漳州万利达需求)
+	 */
+	@Column(name = "pd_prmaterial")
+	private String prmaterial;
+
 	/**
 	 * 是否在变更中
 	 */
@@ -311,6 +317,14 @@ public class PurchaseOrderAllItem extends AbstractRedDotKey {
 	@Transient
 	private Double latestReplyQty;
 
+	public String getPrmaterial() {
+		return prmaterial;
+	}
+
+	public void setPrmaterial(String prmaterial) {
+		this.prmaterial = prmaterial;
+	}
+
 	public String getProdOldCode() {
 		return prodOldCode;
 	}

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

@@ -222,6 +222,11 @@ public class PurchaseOrderDoneItem extends AbstractOrderProduct {
 	@Column(name = "pd_prodoldspec")
 	private String prodOldSpec;
 
+	/**
+	 * 物料承认状态(漳州万利达需求)
+	 */
+	@Column(name = "pd_prmaterial")
+	private String prmaterial;
 
 	/**
 	 * 最后一次回复数量
@@ -229,6 +234,14 @@ public class PurchaseOrderDoneItem extends AbstractOrderProduct {
 	@Transient
 	private Double latestReplyQty;
 
+	public String getPrmaterial() {
+		return prmaterial;
+	}
+
+	public void setPrmaterial(String prmaterial) {
+		this.prmaterial = prmaterial;
+	}
+
 	public String getProdOldCode() {
 		return prodOldCode;
 	}

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

@@ -215,48 +215,6 @@ public class PurchaseOrderEnd {
 	@Column(name = "pu_custname")
 	private String custName; // 客户名称。
 
-	/**
-	 * 替代料号
-	 */
-	@Column(name = "pd_repprodcode")
-	private String repProdCode;
-
-	/**
-	 * 替代料名称
-	 */
-	@Column(name = "pd_repprodtitle")
-	private String repProdTitle;
-
-	/**
-	 * 替代料规格
-	 */
-	@Column(name = "pd_repprodspec")
-	private String repProdSpec;
-
-	public String getRepProdCode() {
-		return repProdCode;
-	}
-
-	public void setRepProdCode(String repProdCode) {
-		this.repProdCode = repProdCode;
-	}
-
-	public String getRepProdTitle() {
-		return repProdTitle;
-	}
-
-	public void setRepProdTitle(String repProdTitle) {
-		this.repProdTitle = repProdTitle;
-	}
-
-	public String getRepProdSpec() {
-		return repProdSpec;
-	}
-
-	public void setRepProdSpec(String repProdSpec) {
-		this.repProdSpec = repProdSpec;
-	}
-
 	public String getPurpose() {
 		return purpose;
 	}

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

@@ -151,6 +151,31 @@ public class PurchaseOrderEndItem extends AbstractOrderProduct {
 	@Column(name = "pd_returnqty")
 	private Double returnQty;
 
+	/**
+	 * 替代料号
+	 */
+	@Column(name = "pd_repprodcode")
+	private String repProdCode;
+
+	/**
+	 * 替代料名称
+	 */
+	@Column(name = "pd_repprodtitle")
+	private String repProdTitle;
+
+	/**
+	 * 替代料规格
+	 */
+	@Column(name = "pd_repprodspec")
+	private String repProdSpec;
+
+
+	/**
+	 * 物料承认状态(漳州万利达需求)
+	 */
+	@Column(name = "pd_prmaterial")
+	private String prmaterial;
+
 	/**
 	 * 关键词查询相关
 	 */
@@ -163,6 +188,14 @@ public class PurchaseOrderEndItem extends AbstractOrderProduct {
 	@Transient
 	private Double latestReplyQty;
 
+	public String getPrmaterial() {
+		return prmaterial;
+	}
+
+	public void setPrmaterial(String prmaterial) {
+		this.prmaterial = prmaterial;
+	}
+
 	public Long getId() {
 		return id;
 	}
@@ -179,6 +212,30 @@ public class PurchaseOrderEndItem extends AbstractOrderProduct {
 		this.number = number;
 	}
 
+	public String getRepProdCode() {
+		return repProdCode;
+	}
+
+	public void setRepProdCode(String repProdCode) {
+		this.repProdCode = repProdCode;
+	}
+
+	public String getRepProdTitle() {
+		return repProdTitle;
+	}
+
+	public void setRepProdTitle(String repProdTitle) {
+		this.repProdTitle = repProdTitle;
+	}
+
+	public String getRepProdSpec() {
+		return repProdSpec;
+	}
+
+	public void setRepProdSpec(String repProdSpec) {
+		this.repProdSpec = repProdSpec;
+	}
+
 	@Override
 	public Long getProductId() {
 		return productId;

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

@@ -144,6 +144,12 @@ public class PurchaseOrderReceivedItem extends AbstractOrderProduct {
 	@Column(name = "pd_returnqty")
 	private Double returnQty;
 
+	/**
+	 * 物料承认状态(漳州万利达需求)
+	 */
+	@Column(name = "pd_prmaterial")
+	private String prmaterial;
+
 	/**
 	 * 关键词查询相关
 	 */
@@ -156,6 +162,14 @@ public class PurchaseOrderReceivedItem extends AbstractOrderProduct {
 	@Transient
 	private Double latestReplyQty;
 
+	public String getPrmaterial() {
+		return prmaterial;
+	}
+
+	public void setPrmaterial(String prmaterial) {
+		this.prmaterial = prmaterial;
+	}
+
 	public Long getId() {
 		return id;
 	}

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

@@ -212,12 +212,26 @@ public class PurchaseOrderTodoItem extends AbstractOrderProduct {
 	@Column(name = "pd_prodoldspec")
 	private String prodOldSpec;
 
+	/**
+	 * 物料承认状态(漳州万利达需求)
+	 */
+	@Column(name = "pd_prmaterial")
+	private String prmaterial;
+
     /**
      * 最后一次回复数量
      */
 	@Transient
 	private Double latestReplyQty;
 
+	public String getPrmaterial() {
+		return prmaterial;
+	}
+
+	public void setPrmaterial(String prmaterial) {
+		this.prmaterial = prmaterial;
+	}
+
 	public String getProdOldCode() {
 		return prodOldCode;
 	}

src/main/webapp/resources/tpl/index/sale/order_detail.html

@@ -146,6 +146,7 @@
 							<div class="text-overflow" title="{{::item.product.title}}">
 								<span ng-bind="::item.product.title"></span> </div>
 							<div class="text-muted text-over" ng-bind="::item.product.spec" title="{{::item.product.spec}}"></div>
+							<div class="text-bole text-inverse text-flow" ng-if="item.prmaterial" ><b>承认状态：</b><span ng-bind="::item.prmaterial"></span></div>
 							<div class="text-bole text-inverse text-flow" ng-if="item.prodOldCode" ><b>旧料编号：</b><span ng-bind="::item.prodOldCode"></span></div>
 							<div class="text-bold text-inverse text-flow" ng-if="item.prodOldTitle" ><b>旧料名称：</b><span ng-bind="::item.prodOldTitle"></span></div>
 							<div class="text-bold text-inverse text-flow" ng-if="item.prodOldSpec" ><b>旧料规格：</b><span ng-bind="::item.prodOldSpec"></span></div>