Browse Source

应收对账单新增应付供应商名称和编号字段,增加应付供应商名称筛选功能,修改应付对账单列表界面筛选日期名称属性

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@2166 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
zhangzl 10 years ago
parent
commit
d734172a0f

+ 26 - 0
src/main/java/com/uas/platform/b2b/model/ErpProdIODetail.java

@@ -106,6 +106,16 @@ public class ErpProdIODetail implements Serializable{
 	 */
 	 */
 	private Double rate; 
 	private Double rate; 
 	
 	
+	/**
+	 * 应付供应商编号
+	 */
+	private String receiveCode; 
+
+	/**
+	 * 应付供应商名称
+	 */
+	private String receiveName; 
+
 	public Double getRate() {
 	public Double getRate() {
 		return rate;
 		return rate;
 	}
 	}
@@ -257,6 +267,22 @@ public class ErpProdIODetail implements Serializable{
 	public void setEnUu(Long enUu) {
 	public void setEnUu(Long enUu) {
 		this.enUu = enUu;
 		this.enUu = enUu;
 	}
 	}
+
+	public String getReceiveCode() {
+		return receiveCode;
+	}
+
+	public void setReceiveCode(String receiveCode) {
+		this.receiveCode = receiveCode;
+	}
+
+	public String getReceiveName() {
+		return receiveName;
+	}
+
+	public void setReceiveName(String receiveName) {
+		this.receiveName = receiveName;
+	}
 	
 	
 	
 	
 }
 }

+ 28 - 0
src/main/java/com/uas/platform/b2b/model/PurchaseApCheckItem.java

@@ -151,6 +151,18 @@ public class PurchaseApCheckItem implements Serializable {
 	@Column(name = "pai_oldycheckqty")
 	@Column(name = "pai_oldycheckqty")
 	private Double oldYCheckQty;
 	private Double oldYCheckQty;
 	
 	
+	/**
+	 * 应付供应商编号
+	 */	
+	@Column(name = "pai_receivecode")
+	private String receiveCode;
+	
+	/**
+	 * 应付供应商名称
+	 */	
+	@Column(name = "pai_receivename")
+	private String receiveName;
+
 	/**
 	/**
 	 * 应收对账单主记录
 	 * 应收对账单主记录
 	 */
 	 */
@@ -315,6 +327,22 @@ public class PurchaseApCheckItem implements Serializable {
 		this.inoutnodetno = inoutnodetno;
 		this.inoutnodetno = inoutnodetno;
 	}
 	}
 
 
+	public String getReceiveCode() {
+		return receiveCode;
+	}
+
+	public void setReceiveCode(String receiveCode) {
+		this.receiveCode = receiveCode;
+	}
+
+	public String getReceiveName() {
+		return receiveName;
+	}
+
+	public void setReceiveName(String receiveName) {
+		this.receiveName = receiveName;
+	}
+
 	@JsonIgnore
 	@JsonIgnore
 	@JSONField(serialize = false)	
 	@JSONField(serialize = false)	
 	public PurchaseApCheck getApCheck() {
 	public PurchaseApCheck getApCheck() {

+ 2 - 1
src/main/java/com/uas/platform/b2b/service/impl/ErpProdIODetailServiceImpl.java

@@ -28,7 +28,8 @@ public class ErpProdIODetailServiceImpl implements ErpProdIODetailService{
 		Long enUu = SystemSession.getUser().getEnterprise().getUu();
 		Long enUu = SystemSession.getUser().getEnterprise().getUu();
 		String sql = "select p.pi_inoutno inOutNo,p.pd_detno detno ,p.pi_class piClass, p.pd_ordercode orderCode, p.pd_orderdetno  orderDetno,"
 		String sql = "select p.pi_inoutno inOutNo,p.pd_detno detno ,p.pi_class piClass, p.pd_ordercode orderCode, p.pd_orderdetno  orderDetno,"
 				+ " p.pd_prodcode  prodCode, p.pd_qty  qty, p.pi_date piDate, p.pd_orderprice  orderPrice, p.pi_currency currency, p.pd_taxrate taxrate, p.pd_ycheckqty yCheckQty,"
 				+ " p.pd_prodcode  prodCode, p.pd_qty  qty, p.pi_date piDate, p.pd_orderprice  orderPrice, p.pi_currency currency, p.pd_taxrate taxrate, p.pd_ycheckqty yCheckQty,"
-				+ " p.pd_thischeckqty thisCheckQty, p.custuu custUu, p.custname custName, p.enuu enUu, p.sourceid sourceId, p.pi_sourcetable sourceTable,p.pi_rate rate from erp$prodiodetail p where enuu = ?";
+				+ " p.pd_thischeckqty thisCheckQty, p.custuu custUu, p.custname custName, p.enuu enUu, p.sourceid sourceId, p.pi_sourcetable sourceTable, p.pi_rate rate, p.pi_receivecode receiveCode,"
+				+ " p.pi_receivename receiveName from erp$prodiodetail p where enuu = ?";
 		Object[] args = new Object[] {enUu};
 		Object[] args = new Object[] {enUu};
 		List<ErpProdIODetail> erpProdIODetails = jdbcTemplate.query(sql,args, new BeanPropertyRowMapper<ErpProdIODetail>(ErpProdIODetail.class));
 		List<ErpProdIODetail> erpProdIODetails = jdbcTemplate.query(sql,args, new BeanPropertyRowMapper<ErpProdIODetail>(ErpProdIODetail.class));
 		return erpProdIODetails;
 		return erpProdIODetails;

+ 0 - 1
src/main/java/com/uas/platform/b2b/service/impl/PurchaseApCheckServiceImpl.java

@@ -207,7 +207,6 @@ public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
 		return true;
 		return true;
 	}
 	}
 	
 	
-		
 
 
 	@Override
 	@Override
 	public PurchaseApCheck save(PurchaseApCheck purchaseApCheck) {
 	public PurchaseApCheck save(PurchaseApCheck purchaseApCheck) {