|
|
@@ -90,7 +90,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
|
|
|
|
|
|
@Autowired
|
|
|
private PurchaseOrderIndexDao purchaseOrderIndexDao;
|
|
|
-
|
|
|
+
|
|
|
@Autowired
|
|
|
private UserBaseInfoDao userBaseInfoDao;
|
|
|
|
|
|
@@ -107,16 +107,16 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
|
|
|
}
|
|
|
}, pageInfo);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@Override
|
|
|
public Page<PurchaseOrderAll> findAllDetailByPageInfo(final PageInfo pageInfo, final SearchFilter filter) {
|
|
|
- if(filter != null) {
|
|
|
- if(StringUtils.hasText(filter.getKeyword()))
|
|
|
- pageInfo.expression(PredicateUtils.in("id", purchaseOrderIndexDao.findByKeyword(SystemSession
|
|
|
- .getUser().getEnterprise().getUu(), filter.getKeyword()), false));
|
|
|
- if(filter.getFromDate() != null)
|
|
|
+ if (filter != null) {
|
|
|
+ if (StringUtils.hasText(filter.getKeyword()))
|
|
|
+ pageInfo.expression(PredicateUtils.in("id",
|
|
|
+ purchaseOrderIndexDao.findByKeyword(SystemSession.getUser().getEnterprise().getUu(), filter.getKeyword()), false));
|
|
|
+ if (filter.getFromDate() != null)
|
|
|
pageInfo.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
|
|
|
- if(filter.getEndDate() != null)
|
|
|
+ if (filter.getEndDate() != null)
|
|
|
pageInfo.expression(PredicateUtils.lte("date", new Date(filter.getEndDate()), false));
|
|
|
}
|
|
|
Page<PurchaseOrderAll> pageOrders = purchaseOrderAllDao.findAll(new Specification<PurchaseOrderAll>() {
|
|
|
@@ -124,24 +124,23 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
|
|
|
Predicate[] predicates = pageInfo.getPredicates(root, query, builder);
|
|
|
if (filter != null && filter.getFromDelivery() != null) {
|
|
|
predicates = Arrays.copyOf(predicates, predicates.length + 1);
|
|
|
- SetJoin<PurchaseOrderAll, PurchaseOrderAllItem> join = root.join(root.getModel().
|
|
|
- getSet("orderItems", PurchaseOrderAllItem.class), JoinType.INNER);
|
|
|
- Predicate p = builder.greaterThanOrEqualTo(join.get("delivery").as(Date.class),
|
|
|
- new Date(filter.getFromDelivery()));
|
|
|
+ SetJoin<PurchaseOrderAll, PurchaseOrderAllItem> join = root.join(
|
|
|
+ root.getModel().getSet("orderItems", PurchaseOrderAllItem.class), JoinType.INNER);
|
|
|
+ Predicate p = builder.greaterThanOrEqualTo(join.get("delivery").as(Date.class), new Date(filter.getFromDelivery()));
|
|
|
predicates[predicates.length - 1] = p;
|
|
|
}
|
|
|
return query.where(predicates).getRestriction();
|
|
|
}
|
|
|
}, pageInfo);
|
|
|
// 明细包含关键词
|
|
|
- if(filter != null) {
|
|
|
+ if (filter != null) {
|
|
|
List<PurchaseOrderAll> orders = pageOrders.getContent();
|
|
|
- if( ! CollectionUtils.isEmpty(orders)) {
|
|
|
- for(PurchaseOrderAll order : orders) {
|
|
|
- if( ! CollectionUtils.isEmpty(order.getOrderItems())) {
|
|
|
- for(PurchaseOrderAllItem orderItem : order.getOrderItems()) {
|
|
|
- if(StringUtils.hasText(filter.getKeyword())) {
|
|
|
- if(FlexJsonUtils.toJson(orderItem).contains(filter.getKeyword())) {
|
|
|
+ if (!CollectionUtils.isEmpty(orders)) {
|
|
|
+ for (PurchaseOrderAll order : orders) {
|
|
|
+ if (!CollectionUtils.isEmpty(order.getOrderItems())) {
|
|
|
+ for (PurchaseOrderAllItem orderItem : order.getOrderItems()) {
|
|
|
+ if (StringUtils.hasText(filter.getKeyword())) {
|
|
|
+ if (FlexJsonUtils.toJson(orderItem).contains(filter.getKeyword())) {
|
|
|
orderItem.setKey(true);
|
|
|
}
|
|
|
}
|
|
|
@@ -191,10 +190,9 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
|
|
|
// 将回复信息推送给采购企业采购员(或管理员)
|
|
|
if (order.getUserUU() != null) {
|
|
|
Enterprise vendor = enterpriseDao.findOne(order.getVendUU());
|
|
|
- if(vendor != null) {
|
|
|
+ if (vendor != null) {
|
|
|
UserBaseInfo user = userBaseInfoDao.findOne(order.getUserUU());
|
|
|
- XingePusher.pushByUser(user, "新增采购单回复", "单号:" + order.getCode()
|
|
|
- + ",供应商:" + vendor.getEnName(), "", "");
|
|
|
+ XingePusher.pushByUser(user, "新增采购单回复", "单号:" + order.getCode() + ",供应商:" + vendor.getEnName(), "", "");
|
|
|
}
|
|
|
}
|
|
|
return reply;
|
|
|
@@ -206,7 +204,8 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
|
|
|
private PurchaseOrder updateOrderStatus(long orderId) {
|
|
|
int notReply = purchaseOrderItemDao.getCountByStatus(orderId, (short) Status.NOT_REPLY.value());
|
|
|
PurchaseOrder order = purchaseOrderDao.findOne(orderId);
|
|
|
- if(order.getDisplay() == 1) order.setDisplay(Constant.NO);//设置查看状态为已查看
|
|
|
+ if (order.getDisplay() == 1)
|
|
|
+ order.setDisplay(Constant.NO);// 设置查看状态为已查看
|
|
|
order.setStatus((short) (notReply > 0 ? Status.NOT_REPLY.value() : Status.REPLIED.value()));
|
|
|
if (purchaseOrderItemDao.getCountByReply(orderId) > 0)
|
|
|
order.setReply(Constant.YES);
|
|
|
@@ -221,8 +220,8 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
|
|
|
|
|
|
@Override
|
|
|
public PurchaseOrderAll findByCode(String code) {
|
|
|
- List<PurchaseOrderAll> purchaseOrderAlls = purchaseOrderAllDao.findByVendUUAndCode(SystemSession.getUser()
|
|
|
- .getEnterprise().getUu(), code);
|
|
|
+ List<PurchaseOrderAll> purchaseOrderAlls = purchaseOrderAllDao.findByVendUUAndCode(SystemSession.getUser().getEnterprise().getUu(),
|
|
|
+ code);
|
|
|
if (purchaseOrderAlls.size() == 0)
|
|
|
throw new NotFoundException(code);
|
|
|
return purchaseOrderAlls.get(0);
|
|
|
@@ -260,8 +259,8 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
|
|
|
|
|
|
@Override
|
|
|
public List<PurchaseOrderReply> findNotUploadReply() {
|
|
|
- return purchaseOrderReplyDao.findByEnUUAndStatus(SystemSession.getUser().getEnterprise().getUu(),
|
|
|
- (short) Status.NOT_UPLOAD.value());
|
|
|
+ return purchaseOrderReplyDao
|
|
|
+ .findByEnUUAndStatus(SystemSession.getUser().getEnterprise().getUu(), (short) Status.NOT_UPLOAD.value());
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -342,19 +341,19 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
|
|
|
|
|
|
@Override
|
|
|
public int getOnhandCount() {
|
|
|
- return purchaseOrderDao.getCountByVendUUAndStatus(SystemSession.getUser().getEnterprise().getUu(),
|
|
|
- (short) Status.NOT_REPLY.value());
|
|
|
+ return purchaseOrderDao
|
|
|
+ .getCountByVendUUAndStatus(SystemSession.getUser().getEnterprise().getUu(), (short) Status.NOT_REPLY.value());
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public Page<PurchaseOrderTodo> findTodoByPageInfo(final PageInfo pageInfo, SearchFilter filter) {
|
|
|
- if(filter != null) {
|
|
|
- if(StringUtils.hasText(filter.getKeyword()))
|
|
|
- pageInfo.expression(PredicateUtils.in("id", purchaseOrderIndexDao.findByKeyword(SystemSession
|
|
|
- .getUser().getEnterprise().getUu(), filter.getKeyword()), false));
|
|
|
- if(filter.getFromDate() != null)
|
|
|
+ if (filter != null) {
|
|
|
+ if (StringUtils.hasText(filter.getKeyword()))
|
|
|
+ pageInfo.expression(PredicateUtils.in("id",
|
|
|
+ purchaseOrderIndexDao.findByKeyword(SystemSession.getUser().getEnterprise().getUu(), filter.getKeyword()), false));
|
|
|
+ if (filter.getFromDate() != null)
|
|
|
pageInfo.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
|
|
|
- if(filter.getEndDate() != null)
|
|
|
+ if (filter.getEndDate() != null)
|
|
|
pageInfo.expression(PredicateUtils.lte("date", new Date(filter.getEndDate()), false));
|
|
|
}
|
|
|
Page<PurchaseOrderTodo> pageOrders = purchaseOrderTodoDao.findAll(new Specification<PurchaseOrderTodo>() {
|
|
|
@@ -363,13 +362,13 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
|
|
|
}
|
|
|
}, pageInfo);
|
|
|
// 明细包含关键词
|
|
|
- if(filter != null && StringUtils.hasText(filter.getKeyword())) {
|
|
|
+ if (filter != null && StringUtils.hasText(filter.getKeyword())) {
|
|
|
List<PurchaseOrderTodo> orders = pageOrders.getContent();
|
|
|
- if( ! CollectionUtils.isEmpty(orders)) {
|
|
|
- for(PurchaseOrderTodo order : orders) {
|
|
|
- if( ! CollectionUtils.isEmpty(order.getOrderItems())) {
|
|
|
- for(PurchaseOrderTodoItem orderItem : order.getOrderItems()) {
|
|
|
- if(FlexJsonUtils.toJson(orderItem).contains(filter.getKeyword())) {
|
|
|
+ if (!CollectionUtils.isEmpty(orders)) {
|
|
|
+ for (PurchaseOrderTodo order : orders) {
|
|
|
+ if (!CollectionUtils.isEmpty(order.getOrderItems())) {
|
|
|
+ for (PurchaseOrderTodoItem orderItem : order.getOrderItems()) {
|
|
|
+ if (FlexJsonUtils.toJson(orderItem).contains(filter.getKeyword())) {
|
|
|
orderItem.setKey(true);
|
|
|
}
|
|
|
}
|
|
|
@@ -382,13 +381,13 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
|
|
|
|
|
|
@Override
|
|
|
public Page<PurchaseOrderDone> findDoneByPageInfo(final PageInfo pageInfo, SearchFilter filter) {
|
|
|
- if(filter != null) {
|
|
|
- if(StringUtils.hasText(filter.getKeyword()))
|
|
|
- pageInfo.expression(PredicateUtils.in("id", purchaseOrderIndexDao.findByKeyword(SystemSession
|
|
|
- .getUser().getEnterprise().getUu(), filter.getKeyword()), false));
|
|
|
- if(filter.getFromDate() != null)
|
|
|
+ if (filter != null) {
|
|
|
+ if (StringUtils.hasText(filter.getKeyword()))
|
|
|
+ pageInfo.expression(PredicateUtils.in("id",
|
|
|
+ purchaseOrderIndexDao.findByKeyword(SystemSession.getUser().getEnterprise().getUu(), filter.getKeyword()), false));
|
|
|
+ if (filter.getFromDate() != null)
|
|
|
pageInfo.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
|
|
|
- if(filter.getEndDate() != null)
|
|
|
+ if (filter.getEndDate() != null)
|
|
|
pageInfo.expression(PredicateUtils.lte("date", new Date(filter.getEndDate()), false));
|
|
|
}
|
|
|
Page<PurchaseOrderDone> pageOrders = purchaseOrderDoneDao.findAll(new Specification<PurchaseOrderDone>() {
|
|
|
@@ -397,13 +396,13 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
|
|
|
}
|
|
|
}, pageInfo);
|
|
|
// 明细包含关键词
|
|
|
- if(filter != null && StringUtils.hasText(filter.getKeyword())) {
|
|
|
+ if (filter != null && StringUtils.hasText(filter.getKeyword())) {
|
|
|
List<PurchaseOrderDone> orders = pageOrders.getContent();
|
|
|
- if( ! CollectionUtils.isEmpty(orders)) {
|
|
|
- for(PurchaseOrderDone order : orders) {
|
|
|
- if( ! CollectionUtils.isEmpty(order.getOrderItems())) {
|
|
|
- for(PurchaseOrderDoneItem orderItem : order.getOrderItems()) {
|
|
|
- if(FlexJsonUtils.toJson(orderItem).contains(filter.getKeyword())) {
|
|
|
+ if (!CollectionUtils.isEmpty(orders)) {
|
|
|
+ for (PurchaseOrderDone order : orders) {
|
|
|
+ if (!CollectionUtils.isEmpty(order.getOrderItems())) {
|
|
|
+ for (PurchaseOrderDoneItem orderItem : order.getOrderItems()) {
|
|
|
+ if (FlexJsonUtils.toJson(orderItem).contains(filter.getKeyword())) {
|
|
|
orderItem.setKey(true);
|
|
|
}
|
|
|
}
|
|
|
@@ -416,13 +415,13 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
|
|
|
|
|
|
@Override
|
|
|
public Page<PurchaseOrderEnd> findEndByPageInfo(final PageInfo pageInfo, SearchFilter filter) {
|
|
|
- if(filter != null) {
|
|
|
- if(StringUtils.hasText(filter.getKeyword()))
|
|
|
- pageInfo.expression(PredicateUtils.in("id", purchaseOrderIndexDao.findByKeyword(SystemSession
|
|
|
- .getUser().getEnterprise().getUu(), filter.getKeyword()), false));
|
|
|
- if(filter.getFromDate() != null)
|
|
|
+ if (filter != null) {
|
|
|
+ if (StringUtils.hasText(filter.getKeyword()))
|
|
|
+ pageInfo.expression(PredicateUtils.in("id",
|
|
|
+ purchaseOrderIndexDao.findByKeyword(SystemSession.getUser().getEnterprise().getUu(), filter.getKeyword()), false));
|
|
|
+ if (filter.getFromDate() != null)
|
|
|
pageInfo.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
|
|
|
- if(filter.getEndDate() != null)
|
|
|
+ if (filter.getEndDate() != null)
|
|
|
pageInfo.expression(PredicateUtils.lte("date", new Date(filter.getEndDate()), false));
|
|
|
}
|
|
|
Page<PurchaseOrderEnd> pageOrders = purchaseOrderEndDao.findAll(new Specification<PurchaseOrderEnd>() {
|
|
|
@@ -431,13 +430,13 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
|
|
|
}
|
|
|
}, pageInfo);
|
|
|
// 明细包含关键词
|
|
|
- if(filter != null && StringUtils.hasText(filter.getKeyword())) {
|
|
|
+ if (filter != null && StringUtils.hasText(filter.getKeyword())) {
|
|
|
List<PurchaseOrderEnd> orders = pageOrders.getContent();
|
|
|
- if( ! CollectionUtils.isEmpty(orders)) {
|
|
|
- for(PurchaseOrderEnd order : orders) {
|
|
|
- if( ! CollectionUtils.isEmpty(order.getOrderItems())) {
|
|
|
- for(PurchaseOrderEndItem orderItem : order.getOrderItems()) {
|
|
|
- if(FlexJsonUtils.toJson(orderItem).contains(filter.getKeyword())) {
|
|
|
+ if (!CollectionUtils.isEmpty(orders)) {
|
|
|
+ for (PurchaseOrderEnd order : orders) {
|
|
|
+ if (!CollectionUtils.isEmpty(order.getOrderItems())) {
|
|
|
+ for (PurchaseOrderEndItem orderItem : order.getOrderItems()) {
|
|
|
+ if (FlexJsonUtils.toJson(orderItem).contains(filter.getKeyword())) {
|
|
|
orderItem.setKey(true);
|
|
|
}
|
|
|
}
|
|
|
@@ -450,9 +449,9 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
|
|
|
|
|
|
@Override
|
|
|
public void setDisplay(String[] idArray, Short status) {
|
|
|
- for(String id : idArray) {
|
|
|
+ for (String id : idArray) {
|
|
|
PurchaseOrder order = purchaseOrderDao.findOne(Long.parseLong(id));
|
|
|
- if(order != null) {
|
|
|
+ if (order != null) {
|
|
|
order.setDisplay(status);
|
|
|
purchaseOrderDao.save(order);
|
|
|
}
|
|
|
@@ -462,7 +461,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
|
|
|
@Override
|
|
|
public void print(Long id) {
|
|
|
PurchaseOrder order = purchaseOrderDao.findOne(id);
|
|
|
- if(order != null) {
|
|
|
+ if (order != null) {
|
|
|
order.setPrint((short) ((order.getPrint() == null ? 0 : order.getPrint()) + 1));
|
|
|
}
|
|
|
purchaseOrderDao.save(order);
|