工单查询接口添加审核码字段

查询可领料单BUG修复

src/main/java/com/topsunit/scanservice/ximai/service/MoctaService.java

@@ -94,6 +94,10 @@ public class MoctaService {
                     Predicate predicate = criteriaBuilder.equal(root.get("ta001"), criteria.getTa001() );
                     predicates.add(predicate);
                 }
+                if (StringUtils.isNotBlank(criteria.getTa013())) {
+                    Predicate predicate = criteriaBuilder.equal(root.get("ta013"), criteria.getTa013() );
+                    predicates.add(predicate);
+                }
                 if (StringUtils.isNotBlank(criteria.getNeUdf07())) {
                     Predicate predicate = criteriaBuilder.notEqual(root.get("udf07"), criteria.getNeUdf07() );
                     predicates.add(predicate);

src/main/java/com/topsunit/scanservice/ximai/service/MoctcService.java

@@ -78,15 +78,10 @@ public class MoctcService {
             List<MocteCreateDto> detailList = moctcMapper.toMocteCreateDtoList(moctbDao.findByTb001AndTb002OrderByTb003AscTb006Asc(criteria.getTa001(), criteria.getTa002()))
                     .stream()
                     .filter(j -> j.getTb004().compareTo(j.getTb005()) > 0)
-                    //过滤仓库为仓库为02 库位为BCP数据
-                    .filter(j->!("02".equals(j.getTb009())&&"BCP".equalsIgnoreCase(j.getTe025())))
                     .collect(Collectors.toList());
-            if (i.getMoctes() == null || i.getMoctes().isEmpty()) {
-                throw new TopsunitException(MessageUtils.getMessage("工单已领料完成。"));
-            }
             int ordinal = 1;
             for (int index = 0; index < detailList.size(); index++) {
-                MocteCreateDto j = i.getMoctes().get(index);
+                MocteCreateDto j = detailList.get(index);
                 j.setTe003(String.format("%04d", ordinal));
                 j.setTe010("");
                 invmcDao.findFirstByMc001AndMc002(j.getTb003(), j.getTb009())
@@ -101,7 +96,12 @@ public class MoctcService {
                 ordinal++;
             }
             //只要工单的原材料 品号属性为M
-            detailList = detailList.stream().filter(s->!"M".equalsIgnoreCase(s.getMb025())).collect(Collectors.toList());
+            detailList = detailList.stream().filter(s->!"M".equalsIgnoreCase(s.getMb025()))
+                    //过滤仓库为仓库为02 库位为BCP数据
+                    .filter(j->!("02".equals(j.getTb009())&&"BCP".equalsIgnoreCase(j.getTe025()))).collect(Collectors.toList());
+            if (detailList == null || detailList.isEmpty()) {
+                throw new TopsunitException(MessageUtils.getMessage("工单已领料完成。"));
+            }
             i.setMoctes(detailList);
         });
         return moctcCreateDto;