|
|
@@ -23,6 +23,7 @@ import com.uas.platform.b2b.support.DecimalUtils;
|
|
|
import com.uas.platform.b2b.support.SystemSession;
|
|
|
import com.uas.platform.b2b.task.ApCheckTask;
|
|
|
import com.uas.platform.core.exception.IllegalOperatorException;
|
|
|
+import com.uas.platform.core.model.Constant;
|
|
|
import com.uas.platform.core.model.PageInfo;
|
|
|
import com.uas.platform.core.persistence.criteria.PredicateUtils;
|
|
|
import org.apache.axis.utils.StringUtils;
|
|
|
@@ -168,6 +169,12 @@ public class ErpProdIODetailServiceImpl implements ErpProdIODetailService {
|
|
|
// 筛选单号一样的明细
|
|
|
List<ErpProdIODetail> details = erpProdIo.getDetails().parallelStream()
|
|
|
.filter(detail -> code.equals(detail.getOrdercode())).collect(Collectors.toList());
|
|
|
+ for (ErpProdIODetail detail : details) {
|
|
|
+ if (Constant.NO == detail.getHaveChecked()) {
|
|
|
+ group.setAllChecked(Constant.NO);
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
group.setDetails(details);
|
|
|
// 统计发货数量
|
|
|
Double sendQty = details.stream().mapToDouble(ErpProdIODetail::getQty).sum();
|
|
|
@@ -189,6 +196,9 @@ public class ErpProdIODetailServiceImpl implements ErpProdIODetailService {
|
|
|
groupList.add(group);
|
|
|
});
|
|
|
erpProdIo.setGroupList(groupList);
|
|
|
+ if (!CollectionUtil.isEmpty(groupList)) {
|
|
|
+ erpProdIo.getGroupList().sort(comparing(ProductIoGroup::getAllChecked));
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
/**
|