Merge remote-tracking branch 'origin/dev' into test

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/PrchOrdDtlController.java

@@ -46,14 +46,14 @@ public class PrchOrdDtlController implements BusinessControllerMarker {
 
     @PostMapping("/create")
     @Operation(summary = "创建采购订单明细")
-    @PreAuthorize("@ss.hasPermission('base:prch-ord-dtl:create')")
+    @PreAuthorize("@ss.hasAnyPermissions('base:prch-ord-dtl:create','purchase:order:list:OrderList:add')")
     public CommonResult<PrchOrdDtlRespVO> createPrchOrdDtl(@Valid @RequestBody PrchOrdDtlSaveReqVO createReqVO) {
         return success(prchOrdDtlService.createPrchOrdDtl(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新采购订单明细")
-    @PreAuthorize("@ss.hasPermission('base:prch-ord-dtl:update')")
+    @PreAuthorize("@ss.hasAnyPermissions('base:prch-ord-dtl:update','purchase:order:list:OrderList:edit')")
     public CommonResult<Boolean> updatePrchOrdDtl(@Valid @RequestBody PrchOrdDtlSaveReqVO updateReqVO) {
         prchOrdDtlService.updatePrchOrdDtl(updateReqVO);
         return success(true);
@@ -62,7 +62,7 @@ public class PrchOrdDtlController implements BusinessControllerMarker {
     @DeleteMapping("/delete")
     @Operation(summary = "删除采购订单明细")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('base:prch-ord-dtl:delete')")
+    @PreAuthorize("@ss.hasAnyPermissions('base:prch-ord-dtl:delete','purchase:order:list:OrderList:delete')")
     public CommonResult<Boolean> deletePrchOrdDtl(@RequestParam("id") Long id) {
         prchOrdDtlService.deletePrchOrdDtl(id);
         return success(true);
@@ -71,7 +71,7 @@ public class PrchOrdDtlController implements BusinessControllerMarker {
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除采购订单明细")
-                @PreAuthorize("@ss.hasPermission('base:prch-ord-dtl:delete')")
+    @PreAuthorize("@ss.hasAnyPermissions('base:prch-ord-dtl:delete','purchase:order:list:OrderList:delete')")
     public CommonResult<Boolean> deletePrchOrdDtlList(@RequestBody BatchDeleteReqVO req) {
         prchOrdDtlService.deletePrchOrdDtlListByIds(req.getIds());
         return success(true);
@@ -80,7 +80,7 @@ public class PrchOrdDtlController implements BusinessControllerMarker {
     @GetMapping("/get")
     @Operation(summary = "获得采购订单明细")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('base:prch-ord-dtl:query')")
+    @PreAuthorize("@ss.hasAnyPermissions('base:prch-ord-dtl:query','purchase:order:list:OrderList:query')")
     public CommonResult<PrchOrdDtlRespVO> getPrchOrdDtl(@RequestParam("id") Long id) {
         PrchOrdDtlDO prchOrdDtl = prchOrdDtlService.getPrchOrdDtl(id);
         return success(BeanUtils.toBean(prchOrdDtl, PrchOrdDtlRespVO.class));
@@ -88,7 +88,7 @@ public class PrchOrdDtlController implements BusinessControllerMarker {
 
     @GetMapping("/page")
     @Operation(summary = "获得采购订单明细分页")
-    @PreAuthorize("@ss.hasPermission('base:prch-ord-dtl:query')")
+    @PreAuthorize("@ss.hasAnyPermissions('base:prch-ord-dtl:query','purchase:order:list:OrderList:query')")
     public CommonResult<PageResult<PrchOrdDtlRespVO>> getPrchOrdDtlPage(@Valid PrchOrdDtlPageReqVO pageReqVO) {
         PageResult<PrchOrdDtlDO> pageResult = prchOrdDtlService.getPrchOrdDtlPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, PrchOrdDtlRespVO.class));
@@ -96,7 +96,7 @@ public class PrchOrdDtlController implements BusinessControllerMarker {
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出采购订单明细 Excel")
-    @PreAuthorize("@ss.hasPermission('base:prch-ord-dtl:export')")
+    @PreAuthorize("@ss.hasAnyPermissions('base:prch-ord-dtl:export','purchase:order:list:OrderList:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportPrchOrdDtlExcel(@Valid PrchOrdDtlPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/SalesOrderDetailController.java

@@ -47,21 +47,21 @@ public class SalesOrderDetailController implements BusinessControllerMarker {
 
     @PostMapping("/create")
     @Operation(summary = "创建销售订单明细")
-    @PreAuthorize("@ss.hasPermission('base:sales-order-detail:create')")
+    @PreAuthorize("@ss.hasAnyPermissions('base:sales-order-detail:create','sale:order:list:OrderList:add')")
     public CommonResult<SalesOrderDetailRespVO> createSalesOrderDetail(@Valid @RequestBody SalesOrderDetailSaveReqVO createReqVO) {
         return success(salesOrderDetailService.createSalesOrderDetail(createReqVO));
     }
 
     @PostMapping("/create-batch")
     @Operation(summary = "批量创建销售订单明细")
-    @PreAuthorize("@ss.hasPermission('base:sales-order-detail:create')")
+    @PreAuthorize("@ss.hasAnyPermissions('base:sales-order-detail:create','sale:order:list:OrderList:add')")
     public CommonResult<List<SalesOrderDetailRespVO>> createSalesOrderDetail(@Valid @NotEmpty(message = "需要保存的数据为空") @RequestBody List<SalesOrderDetailSaveReqVO> createReqVOS) {
         return success(salesOrderDetailService.createSalesOrderDetail(createReqVOS));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新销售订单明细")
-    @PreAuthorize("@ss.hasPermission('base:sales-order-detail:update')")
+    @PreAuthorize("@ss.hasAnyPermissions('base:sales-order-detail:update','sale:order:list:OrderList:edit')")
     public CommonResult<Boolean> updateSalesOrderDetail(@Valid @RequestBody SalesOrderDetailSaveReqVO updateReqVO) {
         salesOrderDetailService.updateSalesOrderDetail(updateReqVO);
         return success(true);
@@ -70,7 +70,7 @@ public class SalesOrderDetailController implements BusinessControllerMarker {
     @DeleteMapping("/delete")
     @Operation(summary = "删除销售订单明细")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('base:sales-order-detail:delete')")
+    @PreAuthorize("@ss.hasAnyPermissions('base:sales-order-detail:delete','sale:order:list:OrderList:delete')")
     public CommonResult<Boolean> deleteSalesOrderDetail(@RequestParam("id") Long id) {
         salesOrderDetailService.deleteSalesOrderDetail(id);
         return success(true);
@@ -79,7 +79,7 @@ public class SalesOrderDetailController implements BusinessControllerMarker {
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除销售订单明细")
-                @PreAuthorize("@ss.hasPermission('base:sales-order-detail:delete')")
+    @PreAuthorize("@ss.hasAnyPermissions('base:sales-order-detail:delete','sale:order:list:OrderList:delete')")
     public CommonResult<Boolean> deleteSalesOrderDetailList(@RequestBody BatchDeleteReqVO req) {
         salesOrderDetailService.deleteSalesOrderDetailListByIds(req.getIds());
         return success(true);
@@ -88,7 +88,7 @@ public class SalesOrderDetailController implements BusinessControllerMarker {
     @GetMapping("/get")
     @Operation(summary = "获得销售订单明细")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('base:sales-order-detail:query')")
+    @PreAuthorize("@ss.hasAnyPermissions('base:sales-order-detail:query','sale:order:list:OrderList:query')")
     public CommonResult<SalesOrderDetailRespVO> getSalesOrderDetail(@RequestParam("id") Long id) {
         SalesOrderDetailDO salesOrderDetail = salesOrderDetailService.getSalesOrderDetail(id);
         return success(BeanUtils.toBean(salesOrderDetail, SalesOrderDetailRespVO.class));
@@ -96,7 +96,7 @@ public class SalesOrderDetailController implements BusinessControllerMarker {
 
     @GetMapping("/page")
     @Operation(summary = "获得销售订单明细分页")
-    @PreAuthorize("@ss.hasPermission('base:sales-order-detail:query')")
+    @PreAuthorize("@ss.hasAnyPermissions('base:sales-order-detail:query','sale:order:list:OrderList:query')")
     public CommonResult<PageResult<SalesOrderDetailRespVO>> getSalesOrderDetailPage(@Valid SalesOrderDetailPageReqVO pageReqVO) {
         PageResult<SalesOrderDetailDO> pageResult = salesOrderDetailService.getSalesOrderDetailPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, SalesOrderDetailRespVO.class));
@@ -104,7 +104,7 @@ public class SalesOrderDetailController implements BusinessControllerMarker {
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出销售订单明细 Excel")
-    @PreAuthorize("@ss.hasPermission('base:sales-order-detail:export')")
+    @PreAuthorize("@ss.hasAnyPermissions('base:sales-order-detail:export','sale:order:list:OrderList:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportSalesOrderDetailExcel(@Valid SalesOrderDetailPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
@@ -118,7 +118,7 @@ public class SalesOrderDetailController implements BusinessControllerMarker {
     //通过销售订单主键获取销售订单明细
     @GetMapping("/get-by-order-id")
     @Operation(summary = "通过销售订单主键获取销售订单明细")
-    @PreAuthorize("@ss.hasPermission('base:sales-order-detail:query')")
+    @PreAuthorize("@ss.hasAnyPermissions('base:sales-order-detail:query','sale:order:list:OrderList:query')")
     public CommonResult<List<SalesOrderDetailRespVO>> getSalesOrderDetailByOrderId(@RequestParam("orderId") String orderId) {
 
         return success(salesOrderDetailService.getSalesOrderDetailByOrderId(Long.valueOf(orderId)));

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

@@ -1,12 +1,14 @@
 package com.zt.plat.module.erp.controller.admin.erp;
 
 import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
+import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.pojo.PageParam;
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
 import com.zt.plat.framework.common.util.object.BeanUtils;
 import com.zt.plat.framework.excel.core.util.ExcelUtils;
+import com.zt.plat.module.base.api.departmentmaterial.dto.DepartmentMaterialPageReqDTO;
 import com.zt.plat.module.base.api.materialinfomation.dto.MaterialInfomationPageReqDTO;
 import com.zt.plat.module.erp.controller.admin.erp.vo.*;
 import com.zt.plat.module.erp.dal.dataobject.erp.ErpMaterialDO;
@@ -31,7 +33,7 @@ import static com.zt.plat.framework.common.pojo.CommonResult.success;
 @RestController
 @RequestMapping("/base/erp-material")
 @Validated
-public class ErpMaterialController {
+public class ErpMaterialController implements BusinessControllerMarker {
 
 
     @Resource
@@ -147,7 +149,7 @@ public class ErpMaterialController {
     @Operation(summary = "通过主物料查询子物料信息")
     @PreAuthorize("@ss.hasAnyPermissions({'sply:erp-material:query','basic:material-config:query'})")
     public CommonResult<List<ErpMaterialRespVO>> getErpMaterialByMainMaterial(@RequestParam("id") Long mainMaterialId) {
-        List<ErpMaterialDO> erpMaterial = erpMaterialService.getErpMaterialByMainMaterial(mainMaterialId);
+        List<ErpMaterialRespVO> erpMaterial = erpMaterialService.getErpMaterialByMainMaterial(mainMaterialId);
         return success(BeanUtils.toBean(erpMaterial, ErpMaterialRespVO.class));
     }
 
@@ -156,11 +158,12 @@ public class ErpMaterialController {
     @Operation(summary = "通过接口查询物料")
     @PreAuthorize("@ss.hasAnyPermissions({'sply:erp-material:query','basic:material-config:query'})")
     public CommonResult<PageResult<ErpMaterialRespVO>> getErpMaterialByApi(@RequestBody MaterialInfomationApiVO vo) {
-        MaterialInfomationPageReqDTO  material = new MaterialInfomationPageReqDTO();
+        DepartmentMaterialPageReqDTO material = new DepartmentMaterialPageReqDTO();
-        material.setCode(vo.getMaterialNumber());
+        material.setMaterialNumber(vo.getMaterialNumber());
-        material.setName(vo.getMaterialName());
+        material.setMaterialName(vo.getMaterialName());
         material.setPageSize(vo.getPageSize());
         material.setPageNo(vo.getPageNo());
+        material.setDeptId(Long.valueOf(vo.getDeptId()));
         PageResult<ErpMaterialDO> erpMaterialByApi = erpMaterialService.getErpMaterialByApi(material);
         return success(BeanUtils.toBean(erpMaterialByApi, ErpMaterialRespVO.class));
     }
@@ -168,16 +171,15 @@ public class ErpMaterialController {
     @GetMapping("/erpMaterial-mainMaterial-code")
     @Operation(summary = "通过主物料编号查询子物料信息")
     @PreAuthorize("@ss.hasAnyPermissions({'sply:erp-material:query','basic:material-config:query'})")
-    public CommonResult<ErpMaterialRespVO> getErpMaterialByMainMaterialByCode(@RequestParam("materialNumber") String code) {
+    public CommonResult<List<ErpMaterialRespVO>> getErpMaterialByMainMaterialByCode(@RequestParam("materialNumber") String code,@RequestParam(value = "deptId",required = false) String deptId) {
-        return success(BeanUtils.toBean(erpMaterialService.getErpMaterialByMainMaterialByCode(code), ErpMaterialRespVO.class));
+        return success(BeanUtils.toBean(erpMaterialService.getErpMaterialByMainMaterialByCode(code,deptId), ErpMaterialRespVO.class));
     }
 
     //查询物料
     @GetMapping("/api-erp-material-code")
     @Operation(summary = "通过编号接口查询物料")
     @PreAuthorize("@ss.hasAnyPermissions({'sply:erp-material:query','basic:material-config:query'})")
-    public CommonResult<List<ErpMaterialRespVO>> getErpMaterialByApiByCode(@RequestParam("materialNumber")String code) {
+    public CommonResult<List<ErpMaterialRespVO>> getErpMaterialByApiByCode(@RequestParam("materialNumber")String code,@RequestParam(value = "deptId",required = false) String deptId) {
-
+        return success(BeanUtils.toBean(erpMaterialService.getErpMaterialByApiByCode(code,deptId), ErpMaterialRespVO.class));
-        return success(BeanUtils.toBean(erpMaterialService.getErpMaterialByApiByCode(code), ErpMaterialRespVO.class));
     }
 }

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

@@ -13,6 +13,8 @@ import java.util.List;
 @Data
 @ExcelIgnoreUnannotated
 public class ErpMaterialRespVO {
+    @Schema(description = "关联表主键，删除需要使用这个", requiredMode = Schema.RequiredMode.REQUIRED, example = "2038")
+    private Long corrId;
 
     @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "2038")
     @ExcelProperty("主键")

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

@@ -1,5 +1,6 @@
 package com.zt.plat.module.erp.controller.admin.erp.vo;
 
+import com.zt.plat.module.base.api.departmentmaterial.dto.DepartmentMaterialRespDTO;
 import com.zt.plat.module.base.api.materialinfomation.dto.MaterialInfomationRespDTO;
 import lombok.Getter;
 
@@ -78,7 +79,7 @@ public class MaterialAttributeUtils {
     }
 
     /**
-     * 物料属性封装Record（Java 16+）
+     * 物料属性封装Record
      * 包含所有属性的安全取值
      */
     public record MaterialAttribute(
@@ -117,7 +118,7 @@ public class MaterialAttributeUtils {
      * @param dto 物料信息DTO
      * @return 封装后的物料属性Record
      */
-    public static MaterialAttribute safeExtractAllAttributes(MaterialInfomationRespDTO dto) {
+    public static MaterialAttribute safeExtractAllAttributes(DepartmentMaterialRespDTO dto) {
         // 1. 空值校验
         if (dto == null || dto.getFlatAttributes() == null) {
             return MaterialAttribute.empty();

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

@@ -16,5 +16,7 @@ public interface ErpErpMaterialCorrService {
     List<ErpMaterialCorrRspVO>  create(@Valid ErpMaterialCorrSaveReqVO reqVO);
     void deleteBatch(BatchDeleteReqVO reqVO);
 
-    List<ErpMaterialCorrRspVO> getErpMaterialByMainMaterial(Long mainMaterialId);
+    List<ErpMaterialCorrRspVO> getErpMaterialByMainMaterial(List<Long> mainMaterialIds);
+
+    List<ErpMaterialCorrRspVO> getErpMaterialByMainMaterialByCode(String code);
 }

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

@@ -40,7 +40,12 @@ public class ErpErpMaterialCorrServiceImpl implements ErpErpMaterialCorrService{
     }
 
     @Override
-    public List<ErpMaterialCorrRspVO> getErpMaterialByMainMaterial(Long mainMaterialId) {
+    public List<ErpMaterialCorrRspVO> getErpMaterialByMainMaterial(List<Long> mainMaterialIds) {
-        return BeanUtils.toBean( erpErpMaterialCorrMapper.selectList(ErpMaterialCorrDO::getMaterialParentId, mainMaterialId), ErpMaterialCorrRspVO.class);
+        return BeanUtils.toBean( erpErpMaterialCorrMapper.selectList(ErpMaterialCorrDO::getMaterialParentId, mainMaterialIds), ErpMaterialCorrRspVO.class);
+    }
+
+    @Override
+    public List<ErpMaterialCorrRspVO> getErpMaterialByMainMaterialByCode(String code) {
+        return BeanUtils.toBean(erpErpMaterialCorrMapper.selectList(ErpMaterialCorrDO::getMaterialParentCode, code), ErpMaterialCorrRspVO.class);
     }
 }

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

@@ -2,6 +2,7 @@ package com.zt.plat.module.erp.service.erp;
 
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
+import com.zt.plat.module.base.api.departmentmaterial.dto.DepartmentMaterialPageReqDTO;
 import com.zt.plat.module.base.api.materialinfomation.dto.MaterialInfomationPageReqDTO;
 import com.zt.plat.module.erp.api.dto.ErpMaterialDTO;
 import com.zt.plat.module.erp.controller.admin.erp.vo.ErpMaterialCorrSaveReqVO;
@@ -77,11 +78,11 @@ public interface ErpMaterialService {
 
     ErpMaterialDO getErpMaterialById(Long id);
 
-    List<ErpMaterialDO> getErpMaterialByMainMaterial(Long mainMaterialId);
+    List<ErpMaterialRespVO> getErpMaterialByMainMaterial(Long mainMaterialId);
 
-    PageResult<ErpMaterialDO>  getErpMaterialByApi( MaterialInfomationPageReqDTO material);
+    PageResult<ErpMaterialDO>  getErpMaterialByApi( DepartmentMaterialPageReqDTO material);
 
-    ErpMaterialDO getErpMaterialByMainMaterialByCode(String code);
+    List<ErpMaterialDO> getErpMaterialByMainMaterialByCode(String code,String deptId);
 
-    List <ErpMaterialDO>getErpMaterialByApiByCode(String code);
+    List <ErpMaterialDO>getErpMaterialByApiByCode(String code,String deptId);
 }