|
@@ -129,8 +129,8 @@ public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
|
|
|
idName = "mri_id";
|
|
idName = "mri_id";
|
|
|
yCheckQtyName = "mri_ycheckqty";
|
|
yCheckQtyName = "mri_ycheckqty";
|
|
|
}
|
|
}
|
|
|
- String sql = "update " + sourceTable + " set " + yCheckQtyName + " = " + newYCheckQtyVal + " where " + idName + " = "
|
|
|
|
|
- + sourceIdVal;
|
|
|
|
|
|
|
+ String sql = "update " + sourceTable + " set " + yCheckQtyName + " = " + newYCheckQtyVal + " where "
|
|
|
|
|
+ + idName + " = " + sourceIdVal;
|
|
|
jdbcTemplate.execute(sql);
|
|
jdbcTemplate.execute(sql);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -184,8 +184,8 @@ public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
|
|
|
idName = "mri_id";
|
|
idName = "mri_id";
|
|
|
yCheckQtyName = "mri_ycheckqty";
|
|
yCheckQtyName = "mri_ycheckqty";
|
|
|
}
|
|
}
|
|
|
- String sql = "update " + sourceTable + " set " + yCheckQtyName + " = " + newYCheckQtyVal + " where " + idName + " = "
|
|
|
|
|
- + sourceIdVal;
|
|
|
|
|
|
|
+ String sql = "update " + sourceTable + " set " + yCheckQtyName + " = " + newYCheckQtyVal + " where "
|
|
|
|
|
+ + idName + " = " + sourceIdVal;
|
|
|
jdbcTemplate.execute(sql);
|
|
jdbcTemplate.execute(sql);
|
|
|
|
|
|
|
|
}
|
|
}
|
|
@@ -206,7 +206,8 @@ public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
|
|
|
String idName = null;
|
|
String idName = null;
|
|
|
List<String> list = getSourceInfo(sourceTable, idName, "");
|
|
List<String> list = getSourceInfo(sourceTable, idName, "");
|
|
|
if (list != null && list.size() == 3) {
|
|
if (list != null && list.size() == 3) {
|
|
|
- String sql = "select count(0) from " + item.getSourceTable() + " where " + list.get(1) + "=" + item.getSourceId();
|
|
|
|
|
|
|
+ String sql = "select count(0) from " + item.getSourceTable() + " where " + list.get(1) + "="
|
|
|
|
|
+ + item.getSourceId();
|
|
|
Integer count = jdbcTemplate.queryForObject(sql, Integer.class);
|
|
Integer count = jdbcTemplate.queryForObject(sql, Integer.class);
|
|
|
if (count == 0) {
|
|
if (count == 0) {
|
|
|
apCheck.setStatus((short) Status.DISABLED.value());
|
|
apCheck.setStatus((short) Status.DISABLED.value());
|
|
@@ -276,8 +277,8 @@ public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
|
|
|
idName = "mri_id";
|
|
idName = "mri_id";
|
|
|
yCheckQtyName = "mri_ycheckqty";
|
|
yCheckQtyName = "mri_ycheckqty";
|
|
|
}
|
|
}
|
|
|
- String sql = "update " + source.getSourceTable() + " set " + yCheckQtyName + " = " + source.getNewYCheckQty()
|
|
|
|
|
- + " where " + idName + " = " + source.getSourceId();
|
|
|
|
|
|
|
+ String sql = "update " + source.getSourceTable() + " set " + yCheckQtyName + " = "
|
|
|
|
|
+ + source.getNewYCheckQty() + " where " + idName + " = " + source.getSourceId();
|
|
|
jdbcTemplate.execute(sql);
|
|
jdbcTemplate.execute(sql);
|
|
|
} else {
|
|
} else {
|
|
|
throw new IllegalOperatorException("保存失败!");
|
|
throw new IllegalOperatorException("保存失败!");
|
|
@@ -289,7 +290,8 @@ public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
- public Page<PurchaseApCheck> findAllByPageInfo(final PageInfo pageInfo, final String keyword, SearchFilter searchFilter) {
|
|
|
|
|
|
|
+ public Page<PurchaseApCheck> findAllByPageInfo(final PageInfo pageInfo, final String keyword,
|
|
|
|
|
+ SearchFilter searchFilter) {
|
|
|
if (searchFilter != null) {
|
|
if (searchFilter != null) {
|
|
|
if (searchFilter.getFromDate() != null)
|
|
if (searchFilter.getFromDate() != null)
|
|
|
pageInfo.expression(PredicateUtils.gte("recordDate", new Date(searchFilter.getFromDate()), false));
|
|
pageInfo.expression(PredicateUtils.gte("recordDate", new Date(searchFilter.getFromDate()), false));
|
|
@@ -299,8 +301,8 @@ public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
|
|
|
return purchaseApCheckDao.findAll(new Specification<PurchaseApCheck>() {
|
|
return purchaseApCheckDao.findAll(new Specification<PurchaseApCheck>() {
|
|
|
public Predicate toPredicate(Root<PurchaseApCheck> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
|
|
public Predicate toPredicate(Root<PurchaseApCheck> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
|
|
|
if (StringUtils.hasText(keyword)) {
|
|
if (StringUtils.hasText(keyword)) {
|
|
|
- pageInfo.expression(PredicateUtils.in("id",
|
|
|
|
|
- purchaseApCheckIndexDao.findByKeyword(SystemSession.getUser().getEnterprise().getUu(), keyword), false));
|
|
|
|
|
|
|
+ pageInfo.expression(PredicateUtils.in("id", purchaseApCheckIndexDao
|
|
|
|
|
+ .findByKeyword(SystemSession.getUser().getEnterprise().getUu(), keyword), false));
|
|
|
}
|
|
}
|
|
|
query.where(pageInfo.getPredicates(root, query, builder));
|
|
query.where(pageInfo.getPredicates(root, query, builder));
|
|
|
return null;
|
|
return null;
|
|
@@ -308,7 +310,8 @@ public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
|
|
|
}, pageInfo);
|
|
}, pageInfo);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- public Page<PurchaseApCheckTodo> findTodoByPageInfo(final PageInfo pageInfo, final String keyword, SearchFilter searchFilter) {
|
|
|
|
|
|
|
+ public Page<PurchaseApCheckTodo> findTodoByPageInfo(final PageInfo pageInfo, final String keyword,
|
|
|
|
|
+ SearchFilter searchFilter) {
|
|
|
if (searchFilter != null) {
|
|
if (searchFilter != null) {
|
|
|
if (searchFilter.getFromDate() != null)
|
|
if (searchFilter.getFromDate() != null)
|
|
|
pageInfo.expression(PredicateUtils.gte("recordDate", new Date(searchFilter.getFromDate()), false));
|
|
pageInfo.expression(PredicateUtils.gte("recordDate", new Date(searchFilter.getFromDate()), false));
|
|
@@ -316,10 +319,11 @@ public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
|
|
|
pageInfo.expression(PredicateUtils.lte("recordDate", new Date(searchFilter.getEndDate()), false));
|
|
pageInfo.expression(PredicateUtils.lte("recordDate", new Date(searchFilter.getEndDate()), false));
|
|
|
}
|
|
}
|
|
|
return purchaseApCheckTodoDao.findAll(new Specification<PurchaseApCheckTodo>() {
|
|
return purchaseApCheckTodoDao.findAll(new Specification<PurchaseApCheckTodo>() {
|
|
|
- public Predicate toPredicate(Root<PurchaseApCheckTodo> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
|
|
|
|
|
|
|
+ public Predicate toPredicate(Root<PurchaseApCheckTodo> root, CriteriaQuery<?> query,
|
|
|
|
|
+ CriteriaBuilder builder) {
|
|
|
if (StringUtils.hasText(keyword)) {
|
|
if (StringUtils.hasText(keyword)) {
|
|
|
- pageInfo.expression(PredicateUtils.in("id",
|
|
|
|
|
- purchaseApCheckIndexDao.findByKeyword(SystemSession.getUser().getEnterprise().getUu(), keyword), false));
|
|
|
|
|
|
|
+ pageInfo.expression(PredicateUtils.in("id", purchaseApCheckIndexDao
|
|
|
|
|
+ .findByKeyword(SystemSession.getUser().getEnterprise().getUu(), keyword), false));
|
|
|
}
|
|
}
|
|
|
query.where(pageInfo.getPredicates(root, query, builder));
|
|
query.where(pageInfo.getPredicates(root, query, builder));
|
|
|
return null;
|
|
return null;
|
|
@@ -327,7 +331,8 @@ public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
|
|
|
}, pageInfo);
|
|
}, pageInfo);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- public Page<PurchaseApCheckDone> findDoneByPageInfo(final PageInfo pageInfo, final String keyword, SearchFilter searchFilter) {
|
|
|
|
|
|
|
+ public Page<PurchaseApCheckDone> findDoneByPageInfo(final PageInfo pageInfo, final String keyword,
|
|
|
|
|
+ SearchFilter searchFilter) {
|
|
|
if (searchFilter != null) {
|
|
if (searchFilter != null) {
|
|
|
if (searchFilter.getFromDate() != null)
|
|
if (searchFilter.getFromDate() != null)
|
|
|
pageInfo.expression(PredicateUtils.gte("recordDate", new Date(searchFilter.getFromDate()), false));
|
|
pageInfo.expression(PredicateUtils.gte("recordDate", new Date(searchFilter.getFromDate()), false));
|
|
@@ -335,10 +340,11 @@ public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
|
|
|
pageInfo.expression(PredicateUtils.lte("recordDate", new Date(searchFilter.getEndDate()), false));
|
|
pageInfo.expression(PredicateUtils.lte("recordDate", new Date(searchFilter.getEndDate()), false));
|
|
|
}
|
|
}
|
|
|
return purchaseApCheckDoneDao.findAll(new Specification<PurchaseApCheckDone>() {
|
|
return purchaseApCheckDoneDao.findAll(new Specification<PurchaseApCheckDone>() {
|
|
|
- public Predicate toPredicate(Root<PurchaseApCheckDone> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
|
|
|
|
|
|
|
+ public Predicate toPredicate(Root<PurchaseApCheckDone> root, CriteriaQuery<?> query,
|
|
|
|
|
+ CriteriaBuilder builder) {
|
|
|
if (StringUtils.hasText(keyword)) {
|
|
if (StringUtils.hasText(keyword)) {
|
|
|
- pageInfo.expression(PredicateUtils.in("id",
|
|
|
|
|
- purchaseApCheckIndexDao.findByKeyword(SystemSession.getUser().getEnterprise().getUu(), keyword), false));
|
|
|
|
|
|
|
+ pageInfo.expression(PredicateUtils.in("id", purchaseApCheckIndexDao
|
|
|
|
|
+ .findByKeyword(SystemSession.getUser().getEnterprise().getUu(), keyword), false));
|
|
|
}
|
|
}
|
|
|
query.where(pageInfo.getPredicates(root, query, builder));
|
|
query.where(pageInfo.getPredicates(root, query, builder));
|
|
|
return null;
|
|
return null;
|
|
@@ -346,7 +352,8 @@ public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
|
|
|
}, pageInfo);
|
|
}, pageInfo);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- public Page<PurchaseApCheckEnd> findEndByPageInfo(final PageInfo pageInfo, final String keyword, SearchFilter searchFilter) {
|
|
|
|
|
|
|
+ public Page<PurchaseApCheckEnd> findEndByPageInfo(final PageInfo pageInfo, final String keyword,
|
|
|
|
|
+ SearchFilter searchFilter) {
|
|
|
if (searchFilter != null) {
|
|
if (searchFilter != null) {
|
|
|
if (searchFilter.getFromDate() != null)
|
|
if (searchFilter.getFromDate() != null)
|
|
|
pageInfo.expression(PredicateUtils.gte("recordDate", new Date(searchFilter.getFromDate()), false));
|
|
pageInfo.expression(PredicateUtils.gte("recordDate", new Date(searchFilter.getFromDate()), false));
|
|
@@ -354,10 +361,11 @@ public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
|
|
|
pageInfo.expression(PredicateUtils.lte("recordDate", new Date(searchFilter.getEndDate()), false));
|
|
pageInfo.expression(PredicateUtils.lte("recordDate", new Date(searchFilter.getEndDate()), false));
|
|
|
}
|
|
}
|
|
|
return purchaseApCheckEndDao.findAll(new Specification<PurchaseApCheckEnd>() {
|
|
return purchaseApCheckEndDao.findAll(new Specification<PurchaseApCheckEnd>() {
|
|
|
- public Predicate toPredicate(Root<PurchaseApCheckEnd> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
|
|
|
|
|
|
|
+ public Predicate toPredicate(Root<PurchaseApCheckEnd> root, CriteriaQuery<?> query,
|
|
|
|
|
+ CriteriaBuilder builder) {
|
|
|
if (StringUtils.hasText(keyword)) {
|
|
if (StringUtils.hasText(keyword)) {
|
|
|
- pageInfo.expression(PredicateUtils.in("id",
|
|
|
|
|
- purchaseApCheckIndexDao.findByKeyword(SystemSession.getUser().getEnterprise().getUu(), keyword), false));
|
|
|
|
|
|
|
+ pageInfo.expression(PredicateUtils.in("id", purchaseApCheckIndexDao
|
|
|
|
|
+ .findByKeyword(SystemSession.getUser().getEnterprise().getUu(), keyword), false));
|
|
|
}
|
|
}
|
|
|
query.where(pageInfo.getPredicates(root, query, builder));
|
|
query.where(pageInfo.getPredicates(root, query, builder));
|
|
|
return null;
|
|
return null;
|
|
@@ -406,10 +414,9 @@ public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
|
|
|
public void print(Long id) {
|
|
public void print(Long id) {
|
|
|
PurchaseApCheck check = purchaseApCheckDao.findOne(id);
|
|
PurchaseApCheck check = purchaseApCheckDao.findOne(id);
|
|
|
if (check != null) {
|
|
if (check != null) {
|
|
|
- check.setPrint((short) ((check.getPrint() == null ? 0 : check
|
|
|
|
|
- .getPrint()) + 1));
|
|
|
|
|
|
|
+ check.setPrint((short) ((check.getPrint() == null ? 0 : check.getPrint()) + 1));
|
|
|
}
|
|
}
|
|
|
purchaseApCheckDao.save(check);
|
|
purchaseApCheckDao.save(check);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|