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

zhanghl

2025-05-20 fa1a70790ff7fd4df4ab114f56bee9476128152e

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

 aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsMaterialProductGroupManagementController.java

@@ -37,7 +37,7 @@
     * 查询物料产品组数据管理列表
     */
    @Operation(summary = "查询物料产品组数据管理列表", description = "分页查询")
//    @RequiresPermissions("materialProductGroup:management:list")
    @RequiresPermissions("materialProductGroup:management:list")
    @GetMapping("/list")
    public TableDataInfo list(ApsMaterialProductGroupManagement apsGasPipelineMo)
    {
@@ -47,9 +47,9 @@
    }


    @Operation(summary = "导入手工气体预测数据", description = "批量导入")
    @Log(title = "导入手工气体预测数据", businessType = BusinessType.IMPORT)
//    @RequiresPermissions("materialProductGroup:mo:import")
    @Operation(summary = "导入产品组数据", description = "批量导入")
    @Log(title = "导入产品组数据", businessType = BusinessType.IMPORT)
    @RequiresPermissions("materialProductGroup:management:import")
    @PostMapping("/importData")
    public AjaxResult importData(MultipartFile file) throws Exception {

@@ -60,7 +60,7 @@
     * 导出物料产品组数据管理列表
     */
    @Operation(summary = "导出物料产品组数据管理列表", description = "导出")
//    @RequiresPermissions("materialProductGroup:management:export")
    @RequiresPermissions("materialProductGroup:management:export")
    @Log(title = "物料产品组数据管理", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ApsMaterialProductGroupManagement apsMaterialProductGroupManagement)
@@ -85,7 +85,7 @@
     * 新增物料产品组数据管理
     */
    @Operation(summary = "新增物料产品组数据管理", description = "单个新增")
//    @RequiresPermissions("materialProductGroup:management:add")
    @RequiresPermissions("materialProductGroup:management:add")
    @Log(title = "物料产品组数据管理", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody ApsMaterialProductGroupManagement apsMaterialProductGroupManagement)
@@ -97,8 +97,8 @@
     * 修改物料产品组数据管理
     */
    @Operation(summary = "修改物料产品组数据管理", description = "单个修改")
//    @RequiresPermissions("materialProductGroup:management:edit")
    @Log(title = "物料产品组数据管理", businessType = BusinessType.UPDATE)
    @RequiresPermissions("materialProductGroup:management:edit")
    @Log(title = "修改物料产品组数据管理", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody ApsMaterialProductGroupManagement apsMaterialProductGroupManagement)
    {
@@ -109,7 +109,7 @@
     * 删除物料产品组数据管理
     */
    @Operation(summary = "删除物料产品组数据管理", description = "批量删除")
//    @RequiresPermissions("materialProductGroup:management:remove")
    @RequiresPermissions("materialProductGroup:management:remove")
    @Log(title = "物料产品组数据管理", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)

 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelineMoServiceImpl.java

@@ -118,6 +118,9 @@
            /*数据列从1开始*/
            for (int i = 1; i <= rows; i++) {
                Row row = sheet.getRow(i);
                if (row.getCell(0) == null){
                    continue;
                }
                String mo = row.getCell(0).getStringCellValue();
                if (StringUtils.isEmpty(mo)){
                    continue;

 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelinePredictionServiceImpl.java

@@ -121,6 +121,10 @@
            /*数据列从1开始*/
            for (int i = 1; i <= rows; i++) {
                Row row = sheet.getRow(i);
                if (row.getCell(0) == null){
                    continue;
                }

                String materialCode = row.getCell(0).getStringCellValue();
                if (StringUtils.isEmpty(materialCode)){
                    continue;

 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsMaterialProductGroupManagementServiceImpl.java

@@ -122,6 +122,9 @@
            /*数据列从1开始*/
            for (int i = 1; i <= rows; i++) {
                Row row = sheet.getRow(i);
                if (row.getCell(0) == null) {
                    continue;
                }
                String materialCode = row.getCell(0).getStringCellValue();
                if (StringUtils.isEmpty(materialCode)){
                    continue;