Browse Source

fix: 修复导出问题: 1、 增加出入库单据日期; 2、导出数据异常的处理

hejq 7 years ago
parent
commit
f6ec88aa7f

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

@@ -250,6 +250,7 @@ public class ErpProdIODetail implements Serializable {
         this.produnit = item.getProdUnit();
         this.ordercode = item.getOrderCode();
         this.thischeckqty = item.getCheckQty();
+        this.pidate = item.getSourceDate();
     }
 
     @Id

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

@@ -324,6 +324,9 @@ public class ErpProdIODetailServiceImpl implements ErpProdIODetailService {
         if (!StringUtils.isEmpty(keyword.getSuuorname())) {
             sql.append("and en_name = '").append(keyword.getSuuorname()).append("' ");
         }
+        if (null != keyword.getCustomerUU()) {
+            sql.append("and mr_enuu = ").append(keyword.getCustomerUU()).append(" ");
+        }
         if (distributes.length() > 0) {
             sql.append("and mr_enuu in (").append(distributes).append(") ");
         }
@@ -376,6 +379,9 @@ public class ErpProdIODetailServiceImpl implements ErpProdIODetailService {
         if (!StringUtils.isEmpty(keyword.getSuuorname())) {
             sql.append("and en_name = '").append(keyword.getSuuorname()).append("' ");
         }
+        if (null != keyword.getCustomerUU()) {
+            sql.append("and make$accept.ma_enuu = ").append(keyword.getCustomerUU()).append(" ");
+        }
         if (distributes.length() > 0) {
             sql.append("and make$accept.ma_enuu in (").append(distributes).append(") ");
         }
@@ -428,6 +434,9 @@ public class ErpProdIODetailServiceImpl implements ErpProdIODetailService {
         if (!StringUtils.isEmpty(keyword.getSuuorname())) {
             sql.append("and en_name = '").append(keyword.getSuuorname()).append("' ");
         }
+        if (null != keyword.getCustomerUU()) {
+            sql.append("and po_enuu = ").append(keyword.getCustomerUU()).append(" ");
+        }
         if (distributes.length() > 0) {
             sql.append("and po_enuu in (").append(distributes).append(") ");
         }
@@ -480,6 +489,9 @@ public class ErpProdIODetailServiceImpl implements ErpProdIODetailService {
         if (!StringUtils.isEmpty(keyword.getSuuorname())) {
             sql.append("and en_name = '").append(keyword.getSuuorname()).append("' ");
         }
+        if (null != keyword.getCustomerUU()) {
+            sql.append("and pb_enuu = ").append(keyword.getCustomerUU()).append(" ");
+        }
         if (distributes.length() > 0) {
             sql.append("and pb_enuu in (").append(distributes).append(") ");
         }
@@ -532,6 +544,9 @@ public class ErpProdIODetailServiceImpl implements ErpProdIODetailService {
         if (!StringUtils.isEmpty(keyword.getSuuorname())) {
             sql.append("and en_name = '").append(keyword.getSuuorname()).append("' ");
         }
+        if (null != keyword.getCustomerUU()) {
+            sql.append("and pr_enuu = ").append(keyword.getCustomerUU()).append(" ");
+        }
         if (distributes.length() > 0) {
             sql.append("and pr_enuu in (").append(distributes).append(") ");
         }
@@ -584,6 +599,9 @@ public class ErpProdIODetailServiceImpl implements ErpProdIODetailService {
         if (!StringUtils.isEmpty(keyword.getSuuorname())) {
             sql.append("and en_name = '").append(keyword.getSuuorname()).append("' ");
         }
+        if (null != keyword.getCustomerUU()) {
+            sql.append("and pa_enuu = ").append(keyword.getCustomerUU()).append(" ");
+        }
         if (distributes.length() > 0) {
             sql.append("and pa_enuu in (").append(distributes).append(") ");
         }
@@ -631,6 +649,9 @@ public class ErpProdIODetailServiceImpl implements ErpProdIODetailService {
         if (!StringUtils.isEmpty(keyword.getSuuorname())) {
             sql.append("and aa_custname = '").append(keyword.getSuuorname()).append("' ");
         }
+        if (null != keyword.getCustomerUU()) {
+            sql.append("and aa_custuu = ").append(keyword.getCustomerUU()).append(" ");
+        }
         if (distributes.length() > 0) {
             sql.append("and aa_custuu in (").append(distributes).append(") ");
         }

BIN
src/main/resources/jxls-tpl/fa/faApCheck.xls