1120

src/main/java/cn/ezhizao/project/business/supplier/controller/BizSupplierController.java

@@ -172,7 +172,7 @@ public class BizSupplierController extends BaseController {
      * @return AjaxResult
      */
     @PostMapping("/getSupplierProductProcess")
-    public AjaxResult getSupplierProductProcess(@RequestBody Map<String, Object> data) {
+    public AjaxResult getSupplierProductProcess(@RequestBody BizSupplierProductProcess data) {
         List<BizSupplierProductProcess> list = iBizSupplierProductProcessService.getList(data);
         return success(list);
     }

src/main/java/cn/ezhizao/project/business/supplier/domain/BizSupplierProductProcess.java

@@ -72,4 +72,5 @@ public class BizSupplierProductProcess extends BaseEntity {
     private String remark;
     private String processCode;
     private Long supplierProductId;
+    private String processStepNumber;
 }

src/main/java/cn/ezhizao/project/business/supplier/mapper/BizSupplierProductProcessMapper.java

@@ -22,5 +22,5 @@ public interface BizSupplierProductProcessMapper extends BaseMapper<BizSupplierP
      */
     public int physicalDelete(BizSupplierProductProcess bizSupplierProductProcess);
 
-    public List<BizSupplierProductProcess> getList(Map<String, Object> data);
+    public List<BizSupplierProductProcess> getList(BizSupplierProductProcess bizSupplierProductProcess);
 }

src/main/java/cn/ezhizao/project/business/supplier/service/IBizSupplierProductProcessService.java

@@ -22,5 +22,5 @@ public interface IBizSupplierProductProcessService extends IService<BizSupplierP
      */
     int physicalDelete(BizSupplierProductProcess bizSupplierProductProcess);
 
-    public List<BizSupplierProductProcess> getList(Map<String, Object> data);
+    public List<BizSupplierProductProcess> getList(BizSupplierProductProcess bizSupplierProductProcess);
 }

src/main/java/cn/ezhizao/project/business/supplier/service/impl/BizSupplierProductProcessServiceImpl.java

@@ -33,7 +33,7 @@ public class BizSupplierProductProcessServiceImpl extends ServiceImpl<BizSupplie
     }
 
     @Override
-    public List<BizSupplierProductProcess> getList(Map<String, Object> data) {
-        return bizSupplierProductProcessMapper.getList(data);
+    public List<BizSupplierProductProcess> getList(BizSupplierProductProcess bizSupplierProductProcess) {
+        return bizSupplierProductProcessMapper.getList(bizSupplierProductProcess);
     }
 }

src/main/java/cn/ezhizao/project/business/technologicalProcessDetail/controller/BizTechnologicalProcessDetailController.java

@@ -6,6 +6,8 @@ import cn.ezhizao.framework.aspectj.lang.enums.BusinessType;
 import cn.ezhizao.framework.web.controller.BaseController;
 import cn.ezhizao.framework.web.domain.AjaxResult;
 import cn.ezhizao.framework.web.page.TableDataInfo;
+import cn.ezhizao.project.business.supplier.domain.BizSupplierProductProcess;
+import cn.ezhizao.project.business.supplier.service.IBizSupplierProductProcessService;
 import cn.ezhizao.project.business.technologicalProcess.domain.BizTechnologicalProcess;
 import cn.ezhizao.project.business.technologicalProcessDetail.domain.BizTechnologicalProcessDetail;
 import cn.ezhizao.project.business.technologicalProcessDetail.service.IBizTechnologicalProcessDetailService;
@@ -16,6 +18,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 
 /**
@@ -30,6 +33,8 @@ public class BizTechnologicalProcessDetailController extends BaseController
 {
     @Resource
     private IBizTechnologicalProcessDetailService bizTechnologicalProcessDetailService;
+    @Resource
+    private IBizSupplierProductProcessService bizSupplierProductProcessService;
     /**
      * 查询工艺工序中间表列表
      */
@@ -61,12 +66,18 @@ public class BizTechnologicalProcessDetailController extends BaseController
         Long productId = Long.parseLong(data.get("productId").toString());
         String technologyVersion = data.get("technologyVersion").toString();
         String processAlias = data.get("processAlias").toString();
+        //查询已经添加进来的，则不显示
+        List<BizSupplierProductProcess> processList = bizSupplierProductProcessService.query().eq("product_id", productId).eq("technology_version", technologyVersion).list();
 
         List<BizTechnologicalProcessDetail> list = bizTechnologicalProcessDetailService.query()
                 .eq("product_id", productId)
                 .eq("technology_version", technologyVersion)
                 .like("process_alias", processAlias)
                 .list();
+        if(!processList.isEmpty()){
+            List<String> processStepNumberList = processList.stream().map(BizSupplierProductProcess::getProcessStepNumber).collect(Collectors.toList());
+            list = list.stream().filter(v-> !processStepNumberList.contains(v.getProcessStepNumber())).collect(Collectors.toList());
+        }
 
         return success(list);
     }