|
@@ -5,8 +5,32 @@ import java.util.List;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
|
|
|
|
+import com.uas.platform.b2b.dao.MakeAcceptDao;
|
|
|
|
|
+import com.uas.platform.b2b.dao.MakeOrderChangeDao;
|
|
|
|
|
+import com.uas.platform.b2b.dao.MakeOrderDao;
|
|
|
|
|
+import com.uas.platform.b2b.dao.PurchaseAcceptDao;
|
|
|
|
|
+import com.uas.platform.b2b.dao.PurchaseApBillDao;
|
|
|
|
|
+import com.uas.platform.b2b.dao.PurchaseBadInDao;
|
|
|
|
|
+import com.uas.platform.b2b.dao.PurchaseBadOutDao;
|
|
|
|
|
+import com.uas.platform.b2b.dao.PurchaseForecastAllDao;
|
|
|
|
|
+import com.uas.platform.b2b.dao.PurchaseInquiryDao;
|
|
|
|
|
+import com.uas.platform.b2b.dao.PurchaseMRBDao;
|
|
|
import com.uas.platform.b2b.dao.PurchaseOrderDao;
|
|
import com.uas.platform.b2b.dao.PurchaseOrderDao;
|
|
|
|
|
+import com.uas.platform.b2b.dao.PurchaseProofingDao;
|
|
|
|
|
+import com.uas.platform.b2b.dao.PurchaseReturnDao;
|
|
|
|
|
+import com.uas.platform.b2b.model.MakeAccept;
|
|
|
|
|
+import com.uas.platform.b2b.model.MakeOrder;
|
|
|
|
|
+import com.uas.platform.b2b.model.MakeOrderChange;
|
|
|
|
|
+import com.uas.platform.b2b.model.PurchaseAccept;
|
|
|
|
|
+import com.uas.platform.b2b.model.PurchaseApBill;
|
|
|
|
|
+import com.uas.platform.b2b.model.PurchaseBadIn;
|
|
|
|
|
+import com.uas.platform.b2b.model.PurchaseBadOut;
|
|
|
|
|
+import com.uas.platform.b2b.model.PurchaseForecastAll;
|
|
|
|
|
+import com.uas.platform.b2b.model.PurchaseInquiry;
|
|
|
|
|
+import com.uas.platform.b2b.model.PurchaseMRB;
|
|
|
import com.uas.platform.b2b.model.PurchaseOrder;
|
|
import com.uas.platform.b2b.model.PurchaseOrder;
|
|
|
|
|
+import com.uas.platform.b2b.model.PurchaseProofing;
|
|
|
|
|
+import com.uas.platform.b2b.model.PurchaseReturn;
|
|
|
import com.uas.search.b2b.model.PageParams;
|
|
import com.uas.search.b2b.model.PageParams;
|
|
|
import com.uas.search.b2b.model.SPage;
|
|
import com.uas.search.b2b.model.SPage;
|
|
|
import com.uas.search.b2b.service.SearchService.Table_name;
|
|
import com.uas.search.b2b.service.SearchService.Table_name;
|
|
@@ -26,6 +50,45 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private PurchaseOrderDao purchaseOrderDao;
|
|
private PurchaseOrderDao purchaseOrderDao;
|
|
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private MakeOrderDao makeOrderDao;
|
|
|
|
|
+
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private PurchaseAcceptDao purchaseAcceptDao;
|
|
|
|
|
+
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private PurchaseApBillDao purchaseApBillDao;
|
|
|
|
|
+
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private PurchaseBadInDao purchaseBadInDao;
|
|
|
|
|
+
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private PurchaseBadOutDao purchaseBadOutDao;
|
|
|
|
|
+
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private PurchaseForecastAllDao purchaseForecastDao;
|
|
|
|
|
+
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private PurchaseInquiryDao purchaseInquiryDao;
|
|
|
|
|
+
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private PurchaseMRBDao purchaseMRBDao;
|
|
|
|
|
+
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private PurchaseProofingDao purchaseProofingDao;
|
|
|
|
|
+
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private PurchaseReturnDao purchaseReturnDao;
|
|
|
|
|
+
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private MakeAcceptDao makeAcceptDao;
|
|
|
|
|
+
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private MakeOrderChangeDao makeOrderChangeDao;
|
|
|
|
|
+
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 采购订单
|
|
|
|
|
+ */
|
|
|
@Override
|
|
@Override
|
|
|
public SPage<PurchaseOrder> searchPurchaseOrderIds(String keyword, PageParams pageParams) {
|
|
public SPage<PurchaseOrder> searchPurchaseOrderIds(String keyword, PageParams pageParams) {
|
|
|
SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$ORDERS, pageParams);
|
|
SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$ORDERS, pageParams);
|
|
@@ -56,4 +119,111 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
|
|
|
return result;
|
|
return result;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 委外加工单
|
|
|
|
|
+ *
|
|
|
|
|
+ */
|
|
|
|
|
+ @Override
|
|
|
|
|
+ public SPage<MakeOrder> searchMakeOrderIds(String keyword, PageParams pageParams) {
|
|
|
|
|
+ SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.MAKE$ORDERS, pageParams);
|
|
|
|
|
+ return toSPage(idsPage, makeOrderDao.findAll(idsPage.getContent()));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 买家验收单
|
|
|
|
|
+ */
|
|
|
|
|
+ @Override
|
|
|
|
|
+ public SPage<PurchaseAccept> searchPurchaseAcceptIds(String keyword, PageParams pageParams) {
|
|
|
|
|
+ SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$ACCEPT, pageParams);
|
|
|
|
|
+ return toSPage(idsPage, purchaseAcceptDao.findAll(idsPage.getContent()));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 买家应付发票表
|
|
|
|
|
+ */
|
|
|
|
|
+ @Override
|
|
|
|
|
+ public SPage<PurchaseApBill> searchPurchaseApBillIds(String keyword, PageParams pageParams) {
|
|
|
|
|
+ SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$APBILL, pageParams);
|
|
|
|
|
+ return toSPage(idsPage, purchaseApBillDao.findAll(idsPage.getContent()));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 不良品入库单
|
|
|
|
|
+ *
|
|
|
|
|
+ * @param keyword
|
|
|
|
|
+ * @param pageParams
|
|
|
|
|
+ * @return
|
|
|
|
|
+ */
|
|
|
|
|
+ @Override
|
|
|
|
|
+ public SPage<PurchaseBadIn> searchPuchaseBadInIds(String keyword, PageParams pageParams) {
|
|
|
|
|
+ SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$BADIN, pageParams);
|
|
|
|
|
+ return toSPage(idsPage, purchaseBadInDao.findAll(idsPage.getContent()));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 不良品出库单
|
|
|
|
|
+ */
|
|
|
|
|
+ @Override
|
|
|
|
|
+ public SPage<PurchaseBadOut> searchPurchaseBadOutIds(String keyword, PageParams pageParams) {
|
|
|
|
|
+ SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$BADOUT, pageParams);
|
|
|
|
|
+ return toSPage(idsPage, purchaseBadOutDao.findAll(idsPage.getContent()));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 采购预测单
|
|
|
|
|
+ */
|
|
|
|
|
+ @Override
|
|
|
|
|
+ public SPage<PurchaseForecastAll> searchPurchaseForecastAllIds(String keyword, PageParams pageParams) {
|
|
|
|
|
+ SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$FORECAST, pageParams);
|
|
|
|
|
+ return toSPage(idsPage, purchaseForecastDao.findAll(idsPage.getContent()));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 采购询价单
|
|
|
|
|
+ */
|
|
|
|
|
+ @Override
|
|
|
|
|
+ public SPage<PurchaseInquiry> searchPurchaseInquiryIds(String keyword, PageParams pageParams) {
|
|
|
|
|
+ SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$INQUIRY, pageParams);
|
|
|
|
|
+ return toSPage(idsPage, purchaseInquiryDao.findAll(idsPage.getContent()));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 客户MRB
|
|
|
|
|
+ */
|
|
|
|
|
+ @Override
|
|
|
|
|
+ public SPage<PurchaseMRB> searchPurchaseMRBIds(String keyword, PageParams pageParams) {
|
|
|
|
|
+ SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$MRB, pageParams);
|
|
|
|
|
+ return toSPage(idsPage, purchaseMRBDao.findAll(idsPage.getContent()));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 打样申请单
|
|
|
|
|
+ */
|
|
|
|
|
+ @Override
|
|
|
|
|
+ public SPage<PurchaseProofing> searchPurchaseProofingIds(String keyword, PageParams pageParams) {
|
|
|
|
|
+ SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$PROOFING, pageParams);
|
|
|
|
|
+ return toSPage(idsPage, purchaseProofingDao.findAll(idsPage.getContent()));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 客户验退单
|
|
|
|
|
+ */
|
|
|
|
|
+ @Override
|
|
|
|
|
+ public SPage<PurchaseReturn> searchPurchaseReturnIds(String keyword, PageParams pageParams) {
|
|
|
|
|
+ SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$RETURN, pageParams);
|
|
|
|
|
+ return toSPage(idsPage, purchaseReturnDao.findAll(idsPage.getContent()));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ @Override
|
|
|
|
|
+ public SPage<MakeAccept> searchMakeAcceptIds(String keyword, PageParams pageParams) {
|
|
|
|
|
+ SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$RETURN, pageParams);
|
|
|
|
|
+ return toSPage(idsPage, makeAcceptDao.findAll(idsPage.getContent()));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ @Override
|
|
|
|
|
+ public SPage<MakeOrderChange> searchMakeOrderChangeIds(String keyword, PageParams pageParams) {
|
|
|
|
|
+ SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.MAKE$CHANGES, pageParams);
|
|
|
|
|
+ return toSPage(idsPage, makeOrderChangeDao.findAll(idsPage.getContent()));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
}
|
|
}
|