隐藏工序

src/main/java/cn/ezhizao/project/business/controller/Inc10100Controller.java

@@ -318,6 +318,7 @@ public class Inc10100Controller extends BaseController {
                     BizTechnologicalProcess newTech = saveProcess.stream().filter(v -> v.getTechnologyVersion().trim().equals(l.getPrver().trim()) && v.getProductCode().trim().equals(l.getCpart().trim())).findFirst().orElse(new BizTechnologicalProcess());
                     BizTechnologicalProcessDetail newProcess = new BizTechnologicalProcessDetail();
                     newProcess.setTechnologyVersion(l.getPrver().trim());
+                    newProcess.setIsConceal((l.getPrcode().trim().equals("00000") || l.getPrcode().trim().equals("36000")) ? 1 : 0);
                     newProcess.setProductCode(l.getCpart().trim());
                     newProcess.setProcessCode(l.getPrcode().trim());
                     newProcess.setProcessStepNumber(l.getPrseq());
@@ -351,6 +352,7 @@ public class Inc10100Controller extends BaseController {
                     newTech.setTenantId(Long.parseLong(l.getFacno()));
                     BizTechnologicalProcessDetail newProcess = new BizTechnologicalProcessDetail();
 
+                    newProcess.setIsConceal((l.getPrcode().trim().equals("00000") || l.getPrcode().trim().equals("36000")) ? 1 : 0);
                     newProcess.setTechnologyVersion(l.getPrver().trim());
                     newProcess.setProductCode(l.getCpart().trim());
                     newProcess.setProcessCode(l.getPrcode().trim());
@@ -410,6 +412,7 @@ public class Inc10100Controller extends BaseController {
                         itemProcesses.forEach(e -> {
                             BizTechnologicalProcessDetail newItem = new BizTechnologicalProcessDetail(e);
                             newItem.setTechnologicalProcessId(newTech.getId());
+                            newItem.setIsConceal((e.getPrcode().trim().equals("00000") || e.getPrcode().trim().equals("36000")) ? 1 : 0);
                             if (newTech.getProductCode() != null && !newTech.getProductCode().isEmpty()) {
                                 BizProduct bizProduct = products.stream().filter(v -> v.getProductCode().trim().equals(sfc10400.getCpart().trim())).findFirst().orElse(null);
                                 if (bizProduct != null) {
@@ -463,6 +466,7 @@ public class Inc10100Controller extends BaseController {
 
                 newProcess.setTechnologyVersion(l.getPrver().trim());
                 newProcess.setProductCode(l.getCpart().trim());
+                newProcess.setIsConceal((sfc10401.getPrcode().trim().equals("00000") || sfc10401.getPrcode().trim().equals("36000")) ? 1 : 0);
                 newProcess.setProcessCode(sfc10401.getPrcode().trim());
                 newProcess.setProcessStepNumber(sfc10401.getPrseq());
                 newProcess.setProcessKey(sfc10401.getFinkey());
@@ -492,6 +496,7 @@ public class Inc10100Controller extends BaseController {
                 List<Sfc10401> itemProcesses = allChangeSfc10401.stream().filter(v -> v.getCpart().trim().equals(l.getCpart().trim()) && v.getPrver().trim().equals(l.getPrver().trim())).collect(Collectors.toList());
                 itemProcesses.forEach(e -> {
                     BizTechnologicalProcessDetail newItem = new BizTechnologicalProcessDetail(e);
+                    newItem.setIsConceal((e.getPrcode().trim().equals("00000") || e.getPrcode().trim().equals("36000")) ? 1 : 0);
                     newItem.setTechnologicalProcessId(newTech.getId());
                     if (newTech.getProductCode() != null && !newTech.getProductCode().isEmpty()) {
                         BizProduct bizProduct = products.stream().filter(v -> v.getProductCode().trim().equals(l.getCpart().trim())).findFirst().orElse(null);

src/main/java/cn/ezhizao/project/business/controller/Mrp10201Controller.java

@@ -111,7 +111,7 @@ public class Mrp10201Controller extends BaseController {
                  * llsta：领料状态，Y：领料，N：未领料，这里只需要拉取Y状态的领料
                  * lotbz：lotbz=‘Y’，表示正常领料；='G'：改料；='B'：补料
                  */
-                queryWrapper.apply("lldate IS NOT NULL AND lldate > {0} AND llbz='Y' AND lotbz='Y'", newCondition);
+                queryWrapper.apply("lldate IS NOT NULL AND lldate > {0} AND llbz='Y' AND lotbz='Y' AND dpsta='N' ", newCondition);
             }
             List<Mrp10201> mrp10201List = mrp10201Service.getList(queryWrapper);
             // 如果从P2中拉取到数据，则需要保存到当前数据库中

src/main/java/cn/ezhizao/project/business/domain/BizTechnologicalProcessDetail.java

@@ -109,6 +109,9 @@ public class BizTechnologicalProcessDetail extends BaseEntity {
     @ApiModelProperty("${comment}")
     private String processKey;
 
+    //是否隐藏
+    private Integer isConceal;
+
     public BizTechnologicalProcessDetail() {
     }
 

src/main/java/cn/ezhizao/project/business/domain/Mrp10201.java

@@ -619,4 +619,7 @@ public class Mrp10201
     @ApiModelProperty(value = "公司研发项目代号sys10110_xz.dept  and type='3")
     private String xmno;
 
+    @Excel(name = "Y有大票N无大票(电子大票)")
+    @ApiModelProperty(value = "Y有大票N无大票(电子大票)")
+    private Long dpsta;
 }