|
@@ -3,15 +3,53 @@ package com.uas.platform.b2b.service.impl;
|
|
|
import com.uas.platform.b2b.core.util.ContextUtils;
|
|
import com.uas.platform.b2b.core.util.ContextUtils;
|
|
|
import com.uas.platform.b2b.core.util.SplitArray;
|
|
import com.uas.platform.b2b.core.util.SplitArray;
|
|
|
import com.uas.platform.b2b.core.util.ThreadTask;
|
|
import com.uas.platform.b2b.core.util.ThreadTask;
|
|
|
-import com.uas.platform.b2b.dao.*;
|
|
|
|
|
|
|
+import com.uas.platform.b2b.dao.B2bCodeSetDao;
|
|
|
|
|
+import com.uas.platform.b2b.dao.BarLPSetingDao;
|
|
|
|
|
+import com.uas.platform.b2b.dao.BarPackageDao;
|
|
|
|
|
+import com.uas.platform.b2b.dao.BarPackageDetailDao;
|
|
|
|
|
+import com.uas.platform.b2b.dao.BarSendNotifyDao;
|
|
|
|
|
+import com.uas.platform.b2b.dao.CommonDao;
|
|
|
|
|
+import com.uas.platform.b2b.dao.DistributeDao;
|
|
|
|
|
+import com.uas.platform.b2b.dao.PurchaseNoticeDao;
|
|
|
|
|
+import com.uas.platform.b2b.dao.PurchaseNoticeEndDao;
|
|
|
|
|
+import com.uas.platform.b2b.dao.RoleDao;
|
|
|
|
|
+import com.uas.platform.b2b.dao.SaleSendAllDao;
|
|
|
|
|
+import com.uas.platform.b2b.dao.SaleSendDao;
|
|
|
|
|
+import com.uas.platform.b2b.dao.SaleSendItemDao;
|
|
|
|
|
+import com.uas.platform.b2b.dao.SaleSendItemVerifyDao;
|
|
|
|
|
+import com.uas.platform.b2b.dao.UserDao;
|
|
|
|
|
+import com.uas.platform.b2b.dao.UserOrderDao;
|
|
|
|
|
+import com.uas.platform.b2b.dao.VendorDao;
|
|
|
import com.uas.platform.b2b.erp.model.PurchaseNotify;
|
|
import com.uas.platform.b2b.erp.model.PurchaseNotify;
|
|
|
import com.uas.platform.b2b.event.SaleSendAcceptReleaseEvent;
|
|
import com.uas.platform.b2b.event.SaleSendAcceptReleaseEvent;
|
|
|
-import com.uas.platform.b2b.model.*;
|
|
|
|
|
|
|
+import com.uas.platform.b2b.model.B2bCodeSet;
|
|
|
|
|
+import com.uas.platform.b2b.model.BarLabelPrintSetting;
|
|
|
|
|
+import com.uas.platform.b2b.model.BarPackage;
|
|
|
|
|
+import com.uas.platform.b2b.model.BarPackageDetail;
|
|
|
|
|
+import com.uas.platform.b2b.model.BarSendNotify;
|
|
|
|
|
+import com.uas.platform.b2b.model.Distribute;
|
|
|
|
|
+import com.uas.platform.b2b.model.PurchaseNotice;
|
|
|
|
|
+import com.uas.platform.b2b.model.PurchaseNoticeEnd;
|
|
|
|
|
+import com.uas.platform.b2b.model.PurchaseOrder;
|
|
|
|
|
+import com.uas.platform.b2b.model.Role;
|
|
|
|
|
+import com.uas.platform.b2b.model.SaleSend;
|
|
|
|
|
+import com.uas.platform.b2b.model.SaleSendAll;
|
|
|
|
|
+import com.uas.platform.b2b.model.SaleSendItem;
|
|
|
|
|
+import com.uas.platform.b2b.model.SaleSendItemAll;
|
|
|
|
|
+import com.uas.platform.b2b.model.SaleSendItemVerify;
|
|
|
|
|
+import com.uas.platform.b2b.model.SearchFilter;
|
|
|
|
|
+import com.uas.platform.b2b.model.User;
|
|
|
|
|
+import com.uas.platform.b2b.model.UserOrders;
|
|
|
|
|
+import com.uas.platform.b2b.model.Vendor;
|
|
|
import com.uas.platform.b2b.ps.service.PersonalProductService;
|
|
import com.uas.platform.b2b.ps.service.PersonalProductService;
|
|
|
import com.uas.platform.b2b.search.SearchService;
|
|
import com.uas.platform.b2b.search.SearchService;
|
|
|
import com.uas.platform.b2b.service.PurchaseNoticeService;
|
|
import com.uas.platform.b2b.service.PurchaseNoticeService;
|
|
|
import com.uas.platform.b2b.service.UserService;
|
|
import com.uas.platform.b2b.service.UserService;
|
|
|
-import com.uas.platform.b2b.support.*;
|
|
|
|
|
|
|
+import com.uas.platform.b2b.support.CollectionUtil;
|
|
|
|
|
+import com.uas.platform.b2b.support.SPageUtils;
|
|
|
|
|
+import com.uas.platform.b2b.support.SearchUtils;
|
|
|
|
|
+import com.uas.platform.b2b.support.SystemSession;
|
|
|
|
|
+import com.uas.platform.b2b.support.UsageBufferedLogger;
|
|
|
import com.uas.platform.core.exception.IllegalOperatorException;
|
|
import com.uas.platform.core.exception.IllegalOperatorException;
|
|
|
import com.uas.platform.core.logging.BufferedLoggerManager;
|
|
import com.uas.platform.core.logging.BufferedLoggerManager;
|
|
|
import com.uas.platform.core.model.Constant;
|
|
import com.uas.platform.core.model.Constant;
|
|
@@ -33,7 +71,14 @@ import javax.persistence.criteria.Predicate;
|
|
|
import javax.persistence.criteria.Root;
|
|
import javax.persistence.criteria.Root;
|
|
|
import java.math.BigDecimal;
|
|
import java.math.BigDecimal;
|
|
|
import java.text.SimpleDateFormat;
|
|
import java.text.SimpleDateFormat;
|
|
|
-import java.util.*;
|
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
|
|
+import java.util.Arrays;
|
|
|
|
|
+import java.util.Date;
|
|
|
|
|
+import java.util.HashMap;
|
|
|
|
|
+import java.util.HashSet;
|
|
|
|
|
+import java.util.List;
|
|
|
|
|
+import java.util.Map;
|
|
|
|
|
+import java.util.Set;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 发货提醒
|
|
* 发货提醒
|
|
@@ -1238,11 +1283,13 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
|
|
|
/**
|
|
/**
|
|
|
* 通过ids查询发货信息
|
|
* 通过ids查询发货信息
|
|
|
*
|
|
*
|
|
|
- * @param ids
|
|
|
|
|
- * @return
|
|
|
|
|
|
|
+ * @param ids 传入的id
|
|
|
|
|
+ * @return List<PurchaseNotice>
|
|
|
*/
|
|
*/
|
|
|
@Override
|
|
@Override
|
|
|
public List<PurchaseNotice> findByIds(List<Long> ids) {
|
|
public List<PurchaseNotice> findByIds(List<Long> ids) {
|
|
|
- return purchaseNoticeDao.findAll(ids);
|
|
|
|
|
|
|
+ // 进行ID去重操作
|
|
|
|
|
+ Set<Long> idSet = new HashSet<>(ids);
|
|
|
|
|
+ return purchaseNoticeDao.findAll(idSet);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|