Browse Source

【导出对账单Excel】

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

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

@@ -139,6 +139,11 @@ public class ErpProdIODetail implements Serializable {
 	 * 送货工厂
 	 */
 	private String factory;
+	
+	/**
+	 * 送货单号
+	 */
+	private String sendcode;
 
 	public String getFactory() {
 		return factory;
@@ -351,4 +356,12 @@ public class ErpProdIODetail implements Serializable {
 		this.prodSpec = prodSpec;
 	}
 
+	public String getSendcode() {
+		return sendcode;
+	}
+
+	public void setSendcode(String sendcode) {
+		this.sendcode = sendcode;
+	}
+
 }

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

@@ -173,6 +173,12 @@ public class PurchaseApCheckItem implements Serializable {
 	 */
 	@Column(name = "pai_receivename")
 	private String receiveName;
+	
+	/**
+	 * 送货单号
+	 */	
+	@Column(name = "pai_sendcode")
+	private String sendcode;
 
 	/**
 	 * 应收对账单主记录
@@ -374,6 +380,14 @@ public class PurchaseApCheckItem implements Serializable {
 	public void setProdSpec(String prodSpec) {
 		this.prodSpec = prodSpec;
 	}
+	
+	public String getSendcode() {
+		return sendcode;
+	}
+
+	public void setSendcode(String sendcode) {
+		this.sendcode = sendcode;
+	}
 
 	public static List<PurchaseApCheck> distinct(List<PurchaseApCheckItem> items) {
 		List<PurchaseApCheck> purchaseApChecks = new ArrayList<PurchaseApCheck>();

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

@@ -24,7 +24,7 @@ public class ErpProdIODetailServiceImpl implements ErpProdIODetailService {
 		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.pr_spec prodSpec, p.pr_title prodTitle,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, p.pi_receivecode receiveCode,"
-				+ " p.pi_receivename receiveName, p.pd_factory factory from erp$prodiodetail p where enuu = ?";
+				+ " p.pi_receivename receiveName, p.pd_factory factory, p.sendcode sendcode from erp$prodiodetail p where enuu = ?";
 		Object[] args = new Object[] { enUu };
 		if (!CollectionUtils.isEmpty(filter)) {
 			String[] str = new String[filter.size()];
@@ -54,7 +54,7 @@ public class ErpProdIODetailServiceImpl implements ErpProdIODetailService {
 		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.pr_title prodTitle,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, p.pi_receivecode receiveCode,"
-				+ " p.pi_receivename receiveName , p.pd_factory factory from erp$prodiodetail p where enuu = ?";
+				+ " p.pi_receivename receiveName , p.pd_factory factory, p.sendcode sendcode from erp$prodiodetail p where enuu = ?";
 		if (!StringUtils.isEmpty(keyword)) {
 			String[] strs = keyword.split("-");
 			if (strs.length == 1) {