Эх сурвалжийг харах

Merge remote-tracking branch 'origin/master'

wangxin 1 жил өмнө
parent
commit
48296576fa

+ 4 - 4
src/main/java/cn/ezhizao/project/business/controller/Mrp10201Controller.java

@@ -142,7 +142,7 @@ public class Mrp10201Controller extends BaseController {
 
 
 
 
                     // 根据领料部门编码,获取新系统中的部门id
                     // 根据领料部门编码,获取新系统中的部门id
-                    if(sysDepts.size()>0) {
+                    if(!sysDepts.isEmpty()) {
                         newPlanDetail.setRequisitionDepartmentId(sysDepts.get(0).getDeptId());
                         newPlanDetail.setRequisitionDepartmentId(sysDepts.get(0).getDeptId());
                         newPlanDetail.setRequisitionDepartmentCode(sysDepts.get(0).getDeptCode());
                         newPlanDetail.setRequisitionDepartmentCode(sysDepts.get(0).getDeptCode());
                     }
                     }
@@ -153,7 +153,7 @@ public class Mrp10201Controller extends BaseController {
                     newPlanDetail.setCompanyCode(mrp10201.getCust());
                     newPlanDetail.setCompanyCode(mrp10201.getCust());
                     // 根据客户编码,获取新系统中的客户id【需要进一步实现】
                     // 根据客户编码,获取新系统中的客户id【需要进一步实现】
                     List<BizCompany> companyCode = companyService.query().eq("company_code", newPlanDetail.getCompanyCode()).list();
                     List<BizCompany> companyCode = companyService.query().eq("company_code", newPlanDetail.getCompanyCode()).list();
-                    if (companyCode.size()>0){
+                    if (!companyCode.isEmpty()){
                         newPlanDetail.setCompanyId(companyCode.get(0).getId());
                         newPlanDetail.setCompanyId(companyCode.get(0).getId());
                     }
                     }
 
 
@@ -162,13 +162,13 @@ public class Mrp10201Controller extends BaseController {
                     newPlanDetail.setProductCode(mrp10201.getCpart());
                     newPlanDetail.setProductCode(mrp10201.getCpart());
                     List<BizProduct> productCode = productService.query().eq("product_code", newPlanDetail.getProductCode()).list();
                     List<BizProduct> productCode = productService.query().eq("product_code", newPlanDetail.getProductCode()).list();
                     // 根据商品编码,获取新系统中的商品id
                     // 根据商品编码,获取新系统中的商品id
-                    if (productCode.size()>0){
+                    if (!productCode.isEmpty()){
                         newPlanDetail.setProductId(productCode.get(0).getId());
                         newPlanDetail.setProductId(productCode.get(0).getId());
                     }
                     }
                     //根据商品版本获取工艺
                     //根据商品版本获取工艺
                     newPlanDetail.setTechnologyVersion(mrp10201.getPrver());
                     newPlanDetail.setTechnologyVersion(mrp10201.getPrver());
                     List<BizTechnologicalProcess> technologicalProcessList = technologicalProcessService.query().eq("product_id", newPlanDetail.getProductId()).eq("technology_version", newPlanDetail.getTechnologyVersion()).list();
                     List<BizTechnologicalProcess> technologicalProcessList = technologicalProcessService.query().eq("product_id", newPlanDetail.getProductId()).eq("technology_version", newPlanDetail.getTechnologyVersion()).list();
-                    if (technologicalProcessList.size()>0){
+                    if (!technologicalProcessList.isEmpty()){
                         newPlanDetail.setTechnologicalProcessId(technologicalProcessList.get(0).getId());
                         newPlanDetail.setTechnologicalProcessId(technologicalProcessList.get(0).getId());
                     }
                     }
                     // 图号
                     // 图号