【后台】+【委外加工单 + 送货工厂字段】

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

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

@@ -39,8 +39,18 @@ public class Make{
 	private Date ma_planenddate;//计划完工日期
 	private String ma_auditman;//审核人
 	private String ma_remark;//备注
+	private String ma_factory;//送货工厂
 	private List<MakeMaterial> materials;//用料明细
 
+	
+	public String getMa_factory() {
+		return ma_factory;
+	}
+
+	public void setMa_factory(String ma_factory) {
+		this.ma_factory = ma_factory;
+	}
+
 	public Long getMa_id() {
 		return ma_id;
 	}
@@ -254,6 +264,7 @@ public class Make{
 		make.setVendUU(ve_uu);
 		make.setReplyQty((double) 0);
 		make.setStatus((short) Status.NOT_REPLY.value());
+		make.setFactory(this.ma_factory);
 		return make;
 	}
 

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

@@ -188,7 +188,7 @@ public class SaleDownDetail {
 		this.sd_taxrate = orderItem.getTaxrate();
 		this.sd_total = orderItem.getAmount();
 		this.sd_taxtotal = orderItem.getNoTaxAmount();
-		this.sd_factory=orderItem.getFactory();
+		this.sd_factory = orderItem.getFactory();
 	}
 
 	/**
@@ -212,6 +212,7 @@ public class SaleDownDetail {
 		this.sd_replydate = order.getReplyDelivery();
 		this.sd_replydetail = order.getReplyRemark();
 		this.sd_replyqty = order.getReplyQty();
+		this.sd_factory = order.getFactory();
 	}
 
 }

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

@@ -259,6 +259,20 @@ public class MakeOrder implements Serializable {
 	 */
 	@Column(name = "ma_print")
 	private Short print;
+	
+	/**
+	 * 送货工厂
+	 */
+	@Column(name = "ma_factory")
+	private String factory;
+	
+	public String getFactory() {
+		return factory;
+	}
+
+	public void setFactory(String factory) {
+		this.factory = factory;
+	}
 
 //	/**
 //	 * 委外加工单用料明细

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

@@ -245,7 +245,20 @@ public class MakeOrderDone {
 	@Column(name = "ma_replyremark")
 	private String replyRemark;
 	
+	/**
+	 * 送货工厂
+	 */
+	@Column(name = "ma_factory")
+	private String factory;
+	
+	public String getFactory() {
+		return factory;
+	}
 
+	public void setFactory(String factory) {
+		this.factory = factory;
+	}
+	
 	public Long getId() {
 		return id;
 	}

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

@@ -244,6 +244,20 @@ public class MakeOrderEnd  {
 	 */
 	@Column(name = "ma_replyremark")
 	private String replyRemark;
+	
+	/**
+	 * 送货工厂
+	 */
+	@Column(name = "ma_factory")
+	private String factory;
+	
+	public String getFactory() {
+		return factory;
+	}
+
+	public void setFactory(String factory) {
+		this.factory = factory;
+	}
 
 	public Long getId() {
 		return id;

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

@@ -245,6 +245,20 @@ public class MakeOrderTodo {
 	 */
 	@Column(name = "ma_replyremark")
 	private String replyRemark;
+	
+	/**
+	 * 送货工厂
+	 */
+	@Column(name = "ma_factory")
+	private String factory;
+	
+	public String getFactory() {
+		return factory;
+	}
+
+	public void setFactory(String factory) {
+		this.factory = factory;
+	}
 
 	public Long getId() {
 		return id;