|
|
@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON;
|
|
|
import com.uas.platform.b2b.core.util.BoundedExecutor;
|
|
|
import com.uas.platform.b2b.core.util.DateFormatUtils;
|
|
|
import com.uas.platform.b2b.core.util.DateUtils;
|
|
|
-import com.uas.platform.b2b.core.util.StringUtil;
|
|
|
import com.uas.platform.b2b.core.util.ThreadUtils;
|
|
|
import com.uas.platform.b2b.dao.CommonDao;
|
|
|
import com.uas.platform.b2b.dao.PurchaseApCheckItemInfoDao;
|
|
|
@@ -36,11 +35,7 @@ import javax.persistence.criteria.CriteriaQuery;
|
|
|
import javax.persistence.criteria.Root;
|
|
|
import java.text.ParseException;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.Date;
|
|
|
-import java.util.HashSet;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Set;
|
|
|
+import java.util.*;
|
|
|
import java.util.concurrent.CountDownLatch;
|
|
|
import java.util.concurrent.ExecutorService;
|
|
|
import java.util.concurrent.Executors;
|
|
|
@@ -275,6 +270,14 @@ public class ErpProdIODetailServiceImpl implements ErpProdIODetailService {
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
+ // 过滤已对账的明细
|
|
|
+ Iterator<ErpProdIODetail> iterator = details.iterator();
|
|
|
+ while (iterator.hasNext()) {
|
|
|
+ ErpProdIODetail next = iterator.next();
|
|
|
+ if (next.getThischeckqty().equals(0.0)) {
|
|
|
+ iterator.remove();
|
|
|
+ }
|
|
|
+ }
|
|
|
group.setDetails(details);
|
|
|
// 统计发货数量
|
|
|
Double sendQty = details.stream().mapToDouble(ErpProdIODetail::getQty).sum();
|