【 增加工厂库存字段】

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@4470 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

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

@@ -22,6 +22,7 @@ public class MakeProdInOutDetail {
 	private Double pd_taxrate;//税率 1
 	private String pd_batchcode;//批号 1
 	private String pd_remark;//备注 1
+	private String pd_whname;//仓库名称
 	
 	public Long getPd_id() {
 		return pd_id;
@@ -83,6 +84,12 @@ public class MakeProdInOutDetail {
 	public void setPd_outqty(Double pd_outqty) {
 		this.pd_outqty = pd_outqty;
 	}
+	public String getPd_whname() {
+		return pd_whname;
+	}
+	public void setPd_whname(String pd_whname) {
+		this.pd_whname = pd_whname;
+	}
 	/**
 	 * 委外验收
 	 * @return
@@ -95,6 +102,7 @@ public class MakeProdInOutDetail {
 		acceptItem.setBatchCode(this.pd_batchcode);
 		acceptItem.setOrderPrice(this.pd_orderprice);
 		acceptItem.setTaxrate(this.pd_taxrate);
+		acceptItem.setWhname(this.pd_whname);
 		MakeOrder order = new MakeOrder();
 		order.setCode(this.pd_ordercode);
 		acceptItem.setOrder(order);
@@ -112,6 +120,7 @@ public class MakeProdInOutDetail {
 		returnItem.setBatchCode(this.pd_batchcode);
 		returnItem.setOrderPrice(this.pd_orderprice);
 		returnItem.setTaxrate(this.pd_taxrate);
+		returnItem.setWhname(this.pd_whname);
 		MakeOrder order = new MakeOrder();
 		order.setCode(this.pd_ordercode);
 		returnItem.setOrder(order);

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

@@ -28,6 +28,7 @@ public class PurchaseProdInOutDetail {
 	private String pd_batchcode;// 批号
 	private String pd_remark;// 备注
 	private String pd_prodcode;//物料编号
+	private String pd_whname;//仓库名称
 	
 	public String getPd_prodcode() {
 		return pd_prodcode;
@@ -110,6 +111,14 @@ public class PurchaseProdInOutDetail {
 		this.pd_remark = pd_remark;
 	}
 
+	public String getPd_whname() {
+		return pd_whname;
+	}
+
+	public void setPd_whname(String pd_whname) {
+		this.pd_whname = pd_whname;
+	}
+
 	/**
 	 * 采购验收
 	 * 
@@ -123,6 +132,7 @@ public class PurchaseProdInOutDetail {
 		acceptItem.setBatchCode(this.pd_batchcode);
 		acceptItem.setOrderPrice(this.pd_orderprice);
 		acceptItem.setTaxrate(this.pd_taxrate);
+		acceptItem.setWhname(this.pd_whname);
 		if (StringUtils.hasText(this.pd_ordercode)) {
 			PurchaseOrder order = new PurchaseOrder();
 			order.setCode(this.pd_ordercode);
@@ -148,6 +158,7 @@ public class PurchaseProdInOutDetail {
 		returnItem.setOrderPrice(this.pd_orderprice);
 		returnItem.setTaxrate(this.pd_taxrate);
 		returnItem.setProdCode(this.pd_prodcode);
+		returnItem.setWhname(this.pd_whname);
 		if (StringUtils.hasText(this.pd_ordercode)) {
 			PurchaseOrder order = new PurchaseOrder();
 			order.setCode(this.pd_ordercode);
@@ -172,6 +183,7 @@ public class PurchaseProdInOutDetail {
 		badInItem.setBatchCode(this.pd_batchcode);
 		badInItem.setOrderPrice(this.pd_orderprice);
 		badInItem.setTaxrate(this.pd_taxrate);
+		badInItem.setWhname(this.pd_whname);
 		PurchaseOrder order = new PurchaseOrder();
 		order.setCode(this.pd_ordercode);
 		PurchaseOrderItem orderItem = new PurchaseOrderItem();
@@ -194,6 +206,7 @@ public class PurchaseProdInOutDetail {
 		badOutItem.setBatchCode(this.pd_batchcode);
 		badOutItem.setOrderPrice(this.pd_orderprice);
 		badOutItem.setTaxrate(this.pd_taxrate);
+		badOutItem.setWhname(this.pd_whname);
 		PurchaseOrder order = new PurchaseOrder();
 		order.setCode(this.pd_ordercode);
 		PurchaseOrderItem orderItem = new PurchaseOrderItem();