【出入库单模型】+【上传出入库单据到平台】+【无Po的采购验退单处理】+【上传采购验退单模型修改】

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

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

@@ -1,5 +1,7 @@
 package com.uas.platform.b2b.erp.model;
 
+import org.springframework.util.StringUtils;
+
 import com.uas.platform.b2b.model.PurchaseAcceptItem;
 import com.uas.platform.b2b.model.PurchaseBadInItem;
 import com.uas.platform.b2b.model.PurchaseBadOutItem;
@@ -9,82 +11,111 @@ import com.uas.platform.b2b.model.PurchaseReturnItem;
 
 /**
  * 采购方角度ERP采购验收单明细
+ * 
  * @author suntg
  * @date 2015年4月17日10:32:24
- *
+ * 
  */
 public class PurchaseProdInOutDetail {
 
-	private Short pd_detno;//明细行序号
-	private String pd_ordercode;//采购单编号
-	private Short pd_orderdetno;//采购单明细行号
-	private Double pd_inqty;//入库数量
-	private Double pd_outqty;//出库数量
-	private Double pd_orderprice;//采购成本
-	private Double pd_taxrate;//税率
-	private String pd_batchcode;//批号
-	private String pd_remark;//备注
+	private Short pd_detno;// 明细行序号
+	private String pd_ordercode;// 采购单编号
+	private Short pd_orderdetno;// 采购单明细行号
+	private Double pd_inqty;// 入库数量
+	private Double pd_outqty;// 出库数量
+	private Double pd_orderprice;// 采购成本
+	private Double pd_taxrate;// 税率
+	private String pd_batchcode;// 批号
+	private String pd_remark;// 备注
+	private String pd_prodcode;//物料编号
+	
+	public String getPd_prodcode() {
+		return pd_prodcode;
+	}
+
+	public void setPd_prodcode(String pd_prodcode) {
+		this.pd_prodcode = pd_prodcode;
+	}
+
 	
 	public Short getPd_detno() {
 		return pd_detno;
 	}
+
 	public void setPd_detno(Short pd_detno) {
 		this.pd_detno = pd_detno;
 	}
+
 	public String getPd_ordercode() {
 		return pd_ordercode;
 	}
+
 	public void setPd_ordercode(String pd_ordercode) {
 		this.pd_ordercode = pd_ordercode;
 	}
+
 	public Short getPd_orderdetno() {
 		return pd_orderdetno;
 	}
+
 	public void setPd_orderdetno(Short pd_orderdetno) {
 		this.pd_orderdetno = pd_orderdetno;
 	}
+
 	public Double getPd_inqty() {
 		return pd_inqty;
 	}
+
 	public void setPd_inqty(Double pd_inqty) {
 		this.pd_inqty = pd_inqty;
 	}
+
 	public Double getPd_outqty() {
 		return pd_outqty;
 	}
+
 	public void setPd_outqty(Double pd_outqty) {
 		this.pd_outqty = pd_outqty;
 	}
+
 	public Double getPd_orderprice() {
 		return pd_orderprice;
 	}
+
 	public void setPd_orderprice(Double pd_orderprice) {
 		this.pd_orderprice = pd_orderprice;
 	}
+
 	public Double getPd_taxrate() {
 		return pd_taxrate;
 	}
+
 	public void setPd_taxrate(Double pd_taxrate) {
 		this.pd_taxrate = pd_taxrate;
 	}
+
 	public String getPd_batchcode() {
 		return pd_batchcode;
 	}
+
 	public void setPd_batchcode(String pd_batchcode) {
 		this.pd_batchcode = pd_batchcode;
 	}
+
 	public String getPd_remark() {
 		return pd_remark;
 	}
+
 	public void setPd_remark(String pd_remark) {
 		this.pd_remark = pd_remark;
 	}
-	
+
 	/**
 	 * 采购验收
+	 * 
 	 * @return
 	 */
-	public PurchaseAcceptItem convent(){
+	public PurchaseAcceptItem convent() {
 		PurchaseAcceptItem acceptItem = new PurchaseAcceptItem();
 		acceptItem.setNumber(this.pd_detno);
 		acceptItem.setQty(this.pd_inqty);
@@ -92,20 +123,23 @@ public class PurchaseProdInOutDetail {
 		acceptItem.setBatchCode(this.pd_batchcode);
 		acceptItem.setOrderPrice(this.pd_orderprice);
 		acceptItem.setTaxrate(this.pd_taxrate);
-		PurchaseOrder order = new PurchaseOrder();
-		order.setCode(this.pd_ordercode);
-		PurchaseOrderItem orderItem = new PurchaseOrderItem();
-		orderItem.setNumber(this.pd_orderdetno);
-		orderItem.setOrder(order);
-		acceptItem.setOrderItem(orderItem);
+		if (StringUtils.hasText(this.pd_ordercode)) {
+			PurchaseOrder order = new PurchaseOrder();
+			order.setCode(this.pd_ordercode);
+			PurchaseOrderItem orderItem = new PurchaseOrderItem();
+			orderItem.setNumber(this.pd_orderdetno);
+			orderItem.setOrder(order);
+			acceptItem.setOrderItem(orderItem);
+		}
 		return acceptItem;
 	}
-	
+
 	/**
 	 * 采购验退
+	 * 
 	 * @return
 	 */
-	public PurchaseReturnItem conventToReturn(){
+	public PurchaseReturnItem conventToReturn() {
 		PurchaseReturnItem returnItem = new PurchaseReturnItem();
 		returnItem.setNumber(this.pd_detno);
 		returnItem.setQty(this.pd_outqty);
@@ -113,20 +147,24 @@ public class PurchaseProdInOutDetail {
 		returnItem.setBatchCode(this.pd_batchcode);
 		returnItem.setOrderPrice(this.pd_orderprice);
 		returnItem.setTaxrate(this.pd_taxrate);
-		PurchaseOrder order = new PurchaseOrder();
-		order.setCode(this.pd_ordercode);
-		PurchaseOrderItem orderItem = new PurchaseOrderItem();
-		orderItem.setNumber(this.pd_orderdetno);
-		orderItem.setOrder(order);
-		returnItem.setOrderItem(orderItem);
+		returnItem.setProdCode(this.pd_prodcode);
+		if (StringUtils.hasText(this.pd_ordercode)) {
+			PurchaseOrder order = new PurchaseOrder();
+			order.setCode(this.pd_ordercode);
+			PurchaseOrderItem orderItem = new PurchaseOrderItem();
+			orderItem.setNumber(this.pd_orderdetno);
+			orderItem.setOrder(order);
+			returnItem.setOrderItem(orderItem);
+		}
 		return returnItem;
 	}
-	
+
 	/**
 	 * 不良品入库
+	 * 
 	 * @return
 	 */
-	public PurchaseBadInItem conventToBadIn(){
+	public PurchaseBadInItem conventToBadIn() {
 		PurchaseBadInItem badInItem = new PurchaseBadInItem();
 		badInItem.setNumber(this.pd_detno);
 		badInItem.setQty(this.pd_inqty);
@@ -142,12 +180,13 @@ public class PurchaseProdInOutDetail {
 		badInItem.setOrderItem(orderItem);
 		return badInItem;
 	}
-	
+
 	/**
 	 * 不良品出库
+	 * 
 	 * @return
 	 */
-	public PurchaseBadOutItem conventToBadOut(){
+	public PurchaseBadOutItem conventToBadOut() {
 		PurchaseBadOutItem badOutItem = new PurchaseBadOutItem();
 		badOutItem.setNumber(this.pd_detno);
 		badOutItem.setQty(this.pd_outqty);
@@ -163,5 +202,5 @@ public class PurchaseProdInOutDetail {
 		badOutItem.setOrderItem(orderItem);
 		return badOutItem;
 	}
-	
+
 }