金属元素缩新增分页查询，生产订单erp分页查询

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/ElementController.java

@@ -88,6 +88,14 @@ public class ElementController {
         return success(BeanUtils.toBean(pageResult, ElementRespVO.class));
     }
 
+    @GetMapping("/pageByEnable")
+    @Operation(summary = "获得启用的金属元素分页")
+    @PreAuthorize("@ss.hasPermission('base:element:query')")
+    public CommonResult<PageResult<ElementRespVO>> getElementPageByEnable(@Valid ElementPageReqVO pageReqVO) {
+        PageResult<ElementDO> pageResult = elementService.getElementPageByEnable(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, ElementRespVO.class));
+    }
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出金属元素 Excel")
     @PreAuthorize("@ss.hasPermission('base:element:export')")

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/ElementMapper.java

@@ -23,6 +23,7 @@ public interface ElementMapper extends BaseMapperX<ElementDO> {
                 .likeIfPresent(ElementDO::getAbbreviation, reqVO.getAbbreviation())
                 .likeIfPresent(ElementDO::getName, reqVO.getName())
                 .eqIfPresent(ElementDO::getDecimalValue, reqVO.getDecimalValue())
+                .eqIfPresent(ElementDO::getIsEnable, reqVO.getIsEnable())
                 .likeIfPresent(ElementDO::getCoding, reqVO.getCoding())
                 .eqIfPresent(ElementDO::getGradeUnit, reqVO.getGradeUnit())
                 .betweenIfPresent(ElementDO::getCreateTime, reqVO.getCreateTime())

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ElementService.java

@@ -65,4 +65,6 @@ public interface ElementService {
     void enableElementList(List<ElementRespVO> saveReqVOS);
 
     List<ElementDO> getElementNoPage();
+
+    PageResult<ElementDO> getElementPageByEnable(ElementPageReqVO pageReqVO);
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ElementServiceImpl.java

@@ -124,4 +124,12 @@ public class ElementServiceImpl implements ElementService {
         return elementMapper.getElementNoPage();
     }
 
+    @Override
+    public PageResult<ElementDO> getElementPageByEnable(ElementPageReqVO pageReqVO) {
+        if (pageReqVO!=null&&pageReqVO.getIsEnable()==null){
+            pageReqVO.setIsEnable("1");
+        }
+        return elementMapper.selectPage(pageReqVO);
+    }
+
 }

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/ErpCompanyController.java

@@ -125,12 +125,4 @@ public class ErpCompanyController {
         return success(TEST);
     }
 
-    @PostMapping("/test2")
-    @Operation(summary = "获取base的金属元素")
-    @PreAuthorize("@ss.hasPermission('sply:erp-company:get')")
-    public CommonResult<String> test2() {
-        String TEST = erpCompanyService.test2();
-        return success(TEST);
-    }
-
 }

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpProductiveOrderPageReqVO.java

@@ -19,7 +19,7 @@ public class ErpProductiveOrderPageReqVO extends PageParam {
     private String companyNumber;
 
     @Schema(description = "工厂编码")
-    @NotEmpty(message = "公司编号不能为空")
+    @NotEmpty(message = "工厂编码不能为空")
     private String factoryNumber;
 
     @Schema(description = "工厂名称", example = "赵六")
@@ -30,12 +30,12 @@ public class ErpProductiveOrderPageReqVO extends PageParam {
 
     @Schema(description = "基本开始日期")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    @NotEmpty(message = "公司编号不能为空")
+    @NotEmpty(message = "基本开始日期不能为空")
     private LocalDateTime[] startDate;
 
     @Schema(description = "基本完成日期")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    @NotEmpty(message = "公司编号不能为空")
+    @NotEmpty(message = "基本完成日期不能为空")
     private LocalDateTime[] endDate;
 
     @Schema(description = "主产品物料编号")

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpCompanyService.java

@@ -74,6 +74,4 @@ public interface ErpCompanyService {
     void test();
 
     String test1();
-
-    String test2();
 }

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpCompanyServiceImpl.java

@@ -286,11 +286,4 @@ public class ErpCompanyServiceImpl implements ErpCompanyService {
             return url + requestEntity;
         }
     }
-
-    @Override
-    public String test2() {
-        ElementDTO respVO = new ElementDTO();
-        CommonResult<List<ElementDTO>> dtos = baseApi.getElementNoPage();
-        return dtos.toString();
-    }
 }