feat(order,notice):新增帝显旧料传输和显示

db/ddl.sql

@@ -21,4 +21,12 @@
   add column pd_repprodtitle VARCHAR(255)  comment '替代料名称',
   add column pd_repprodspec VARCHAR(255)  comment '替代料规格';
 
+-- date: 2018-12-25 10:51
+-- author: huj
+-- content: 采购明细单增加旧料编号、旧料名称、旧料规格三个字段（帝显LED物料需求）
+alter table `purc$orderitems`
+  add column pd_prodoldcode VARCHAR(255)  comment '旧料编号',
+  add column pd_prodoldtitle VARCHAR(255)  comment '旧料名称',
+  add column pd_prodoldspec VARCHAR(255)  comment '旧料规格';
+
 

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

@@ -65,6 +65,37 @@ public class PurchaseDetail {
 	//替代料规格
 	private String pd_repspec;
 
+	//旧料编号
+	private String pr_oldcode;
+	//旧料名称
+	private String pr_oldname;
+	//旧料规格
+	private String pr_oldspec;
+
+	public String getPr_oldcode() {
+		return pr_oldcode;
+	}
+
+	public void setPr_oldcode(String pr_oldcode) {
+		this.pr_oldcode = pr_oldcode;
+	}
+
+	public String getPr_oldname() {
+		return pr_oldname;
+	}
+
+	public void setPr_oldname(String pr_oldname) {
+		this.pr_oldname = pr_oldname;
+	}
+
+	public String getPr_oldspec() {
+		return pr_oldspec;
+	}
+
+	public void setPr_oldspec(String pr_oldspec) {
+		this.pr_oldspec = pr_oldspec;
+	}
+
 	public String getPd_repprodcode() {
 		return pd_repprodcode;
 	}
@@ -332,6 +363,9 @@ public class PurchaseDetail {
 		item.setRepProdCode(this.pd_repprodcode);
 		item.setRepProdTitle(this.pd_repdetail);
 		item.setRepProdSpec(this.pd_repspec);
+		item.setProdOldCode(this.pr_oldcode);
+		item.setRepProdTitle(this.pr_oldname);
+		item.setProdOldSpec(this.pr_oldspec);
 		if (!CollectionUtils.isEmpty(this.attaches)) {
 			Set<com.uas.platform.b2b.model.Attach> b2bAttaches = new HashSet<com.uas.platform.b2b.model.Attach>();
 			for(Attach attach : this.attaches) {

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

@@ -280,6 +280,46 @@ public class PurcOrderInfoItem extends AbstractRedDotKey {
 	@Column(name = "pd_repprodspec")
 	private String repProdSpec;
 
+	/**
+	 * 旧料编号
+	 */
+	@Column(name = "pd_prodoldcode")
+	private String prodOldCode;
+	/**
+	 * 旧料名称
+	 */
+	@Column(name = "pd_prodoldtitle")
+	private String prodOldTitle;
+	/**
+	 * 旧料规格
+	 */
+	@Column(name = "pd_prodoldspec")
+	private String prodOldSpec;
+
+	public String getProdOldCode() {
+		return prodOldCode;
+	}
+
+	public void setProdOldCode(String prodOldCode) {
+		this.prodOldCode = prodOldCode;
+	}
+
+	public String getProdOldTitle() {
+		return prodOldTitle;
+	}
+
+	public void setProdOldTitle(String prodOldTitle) {
+		this.prodOldTitle = prodOldTitle;
+	}
+
+	public String getProdOldSpec() {
+		return prodOldSpec;
+	}
+
+	public void setProdOldSpec(String prodOldSpec) {
+		this.prodOldSpec = prodOldSpec;
+	}
+
 	public String getRepProdCode() {
 		return repProdCode;
 	}

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

@@ -283,6 +283,22 @@ public class PurchaseOrderAllItem extends AbstractRedDotKey {
 	@Column(name = "pd_repprodspec")
 	private String repProdSpec;
 
+	/**
+	 * 旧料编号
+	 */
+	@Column(name = "pd_prodoldcode")
+	private String prodOldCode;
+	/**
+	 * 旧料名称
+	 */
+	@Column(name = "pd_prodoldtitle")
+	private String prodOldTitle;
+	/**
+	 * 旧料规格
+	 */
+	@Column(name = "pd_prodoldspec")
+	private String prodOldSpec;
+
 	/**
 	 * 是否在变更中
 	 */
@@ -295,6 +311,30 @@ public class PurchaseOrderAllItem extends AbstractRedDotKey {
 	@Transient
 	private Double latestReplyQty;
 
+	public String getProdOldCode() {
+		return prodOldCode;
+	}
+
+	public void setProdOldCode(String prodOldCode) {
+		this.prodOldCode = prodOldCode;
+	}
+
+	public String getProdOldTitle() {
+		return prodOldTitle;
+	}
+
+	public void setProdOldTitle(String prodOldTitle) {
+		this.prodOldTitle = prodOldTitle;
+	}
+
+	public String getProdOldSpec() {
+		return prodOldSpec;
+	}
+
+	public void setProdOldSpec(String prodOldSpec) {
+		this.prodOldSpec = prodOldSpec;
+	}
+
 	public String getRepProdCode() {
 		return repProdCode;
 	}

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

@@ -206,6 +206,22 @@ public class PurchaseOrderDoneItem extends AbstractOrderProduct {
 	@Column(name = "pd_repprodspec")
 	private String repProdSpec;
 
+	/**
+	 * 旧料编号
+	 */
+	@Column(name = "pd_prodoldcode")
+	private String prodOldCode;
+	/**
+	 * 旧料名称
+	 */
+	@Column(name = "pd_prodoldtitle")
+	private String prodOldTitle;
+	/**
+	 * 旧料规格
+	 */
+	@Column(name = "pd_prodoldspec")
+	private String prodOldSpec;
+
 
 	/**
 	 * 最后一次回复数量
@@ -213,6 +229,30 @@ public class PurchaseOrderDoneItem extends AbstractOrderProduct {
 	@Transient
 	private Double latestReplyQty;
 
+	public String getProdOldCode() {
+		return prodOldCode;
+	}
+
+	public void setProdOldCode(String prodOldCode) {
+		this.prodOldCode = prodOldCode;
+	}
+
+	public String getProdOldTitle() {
+		return prodOldTitle;
+	}
+
+	public void setProdOldTitle(String prodOldTitle) {
+		this.prodOldTitle = prodOldTitle;
+	}
+
+	public String getProdOldSpec() {
+		return prodOldSpec;
+	}
+
+	public void setProdOldSpec(String prodOldSpec) {
+		this.prodOldSpec = prodOldSpec;
+	}
+
 	public String getRepProdCode() {
 		return repProdCode;
 	}

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

@@ -228,6 +228,46 @@ public class PurchaseOrderItem extends AbstractRedDotKey {
 	@Column(name = "pd_repprodspec")
 	private String repProdSpec;
 
+	/**
+	 * 旧料编号
+	 */
+	@Column(name = "pd_prodoldcode")
+	private String prodOldCode;
+	/**
+	 * 旧料名称
+	 */
+	@Column(name = "pd_prodoldtitle")
+	private String prodOldTitle;
+	/**
+	 * 旧料规格
+	 */
+	@Column(name = "pd_prodoldspec")
+	private String prodOldSpec;
+
+	public String getProdOldCode() {
+		return prodOldCode;
+	}
+
+	public void setProdOldCode(String prodOldCode) {
+		this.prodOldCode = prodOldCode;
+	}
+
+	public String getProdOldTitle() {
+		return prodOldTitle;
+	}
+
+	public void setProdOldTitle(String prodOldTitle) {
+		this.prodOldTitle = prodOldTitle;
+	}
+
+	public String getProdOldSpec() {
+		return prodOldSpec;
+	}
+
+	public void setProdOldSpec(String prodOldSpec) {
+		this.prodOldSpec = prodOldSpec;
+	}
+
 	public String getRepProdCode() {
 		return repProdCode;
 	}

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

@@ -196,12 +196,52 @@ public class PurchaseOrderTodoItem extends AbstractOrderProduct {
 	@Column(name = "pd_repprodspec")
 	private String repProdSpec;
 
+	/**
+	 * 旧料编号
+	 */
+	@Column(name = "pd_prodoldcode")
+	private String prodOldCode;
+	/**
+	 * 旧料名称
+	 */
+	@Column(name = "pd_prodoldtitle")
+	private String prodOldTitle;
+	/**
+	 * 旧料规格
+	 */
+	@Column(name = "pd_prodoldspec")
+	private String prodOldSpec;
+
     /**
      * 最后一次回复数量
      */
 	@Transient
 	private Double latestReplyQty;
 
+	public String getProdOldCode() {
+		return prodOldCode;
+	}
+
+	public void setProdOldCode(String prodOldCode) {
+		this.prodOldCode = prodOldCode;
+	}
+
+	public String getProdOldTitle() {
+		return prodOldTitle;
+	}
+
+	public void setProdOldTitle(String prodOldTitle) {
+		this.prodOldTitle = prodOldTitle;
+	}
+
+	public String getProdOldSpec() {
+		return prodOldSpec;
+	}
+
+	public void setProdOldSpec(String prodOldSpec) {
+		this.prodOldSpec = prodOldSpec;
+	}
+
 	public String getRepProdCode() {
 		return repProdCode;
 	}

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

@@ -205,6 +205,22 @@ public class PurchaseOrderWaitingItem extends AbstractOrderProduct {
 	@Column(name = "pd_repprodspec")
 	private String repProdSpec;
 
+	/**
+	 * 旧料编号
+	 */
+	@Column(name = "pd_prodoldcode")
+	private String prodOldCode;
+	/**
+	 * 旧料名称
+	 */
+	@Column(name = "pd_prodoldtitle")
+	private String prodOldTitle;
+	/**
+	 * 旧料规格
+	 */
+	@Column(name = "pd_prodoldspec")
+	private String prodOldSpec;
+
 	/**
 	 * 关键词查询相关
 	 */
@@ -217,6 +233,30 @@ public class PurchaseOrderWaitingItem extends AbstractOrderProduct {
 	@Transient
 	private Double latestReplyQty;
 
+	public String getProdOldCode() {
+		return prodOldCode;
+	}
+
+	public void setProdOldCode(String prodOldCode) {
+		this.prodOldCode = prodOldCode;
+	}
+
+	public String getProdOldTitle() {
+		return prodOldTitle;
+	}
+
+	public void setProdOldTitle(String prodOldTitle) {
+		this.prodOldTitle = prodOldTitle;
+	}
+
+	public String getProdOldSpec() {
+		return prodOldSpec;
+	}
+
+	public void setProdOldSpec(String prodOldSpec) {
+		this.prodOldSpec = prodOldSpec;
+	}
+
 	public String getRepProdCode() {
 		return repProdCode;
 	}

src/main/webapp/resources/tpl/index/purc/order.html

@@ -405,9 +405,12 @@
 				<div class="text-muted text-over"
 					 title="{{::item.product.spec}}"
 					ng-bind="::item.product.spec"></div>
-				<div class="text-muted text-bold text-overflow" ng-if="item.vendspec" title="{{item.vendspec}}"><span ng-bind="::item.vendspec"></span></div>
-				<div class="text-bold text-inverse text-flow" ng-if="item.factory" title="{{item.factory}}"><b>送货工厂：</b><span ng-bind="::item.factory"></span></div>
-				<div class="text-bold text-inverse text-flow" ng-if="item.remark" title="{{item.remark}}"><b>备注：</b><span ng-bind="::item.remark"></span></div>
+				<div class="text-bold text-inverse text-flow" ng-if="item.prodOldCode" ><b>旧料编号：</b><div ng-bind="::item.prodOldCode"></div></div>
+				<div class="text-bold text-inverse text-flow" ng-if="item.prodOldTitle" ><b>旧料名称：</b><div ng-bind="::item.prodOldTitle"></div></div>
+				<div class="text-bold text-inverse text-flow" ng-if="item.prodOldSpec" ><b>旧料规格：</b><div ng-bind="::item.prodOldSpec"></div></div>
+				<div class="text-bold text-inverse text-flow" ng-if="item.vendspec" title="{{item.vendspec}}"><div ng-bind="::item.vendspec"></div></div>
+				<div class="text-bold text-inverse text-flow" ng-if="item.factory" title="{{item.factory}}"><b>送货工厂：</b><div ng-bind="::item.factory"></div></div>
+				<div class="text-bold text-inverse text-flow" ng-if="item.remark" title="{{item.remark}}"><b>备注：</b><div ng-bind="::item.remark"></d></div>
 			</td>
 			<td class="text-center">
 				<div ng-if="item.repProdCode" class="dropdown">

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

@@ -132,9 +132,12 @@
 								<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-muted text-bold text-overflow" ng-if="item.vendspec" title="{{item.vendspec}}"><span ng-bind="::item.vendspec"></span></div>
-							<div class="text-bold text-inverse text-flow" ng-if="item.factory" title="{{item.factory}}"><b>送货工厂：</b><span ng-bind="::item.factory"></span></div>
-							<div class="text-bold text-inverse text-flow" ng-if="item.remark" title="{{item.remark}}"><b>备注：</b><span ng-bind="::item.remark"></span></div>
+							<div class="text-bold text-inverse text-flow" ng-if="item.prodOldCode" ><b>旧料编号：</b><div ng-bind="::item.prodOldCode"></div></div>
+							<div class="text-bold text-inverse text-flow" ng-if="item.prodOldTitle" ><b>旧料名称：</b><div ng-bind="::item.prodOldTitle"></div></div>
+							<div class="text-bold text-inverse text-flow" ng-if="item.prodOldSpec" ><b>旧料规格：</b><div ng-bind="::item.prodOldSpec"></div></div>
+							<div class="text-bold text-inverse text-flow" ng-if="item.vendspec" title="{{item.vendspec}}"><div ng-bind="::item.vendspec"></div></div>
+							<div class="text-bold text-inverse text-flow" ng-if="item.factory" title="{{item.factory}}"><b>送货工厂：</b><div ng-bind="::item.factory"></div></div>
+							<div class="text-bold text-inverse text-flow" ng-if="item.remark" title="{{item.remark}}"><b>备注：</b><div ng-bind="::item.remark"></div></div>
 						</td>
 						<td class="text-center" width="110">
 							<div ng-if="!isUser" class="text-num" ng-bind="::item.price | number:6"></div>

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

@@ -388,6 +388,12 @@
                 </div>
                 <div class="text-muted text-ellipsis"
                      ng-bind="::notice.orderItem.product.spec"></div>
+                <div class="text-bold text-inverse" ng-if="notice.orderItem.prodOldCode">旧料编号：<span
+                        ng-bind="::notice.orderItem.prodOldCode"></span></div>
+                <div class="text-bold text-inverse" ng-if="notice.orderItem.prodOldTitle">旧料名称：<span
+                        ng-bind="::notice.orderItem.prodOldTitle"></span></div>
+                <div class="text-bold text-inverse" ng-if="notice.orderItem.prodOldSpec">旧料规格：<span
+                        ng-bind="::notice.orderItem.prodOldSpec"></span></div>
                 <div class="text-bold text-inverse" ng-if="notice.orderItem.factory">送货工厂：<span
                         ng-bind="::notice.orderItem.factory"></span></div>
                 <div class="text-bold text-inverse" ng-if="notice.orderItem.custPurchaseCode">客户采购单号：<span

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

@@ -408,6 +408,9 @@
 				<div class="text-muted text-over"
 					 title="{{::item.product.spec}}"
 					ng-bind="::item.product.spec"></div>
+				<div class="text-bold text-inverse text-flow" ng-if="item.prodOldCode" ><b>旧料编号：</b><div ng-bind="::item.prodOldCode"></div></div>
+				<div class="text-bold text-inverse text-flow" ng-if="item.prodOldTitle" ><b>旧料名称：</b><div ng-bind="::item.prodOldTitle"></div></div>
+				<div class="text-bold text-inverse text-flow" ng-if="item.prodOldSpec" ><b>旧料规格：</b><div ng-bind="::item.prodOldSpec"></div></div>
 				<div class="text-bold text-inverse text-flow" ng-if="item.custPurchaseCode" ><b>客户采购单号：</b><div ng-bind="::item.custPurchaseCode"></div></div>
 				<div class="text-bold text-inverse text-flow" ng-if="item.acceptCustName" ><b>收货客户：</b><div ng-bind="::item.acceptCustName"></div></div>
 				<div class="text-bold text-inverse text-flow" ng-if="item.acceptCustAddress" ><b>客户收货地址：</b><div ng-bind="::item.acceptCustAddress"></div></div>

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

@@ -122,7 +122,7 @@
 				<thead>
 					<tr class="header">
 						<th width="50">序号</th>
-						<th width="200">产品</th>
+						<th width="270">产品</th>
 						<th width="80">单价</th>
 						<th width="80">税率</th>
 						<th width="110">数量</th>
@@ -139,19 +139,22 @@
 						<td class="text-center text-num" width="50">
 							<span ng-bind="::item.number"></span>
 						</td>
-						<td width="200">
+						<td width="270" class="product">
 							<div class="text-num text-overflow" title="{{::item.product.code}}">
 								<span ng-bind="::item.product.code"></span>
 							</div>
 							<div class="text-overflow" title="{{::item.product.title}}">
-								<span ng-bind="::item.product.title"></span>
+								<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-muted text-bold text-overflow" ng-if="item.vendspec" title="item.vendspec"><span ng-bind="::item.vendspec"></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>
+							<div class="text-bold text-inverse text-flow" ng-if="item.vendspec" title="item.vendspec"><span ng-bind="::item.vendspec"></span></div>
 							<div class="text-bold text-inverse text-flow" ng-if="item.factory" title="{{item.factory}}"><b>送货工厂：</b><span ng-bind="::item.factory"></span></div>
-							<div class="text-bold text-inverse text-flow" ng-if="item.custPurchaseCode"><b>客户采购单号：</b><br><span ng-bind="::item.custPurchaseCode"></span></div>
-							<div class="text-bold text-inverse text-flow" ng-if="item.acceptCustName"><b>收货客户：</b><br>
+							<div class="text-bold text-inverse text-flow" ng-if="item.custPurchaseCode"><b>客户采购单号：</b><span ng-bind="::item.custPurchaseCode"></span></div>
+							<div class="text-bold text-inverse text-flow" ng-if="item.acceptCustName"><b>收货客户：</b>
 								<span ng-bind="::item.acceptCustName"></span></div>
-							<div class="text-bold text-inverse text-flow" ng-if="item.acceptCustAddress"><b>客户收货地址：</b><br>
+							<div class="text-bold text-inverse text-flow" ng-if="item.acceptCustAddress"><b>客户收货地址：</b>
 								<span ng-bind="::item.acceptCustAddress"></span></div>
 							<div class="text-bold text-inverse text-flow" ng-if="item.remark" title="{{item.remark}}"><b>备注：</b><span ng-bind="::item.remark"></span></div>
 							<div ng-repeat="att in item.attachs" class="text-bold text-bold text-overflow">