领料明细原材料 品号属性为M 仓库为02 库位为BCP的数据过滤掉

src/main/java/com/topsunit/scanservice/ximai/dto/MocteCreateDto.java

@@ -41,6 +41,9 @@ public class MocteCreateDto {
     @ApiModelProperty("库位 默认库位，带出可修改")
     private String te025;
 
+    @ApiModelProperty("品号属性")
+    private String mb025;
+
     /**
      * 批管理 N=批管理
      */

src/main/java/com/topsunit/scanservice/ximai/entity/Invmb.java

@@ -63,6 +63,9 @@ public class Invmb extends EntityBase {
     @ApiModelProperty("备注")
     private String mb028;
 
+    @ApiModelProperty("品号属性")
+    private String mb025;
+
     @ApiModelProperty("MES同步标识")
     private String udf08;
 

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

@@ -75,15 +75,17 @@ public class MoctcService {
             } else {
                 i.setTc001("5501");//委外领料
             }
-            i.setMoctes(moctcMapper.toMocteCreateDtoList(moctbDao.findByTb001AndTb002OrderByTb003AscTb006Asc(criteria.getTa001(), criteria.getTa002()))
+            List<MocteCreateDto> detailList = moctcMapper.toMocteCreateDtoList(moctbDao.findByTb001AndTb002OrderByTb003AscTb006Asc(criteria.getTa001(), criteria.getTa002()))
                     .stream()
                     .filter(j -> j.getTb004().compareTo(j.getTb005()) > 0)
-                    .collect(Collectors.toList()));
+                    //过滤仓库为仓库为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 < i.getMoctes().size(); index++) {
+            for (int index = 0; index < detailList.size(); index++) {
                 MocteCreateDto j = i.getMoctes().get(index);
                 j.setTe003(String.format("%04d", ordinal));
                 j.setTe010("");
@@ -94,9 +96,13 @@ public class MoctcService {
                 invmbDao.findById(j.getTb003()).ifPresent(x -> {
                     j.setMb022(x.getMb022());
                     j.setIslot(!(x.getMb022().trim().equals("N")));
+                    j.setMb025(x.getMb025());
                 });
                 ordinal++;
             }
+            //只要工单的原材料 品号属性为M
+            detailList = detailList.stream().filter(s->!"M".equalsIgnoreCase(s.getMb025())).collect(Collectors.toList());
+            i.setMoctes(detailList);
         });
         return moctcCreateDto;
     }