1129

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

@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -188,10 +189,12 @@ public class BizSupplierController extends BaseController {
         //更新外协结算数据
         if(!data.isEmpty()) {
             Long productId = data.get(0).getProductId();
+            Long supplierId = data.get(0).getSupplierId();
             List<Long> technologicalProcessIds = data.stream().map(BizSupplierProductProcess::getTechnologicalProcessId).collect(Collectors.toList());
             //对应产品的工序
             List<BizOutsourceBalanceAccount> list = iBizOutsourceBalanceAccountService.query()
                     .eq("product_id", productId).in("technological_process_id", technologicalProcessIds)
+                    .eq("supplier_id", supplierId)
                     .eq("status",0)
                     .list();
             List<BizOutsourceBalanceAccount> totalList = new ArrayList<>();

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

@@ -64,10 +64,11 @@ public class BizTechnologicalProcessDetailController extends BaseController
     @PostMapping("/getProcessesForSupplier")
     public AjaxResult getProcessesForSupplier(@RequestBody Map<String, Object> data) {
         Long productId = Long.parseLong(data.get("productId").toString());
+        Long supplierId = Long.parseLong(data.get("supplierId").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<BizSupplierProductProcess> processList = bizSupplierProductProcessService.query().eq("product_id", productId).eq("supplier_id", supplierId).eq("technology_version", technologyVersion).list();
 
         List<BizTechnologicalProcessDetail> list = bizTechnologicalProcessDetailService.query()
                 .eq("product_id", productId)