新增基础数据（小时费率、采购价、工序工时、物料BOM、版本号、部件缺失信息）相关接口

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/AppSceneCostCountController.java

@@ -102,20 +102,20 @@ public class AppSceneCostCountController extends JeecgController<AppSceneCostCou
         return Result.OK("删除成功!");
     }
 
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return
-     */
-    @AutoLog(value = "app_scene_cost_count-批量删除")
-    @ApiOperation(value = "app_scene_cost_count-批量删除", notes = "app_scene_cost_count-批量删除")
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_count:deleteBatch")
-    @DeleteMapping(value = "/deleteBatch")
-    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        this.appSceneCostCountService.removeByIds(Arrays.asList(ids.split(",")));
-        return Result.OK("批量删除成功!");
-    }
+//    /**
+//     * 批量删除
+//     *
+//     * @param ids
+//     * @return
+//     */
+//    @AutoLog(value = "app_scene_cost_count-批量删除")
+//    @ApiOperation(value = "app_scene_cost_count-批量删除", notes = "app_scene_cost_count-批量删除")
+//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_count:deleteBatch")
+//    @DeleteMapping(value = "/deleteBatch")
+//    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+//        this.appSceneCostCountService.removeByIds(Arrays.asList(ids.split(",")));
+//        return Result.OK("批量删除成功!");
+//    }
 
     /**
      * 重新计算

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/AppSceneCostHourRateController.java

@@ -0,0 +1,162 @@
+package com.zzsmart.qomo.kn.cost.manage.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zzsmart.qomo.kn.cost.manage.entity.AppSceneCostHourRate;
+import com.zzsmart.qomo.kn.cost.manage.service.IAppSceneCostHourRateService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+
+/**
+ * @Description: app_scene_cost_hour_rate
+ * @Author: jeecg-boot
+ * @Date: 2024-08-02
+ * @Version: V1.0
+ */
+@Api(tags="cost-小时费率")
+@RestController
+@RequestMapping("//hourRate")
+@Slf4j
+public class AppSceneCostHourRateController extends JeecgController<AppSceneCostHourRate, IAppSceneCostHourRateService> {
+    @Autowired
+    private IAppSceneCostHourRateService appSceneCostHourRateService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param appSceneCostHourRate
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    //@AutoLog(value = "app_scene_cost_hour_rate-分页列表查询")
+    @ApiOperation(value = "app_scene_cost_hour_rate-分页列表查询", notes = "app_scene_cost_hour_rate-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<AppSceneCostHourRate>> queryPageList(AppSceneCostHourRate appSceneCostHourRate,
+                                                             @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                             HttpServletRequest req) {
+        QueryWrapper<AppSceneCostHourRate> queryWrapper = QueryGenerator.initQueryWrapper(appSceneCostHourRate, req.getParameterMap());
+        Page<AppSceneCostHourRate> page = new Page<AppSceneCostHourRate>(pageNo, pageSize);
+        IPage<AppSceneCostHourRate> pageList = appSceneCostHourRateService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    /**
+     * 添加
+     *
+     * @param appSceneCostHourRate
+     * @return
+     */
+    @AutoLog(value = "app_scene_cost_hour_rate-添加")
+    @ApiOperation(value = "app_scene_cost_hour_rate-添加", notes = "app_scene_cost_hour_rate-添加")
+    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_hour_rate:add")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody AppSceneCostHourRate appSceneCostHourRate) {
+        appSceneCostHourRateService.save(appSceneCostHourRate);
+        return Result.OK("添加成功！");
+    }
+
+    /**
+     * 编辑
+     *
+     * @param appSceneCostHourRate
+     * @return
+     */
+    @AutoLog(value = "app_scene_cost_hour_rate-编辑")
+    @ApiOperation(value = "app_scene_cost_hour_rate-编辑", notes = "app_scene_cost_hour_rate-编辑")
+    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_hour_rate:edit")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody AppSceneCostHourRate appSceneCostHourRate) {
+        appSceneCostHourRateService.updateById(appSceneCostHourRate);
+        return Result.OK("编辑成功!");
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "app_scene_cost_hour_rate-通过id删除")
+    @ApiOperation(value = "app_scene_cost_hour_rate-通过id删除", notes = "app_scene_cost_hour_rate-通过id删除")
+    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_hour_rate:delete")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        appSceneCostHourRateService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+//    /**
+//     * 批量删除
+//     *
+//     * @param ids
+//     * @return
+//     */
+//    @AutoLog(value = "app_scene_cost_hour_rate-批量删除")
+//    @ApiOperation(value = "app_scene_cost_hour_rate-批量删除", notes = "app_scene_cost_hour_rate-批量删除")
+//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_hour_rate:deleteBatch")
+//    @DeleteMapping(value = "/deleteBatch")
+//    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+//        this.appSceneCostHourRateService.removeByIds(Arrays.asList(ids.split(",")));
+//        return Result.OK("批量删除成功!");
+//    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    //@AutoLog(value = "app_scene_cost_hour_rate-通过id查询")
+    @ApiOperation(value = "app_scene_cost_hour_rate-通过id查询", notes = "app_scene_cost_hour_rate-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<AppSceneCostHourRate> queryById(@RequestParam(name = "id", required = true) String id) {
+        AppSceneCostHourRate appSceneCostHourRate = appSceneCostHourRateService.getById(id);
+        if (appSceneCostHourRate == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(appSceneCostHourRate);
+    }
+
+//    /**
+//     * 导出excel
+//     *
+//     * @param request
+//     * @param appSceneCostHourRate
+//     */
+//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_hour_rate:exportXls")
+//    @RequestMapping(value = "/exportXls")
+//    public ModelAndView exportXls(HttpServletRequest request, AppSceneCostHourRate appSceneCostHourRate) {
+//        return super.exportXls(request, appSceneCostHourRate, AppSceneCostHourRate.class, "app_scene_cost_hour_rate");
+//    }
+
+//    /**
+//     * 通过excel导入数据
+//     *
+//     * @param request
+//     * @param response
+//     * @return
+//     */
+//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_hour_rate:importExcel")
+//    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+//    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+//        return super.importExcel(request, response, AppSceneCostHourRate.class);
+//    }
+
+}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/AppSceneCostMaterialBomController.java

@@ -0,0 +1,190 @@
+package com.zzsmart.qomo.kn.cost.manage.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zzsmart.qomo.kn.cost.manage.entity.AppSceneCostMaterialBom;
+import com.zzsmart.qomo.kn.cost.manage.service.IAppSceneCostMaterialBomService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * @Description: app_scene_cost_material_bom
+ * @Author: jeecg-boot
+ * @Date: 2024-08-02
+ * @Version: V1.0
+ */
+@RequestMapping("//cost-material-bom")
+@Api(tags="cost-标准成本-bom信息")
+@RestController
+@Slf4j
+public class AppSceneCostMaterialBomController extends JeecgController<AppSceneCostMaterialBom, IAppSceneCostMaterialBomService> {
+    @Autowired
+    private IAppSceneCostMaterialBomService costMaterialBomService;
+    /**
+     * 分页列表查询
+     *
+     * @param costMaterialBom
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    //@AutoLog(value = "app_scene_cost_standard_version-分页列表查询")
+    @ApiOperation(value="物料bom分页列表查询", notes="物料bom分页列表查询")
+    @GetMapping(value = "/pageList")
+    public Result<IPage<AppSceneCostMaterialBom>> queryPageList(AppSceneCostMaterialBom costMaterialBom,
+                                                        @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                                        @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+                                                        HttpServletRequest req) {
+        QueryWrapper<AppSceneCostMaterialBom> queryWrapper = QueryGenerator.initQueryWrapper(costMaterialBom, req.getParameterMap());
+        Page<AppSceneCostMaterialBom> page = new Page<AppSceneCostMaterialBom>(pageNo, pageSize);
+        IPage<AppSceneCostMaterialBom> pageList = costMaterialBomService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+    /**
+     * 列表查询
+     *
+     * @return
+     */
+    @ApiOperation(value="物料bom列表查询", notes="物料bom列表查询")
+    @GetMapping(value = "/list")
+    public Result<List<AppSceneCostMaterialBom>> queryList(@RequestParam(name = "materialNumber",required = false) String materialNumber) {
+        List<AppSceneCostMaterialBom> list = costMaterialBomService.queryListResult(materialNumber);
+        return Result.OK(list);
+    }
+
+//    /**
+//     * 分页列表查询
+//     *
+//     * @param appSceneCostMaterialBom
+//     * @param pageNo
+//     * @param pageSize
+//     * @param req
+//     * @return
+//     */
+//    //@AutoLog(value = "app_scene_cost_material_bom-分页列表查询")
+//    @ApiOperation(value = "app_scene_cost_material_bom-分页列表查询", notes = "app_scene_cost_material_bom-分页列表查询")
+//    @GetMapping(value = "/list")
+//    public Result<IPage<AppSceneCostMaterialBom>> queryPageList(AppSceneCostMaterialBom appSceneCostMaterialBom,
+//                                                                @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+//                                                                @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+//                                                                HttpServletRequest req) {
+//        QueryWrapper<AppSceneCostMaterialBom> queryWrapper = QueryGenerator.initQueryWrapper(appSceneCostMaterialBom, req.getParameterMap());
+//        Page<AppSceneCostMaterialBom> page = new Page<AppSceneCostMaterialBom>(pageNo, pageSize);
+//        IPage<AppSceneCostMaterialBom> pageList = appSceneCostMaterialBomService.page(page, queryWrapper);
+//        return Result.OK(pageList);
+//    }
+//
+//    /**
+//     * 添加
+//     *
+//     * @param appSceneCostMaterialBom
+//     * @return
+//     */
+//    @AutoLog(value = "app_scene_cost_material_bom-添加")
+//    @ApiOperation(value = "app_scene_cost_material_bom-添加", notes = "app_scene_cost_material_bom-添加")
+//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_bom:add")
+//    @PostMapping(value = "/add")
+//    public Result<String> add(@RequestBody AppSceneCostMaterialBom appSceneCostMaterialBom) {
+//        appSceneCostMaterialBomService.save(appSceneCostMaterialBom);
+//        return Result.OK("添加成功！");
+//    }
+//
+//    /**
+//     * 编辑
+//     *
+//     * @param appSceneCostMaterialBom
+//     * @return
+//     */
+//    @AutoLog(value = "app_scene_cost_material_bom-编辑")
+//    @ApiOperation(value = "app_scene_cost_material_bom-编辑", notes = "app_scene_cost_material_bom-编辑")
+//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_bom:edit")
+//    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+//    public Result<String> edit(@RequestBody AppSceneCostMaterialBom appSceneCostMaterialBom) {
+//        appSceneCostMaterialBomService.updateById(appSceneCostMaterialBom);
+//        return Result.OK("编辑成功!");
+//    }
+//
+//    /**
+//     * 通过id删除
+//     *
+//     * @param id
+//     * @return
+//     */
+//    @AutoLog(value = "app_scene_cost_material_bom-通过id删除")
+//    @ApiOperation(value = "app_scene_cost_material_bom-通过id删除", notes = "app_scene_cost_material_bom-通过id删除")
+//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_bom:delete")
+//    @DeleteMapping(value = "/delete")
+//    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+//        appSceneCostMaterialBomService.removeById(id);
+//        return Result.OK("删除成功!");
+//    }
+//
+//    /**
+//     * 批量删除
+//     *
+//     * @param ids
+//     * @return
+//     */
+//    @AutoLog(value = "app_scene_cost_material_bom-批量删除")
+//    @ApiOperation(value = "app_scene_cost_material_bom-批量删除", notes = "app_scene_cost_material_bom-批量删除")
+//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_bom:deleteBatch")
+//    @DeleteMapping(value = "/deleteBatch")
+//    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+//        this.appSceneCostMaterialBomService.removeByIds(Arrays.asList(ids.split(",")));
+//        return Result.OK("批量删除成功!");
+//    }
+//
+//    /**
+//     * 通过id查询
+//     *
+//     * @param id
+//     * @return
+//     */
+//    //@AutoLog(value = "app_scene_cost_material_bom-通过id查询")
+//    @ApiOperation(value = "app_scene_cost_material_bom-通过id查询", notes = "app_scene_cost_material_bom-通过id查询")
+//    @GetMapping(value = "/queryById")
+//    public Result<AppSceneCostMaterialBom> queryById(@RequestParam(name = "id", required = true) String id) {
+//        AppSceneCostMaterialBom appSceneCostMaterialBom = appSceneCostMaterialBomService.getById(id);
+//        if (appSceneCostMaterialBom == null) {
+//            return Result.error("未找到对应数据");
+//        }
+//        return Result.OK(appSceneCostMaterialBom);
+//    }
+//
+//    /**
+//     * 导出excel
+//     *
+//     * @param request
+//     * @param appSceneCostMaterialBom
+//     */
+//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_bom:exportXls")
+//    @RequestMapping(value = "/exportXls")
+//    public ModelAndView exportXls(HttpServletRequest request, AppSceneCostMaterialBom appSceneCostMaterialBom) {
+//        return super.exportXls(request, appSceneCostMaterialBom, AppSceneCostMaterialBom.class, "app_scene_cost_material_bom");
+//    }
+//
+//    /**
+//     * 通过excel导入数据
+//     *
+//     * @param request
+//     * @param response
+//     * @return
+//     */
+//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_bom:importExcel")
+//    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+//    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+//        return super.importExcel(request, response, AppSceneCostMaterialBom.class);
+//    }
+
+}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/AppSceneCostMaterialProcessHoursController.java

@@ -0,0 +1,159 @@
+package com.zzsmart.qomo.kn.cost.manage.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zzsmart.qomo.kn.cost.manage.entity.AppSceneCostMaterialProcessHours;
+import com.zzsmart.qomo.kn.cost.manage.service.IAppSceneCostMaterialProcessHoursService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+
+/**
+ * @Description: app_scene_cost_material_process_hours
+ * @Author: jeecg-boot
+ * @Date: 2024-08-02
+ * @Version: V1.0
+ */
+@Api(tags = "cost-工序工时")
+@RestController
+@RequestMapping("//processHours")
+@Slf4j
+public class AppSceneCostMaterialProcessHoursController extends JeecgController<AppSceneCostMaterialProcessHours, IAppSceneCostMaterialProcessHoursService> {
+    @Autowired
+    private IAppSceneCostMaterialProcessHoursService appSceneCostMaterialProcessHoursService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param appSceneCostMaterialProcessHours
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    //@AutoLog(value = "app_scene_cost_material_process_hours-分页列表查询")
+    @ApiOperation(value = "app_scene_cost_material_process_hours-分页列表查询", notes = "app_scene_cost_material_process_hours-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<AppSceneCostMaterialProcessHours>> queryPageList(AppSceneCostMaterialProcessHours appSceneCostMaterialProcessHours, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+        QueryWrapper<AppSceneCostMaterialProcessHours> queryWrapper = QueryGenerator.initQueryWrapper(appSceneCostMaterialProcessHours, req.getParameterMap());
+        Page<AppSceneCostMaterialProcessHours> page = new Page<AppSceneCostMaterialProcessHours>(pageNo, pageSize);
+        IPage<AppSceneCostMaterialProcessHours> pageList = appSceneCostMaterialProcessHoursService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    /**
+     * 添加
+     *
+     * @param appSceneCostMaterialProcessHours
+     * @return
+     */
+    @AutoLog(value = "app_scene_cost_material_process_hours-添加")
+    @ApiOperation(value = "app_scene_cost_material_process_hours-添加", notes = "app_scene_cost_material_process_hours-添加")
+    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_process_hours:add")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody AppSceneCostMaterialProcessHours appSceneCostMaterialProcessHours) {
+        appSceneCostMaterialProcessHoursService.save(appSceneCostMaterialProcessHours);
+        return Result.OK("添加成功！");
+    }
+
+    /**
+     * 编辑
+     *
+     * @param appSceneCostMaterialProcessHours
+     * @return
+     */
+    @AutoLog(value = "app_scene_cost_material_process_hours-编辑")
+    @ApiOperation(value = "app_scene_cost_material_process_hours-编辑", notes = "app_scene_cost_material_process_hours-编辑")
+    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_process_hours:edit")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody AppSceneCostMaterialProcessHours appSceneCostMaterialProcessHours) {
+        appSceneCostMaterialProcessHoursService.updateById(appSceneCostMaterialProcessHours);
+        return Result.OK("编辑成功!");
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "app_scene_cost_material_process_hours-通过id删除")
+    @ApiOperation(value = "app_scene_cost_material_process_hours-通过id删除", notes = "app_scene_cost_material_process_hours-通过id删除")
+    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_process_hours:delete")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        appSceneCostMaterialProcessHoursService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+//    /**
+//     * 批量删除
+//     *
+//     * @param ids
+//     * @return
+//     */
+//    @AutoLog(value = "app_scene_cost_material_process_hours-批量删除")
+//    @ApiOperation(value = "app_scene_cost_material_process_hours-批量删除", notes = "app_scene_cost_material_process_hours-批量删除")
+//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_process_hours:deleteBatch")
+//    @DeleteMapping(value = "/deleteBatch")
+//    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+//        this.appSceneCostMaterialProcessHoursService.removeByIds(Arrays.asList(ids.split(",")));
+//        return Result.OK("批量删除成功!");
+//    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    //@AutoLog(value = "app_scene_cost_material_process_hours-通过id查询")
+    @ApiOperation(value = "app_scene_cost_material_process_hours-通过id查询", notes = "app_scene_cost_material_process_hours-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<AppSceneCostMaterialProcessHours> queryById(@RequestParam(name = "id", required = true) String id) {
+        AppSceneCostMaterialProcessHours appSceneCostMaterialProcessHours = appSceneCostMaterialProcessHoursService.getById(id);
+        if (appSceneCostMaterialProcessHours == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(appSceneCostMaterialProcessHours);
+    }
+
+//    /**
+//     * 导出excel
+//     *
+//     * @param request
+//     * @param appSceneCostMaterialProcessHours
+//     */
+//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_process_hours:exportXls")
+//    @RequestMapping(value = "/exportXls")
+//    public ModelAndView exportXls(HttpServletRequest request, AppSceneCostMaterialProcessHours appSceneCostMaterialProcessHours) {
+//        return super.exportXls(request, appSceneCostMaterialProcessHours, AppSceneCostMaterialProcessHours.class, "app_scene_cost_material_process_hours");
+//    }
+
+//    /**
+//     * 通过excel导入数据
+//     *
+//     * @param request
+//     * @param response
+//     * @return
+//     */
+//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_material_process_hours:importExcel")
+//    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+//    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+//        return super.importExcel(request, response, AppSceneCostMaterialProcessHours.class);
+//    }
+
+}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/AppSceneCostPartMissingInfoController.java

@@ -0,0 +1,159 @@
+package com.zzsmart.qomo.kn.cost.manage.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zzsmart.qomo.kn.cost.manage.entity.AppSceneCostPartMissingInfo;
+import com.zzsmart.qomo.kn.cost.manage.service.IAppSceneCostPartMissingInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+
+/**
+ * @Description: app_scene_cost_part_missing_info
+ * @Author: jeecg-boot
+ * @Date: 2024-08-02
+ * @Version: V1.0
+ */
+@Api(tags = "cost-部件缺失信息")
+@RestController
+@RequestMapping("//partMissingInfo")
+@Slf4j
+public class AppSceneCostPartMissingInfoController extends JeecgController<AppSceneCostPartMissingInfo, IAppSceneCostPartMissingInfoService> {
+    @Autowired
+    private IAppSceneCostPartMissingInfoService appSceneCostPartMissingInfoService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param appSceneCostPartMissingInfo
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    //@AutoLog(value = "app_scene_cost_part_missing_info-分页列表查询")
+    @ApiOperation(value = "app_scene_cost_part_missing_info-分页列表查询", notes = "app_scene_cost_part_missing_info-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<AppSceneCostPartMissingInfo>> queryPageList(AppSceneCostPartMissingInfo appSceneCostPartMissingInfo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+        QueryWrapper<AppSceneCostPartMissingInfo> queryWrapper = QueryGenerator.initQueryWrapper(appSceneCostPartMissingInfo, req.getParameterMap());
+        Page<AppSceneCostPartMissingInfo> page = new Page<AppSceneCostPartMissingInfo>(pageNo, pageSize);
+        IPage<AppSceneCostPartMissingInfo> pageList = appSceneCostPartMissingInfoService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+//
+//    /**
+//     * 添加
+//     *
+//     * @param appSceneCostPartMissingInfo
+//     * @return
+//     */
+//    @AutoLog(value = "app_scene_cost_part_missing_info-添加")
+//    @ApiOperation(value = "app_scene_cost_part_missing_info-添加", notes = "app_scene_cost_part_missing_info-添加")
+//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_part_missing_info:add")
+//    @PostMapping(value = "/add")
+//    public Result<String> add(@RequestBody AppSceneCostPartMissingInfo appSceneCostPartMissingInfo) {
+//        appSceneCostPartMissingInfoService.save(appSceneCostPartMissingInfo);
+//        return Result.OK("添加成功！");
+//    }
+//
+//    /**
+//     * 编辑
+//     *
+//     * @param appSceneCostPartMissingInfo
+//     * @return
+//     */
+//    @AutoLog(value = "app_scene_cost_part_missing_info-编辑")
+//    @ApiOperation(value = "app_scene_cost_part_missing_info-编辑", notes = "app_scene_cost_part_missing_info-编辑")
+//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_part_missing_info:edit")
+//    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+//    public Result<String> edit(@RequestBody AppSceneCostPartMissingInfo appSceneCostPartMissingInfo) {
+//        appSceneCostPartMissingInfoService.updateById(appSceneCostPartMissingInfo);
+//        return Result.OK("编辑成功!");
+//    }
+//
+//    /**
+//     * 通过id删除
+//     *
+//     * @param id
+//     * @return
+//     */
+//    @AutoLog(value = "app_scene_cost_part_missing_info-通过id删除")
+//    @ApiOperation(value = "app_scene_cost_part_missing_info-通过id删除", notes = "app_scene_cost_part_missing_info-通过id删除")
+//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_part_missing_info:delete")
+//    @DeleteMapping(value = "/delete")
+//    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+//        appSceneCostPartMissingInfoService.removeById(id);
+//        return Result.OK("删除成功!");
+//    }
+//
+//    /**
+//     * 批量删除
+//     *
+//     * @param ids
+//     * @return
+//     */
+//    @AutoLog(value = "app_scene_cost_part_missing_info-批量删除")
+//    @ApiOperation(value = "app_scene_cost_part_missing_info-批量删除", notes = "app_scene_cost_part_missing_info-批量删除")
+//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_part_missing_info:deleteBatch")
+//    @DeleteMapping(value = "/deleteBatch")
+//    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+//        this.appSceneCostPartMissingInfoService.removeByIds(Arrays.asList(ids.split(",")));
+//        return Result.OK("批量删除成功!");
+//    }
+//
+//    /**
+//     * 通过id查询
+//     *
+//     * @param id
+//     * @return
+//     */
+//    //@AutoLog(value = "app_scene_cost_part_missing_info-通过id查询")
+//    @ApiOperation(value = "app_scene_cost_part_missing_info-通过id查询", notes = "app_scene_cost_part_missing_info-通过id查询")
+//    @GetMapping(value = "/queryById")
+//    public Result<AppSceneCostPartMissingInfo> queryById(@RequestParam(name = "id", required = true) String id) {
+//        AppSceneCostPartMissingInfo appSceneCostPartMissingInfo = appSceneCostPartMissingInfoService.getById(id);
+//        if (appSceneCostPartMissingInfo == null) {
+//            return Result.error("未找到对应数据");
+//        }
+//        return Result.OK(appSceneCostPartMissingInfo);
+//    }
+//
+//    /**
+//     * 导出excel
+//     *
+//     * @param request
+//     * @param appSceneCostPartMissingInfo
+//     */
+//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_part_missing_info:exportXls")
+//    @RequestMapping(value = "/exportXls")
+//    public ModelAndView exportXls(HttpServletRequest request, AppSceneCostPartMissingInfo appSceneCostPartMissingInfo) {
+//        return super.exportXls(request, appSceneCostPartMissingInfo, AppSceneCostPartMissingInfo.class, "app_scene_cost_part_missing_info");
+//    }
+//
+//    /**
+//     * 通过excel导入数据
+//     *
+//     * @param request
+//     * @param response
+//     * @return
+//     */
+//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_part_missing_info:importExcel")
+//    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+//    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+//        return super.importExcel(request, response, AppSceneCostPartMissingInfo.class);
+//    }
+
+}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/AppSceneCostPurchasePriceController.java

@@ -0,0 +1,159 @@
+package com.zzsmart.qomo.kn.cost.manage.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zzsmart.qomo.kn.cost.manage.entity.AppSceneCostPurchasePrice;
+import com.zzsmart.qomo.kn.cost.manage.service.IAppSceneCostPurchasePriceService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+
+/**
+ * @Description: app_scene_cost_purchase_price
+ * @Author: jeecg-boot
+ * @Date: 2024-08-02
+ * @Version: V1.0
+ */
+@Api(tags = "cost-采购价")
+@RestController
+@RequestMapping("//purchasePrice")
+@Slf4j
+public class AppSceneCostPurchasePriceController extends JeecgController<AppSceneCostPurchasePrice, IAppSceneCostPurchasePriceService> {
+    @Autowired
+    private IAppSceneCostPurchasePriceService appSceneCostPurchasePriceService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param appSceneCostPurchasePrice
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    //@AutoLog(value = "app_scene_cost_purchase_price-分页列表查询")
+    @ApiOperation(value = "app_scene_cost_purchase_price-分页列表查询", notes = "app_scene_cost_purchase_price-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<AppSceneCostPurchasePrice>> queryPageList(AppSceneCostPurchasePrice appSceneCostPurchasePrice, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+        QueryWrapper<AppSceneCostPurchasePrice> queryWrapper = QueryGenerator.initQueryWrapper(appSceneCostPurchasePrice, req.getParameterMap());
+        Page<AppSceneCostPurchasePrice> page = new Page<AppSceneCostPurchasePrice>(pageNo, pageSize);
+        IPage<AppSceneCostPurchasePrice> pageList = appSceneCostPurchasePriceService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    /**
+     * 添加
+     *
+     * @param appSceneCostPurchasePrice
+     * @return
+     */
+    @AutoLog(value = "app_scene_cost_purchase_price-添加")
+    @ApiOperation(value = "app_scene_cost_purchase_price-添加", notes = "app_scene_cost_purchase_price-添加")
+    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_price:add")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody AppSceneCostPurchasePrice appSceneCostPurchasePrice) {
+        appSceneCostPurchasePriceService.save(appSceneCostPurchasePrice);
+        return Result.OK("添加成功！");
+    }
+
+    /**
+     * 编辑
+     *
+     * @param appSceneCostPurchasePrice
+     * @return
+     */
+    @AutoLog(value = "app_scene_cost_purchase_price-编辑")
+    @ApiOperation(value = "app_scene_cost_purchase_price-编辑", notes = "app_scene_cost_purchase_price-编辑")
+    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_price:edit")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody AppSceneCostPurchasePrice appSceneCostPurchasePrice) {
+        appSceneCostPurchasePriceService.updateById(appSceneCostPurchasePrice);
+        return Result.OK("编辑成功!");
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "app_scene_cost_purchase_price-通过id删除")
+    @ApiOperation(value = "app_scene_cost_purchase_price-通过id删除", notes = "app_scene_cost_purchase_price-通过id删除")
+    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_price:delete")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        appSceneCostPurchasePriceService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "app_scene_cost_purchase_price-批量删除")
+    @ApiOperation(value = "app_scene_cost_purchase_price-批量删除", notes = "app_scene_cost_purchase_price-批量删除")
+    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_price:deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        this.appSceneCostPurchasePriceService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    //@AutoLog(value = "app_scene_cost_purchase_price-通过id查询")
+    @ApiOperation(value = "app_scene_cost_purchase_price-通过id查询", notes = "app_scene_cost_purchase_price-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<AppSceneCostPurchasePrice> queryById(@RequestParam(name = "id", required = true) String id) {
+        AppSceneCostPurchasePrice appSceneCostPurchasePrice = appSceneCostPurchasePriceService.getById(id);
+        if (appSceneCostPurchasePrice == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(appSceneCostPurchasePrice);
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param appSceneCostPurchasePrice
+     */
+    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_price:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, AppSceneCostPurchasePrice appSceneCostPurchasePrice) {
+        return super.exportXls(request, appSceneCostPurchasePrice, AppSceneCostPurchasePrice.class, "app_scene_cost_purchase_price");
+    }
+
+    /**
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_price:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, AppSceneCostPurchasePrice.class);
+    }
+
+}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/AppSceneCostStandardVersionController.java

@@ -0,0 +1,157 @@
+package com.zzsmart.qomo.kn.cost.manage.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zzsmart.qomo.kn.cost.manage.entity.AppSceneCostStandardVersion;
+import com.zzsmart.qomo.kn.cost.manage.service.IAppSceneCostStandardVersionService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+
+/**
+ * @Description: app_scene_cost_standard_version
+ * @Author: jeecg-boot
+ * @Date: 2024-08-02
+ * @Version: V1.0
+ */
+@Api(tags = "cost-标准成本-版本号")
+@RestController
+@RequestMapping("//costStandardVersion")
+public class AppSceneCostStandardVersionController extends JeecgController<AppSceneCostStandardVersion, IAppSceneCostStandardVersionService> {
+    @Autowired
+    private IAppSceneCostStandardVersionService appSceneCostStandardVersionService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param appSceneCostStandardVersion
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    //@AutoLog(value = "app_scene_cost_standard_version-分页列表查询")
+    @ApiOperation(value = "app_scene_cost_standard_version-分页列表查询", notes = "app_scene_cost_standard_version-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<AppSceneCostStandardVersion>> queryPageList(AppSceneCostStandardVersion appSceneCostStandardVersion, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+        QueryWrapper<AppSceneCostStandardVersion> queryWrapper = QueryGenerator.initQueryWrapper(appSceneCostStandardVersion, req.getParameterMap());
+        Page<AppSceneCostStandardVersion> page = new Page<AppSceneCostStandardVersion>(pageNo, pageSize);
+        IPage<AppSceneCostStandardVersion> pageList = appSceneCostStandardVersionService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+//    /**
+//     * 添加
+//     *
+//     * @param appSceneCostStandardVersion
+//     * @return
+//     */
+//    @AutoLog(value = "app_scene_cost_standard_version-添加")
+//    @ApiOperation(value = "app_scene_cost_standard_version-添加", notes = "app_scene_cost_standard_version-添加")
+//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_version:add")
+//    @PostMapping(value = "/add")
+//    public Result<String> add(@RequestBody AppSceneCostStandardVersion appSceneCostStandardVersion) {
+//        appSceneCostStandardVersionService.save(appSceneCostStandardVersion);
+//        return Result.OK("添加成功！");
+//    }
+//
+//    /**
+//     * 编辑
+//     *
+//     * @param appSceneCostStandardVersion
+//     * @return
+//     */
+//    @AutoLog(value = "app_scene_cost_standard_version-编辑")
+//    @ApiOperation(value = "app_scene_cost_standard_version-编辑", notes = "app_scene_cost_standard_version-编辑")
+//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_version:edit")
+//    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+//    public Result<String> edit(@RequestBody AppSceneCostStandardVersion appSceneCostStandardVersion) {
+//        appSceneCostStandardVersionService.updateById(appSceneCostStandardVersion);
+//        return Result.OK("编辑成功!");
+//    }
+//
+//    /**
+//     * 通过id删除
+//     *
+//     * @param id
+//     * @return
+//     */
+//    @AutoLog(value = "app_scene_cost_standard_version-通过id删除")
+//    @ApiOperation(value = "app_scene_cost_standard_version-通过id删除", notes = "app_scene_cost_standard_version-通过id删除")
+//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_version:delete")
+//    @DeleteMapping(value = "/delete")
+//    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+//        appSceneCostStandardVersionService.removeById(id);
+//        return Result.OK("删除成功!");
+//    }
+//
+//    /**
+//     * 批量删除
+//     *
+//     * @param ids
+//     * @return
+//     */
+//    @AutoLog(value = "app_scene_cost_standard_version-批量删除")
+//    @ApiOperation(value = "app_scene_cost_standard_version-批量删除", notes = "app_scene_cost_standard_version-批量删除")
+//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_version:deleteBatch")
+//    @DeleteMapping(value = "/deleteBatch")
+//    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+//        this.appSceneCostStandardVersionService.removeByIds(Arrays.asList(ids.split(",")));
+//        return Result.OK("批量删除成功!");
+//    }
+//
+//    /**
+//     * 通过id查询
+//     *
+//     * @param id
+//     * @return
+//     */
+//    //@AutoLog(value = "app_scene_cost_standard_version-通过id查询")
+//    @ApiOperation(value = "app_scene_cost_standard_version-通过id查询", notes = "app_scene_cost_standard_version-通过id查询")
+//    @GetMapping(value = "/queryById")
+//    public Result<AppSceneCostStandardVersion> queryById(@RequestParam(name = "id", required = true) String id) {
+//        AppSceneCostStandardVersion appSceneCostStandardVersion = appSceneCostStandardVersionService.getById(id);
+//        if (appSceneCostStandardVersion == null) {
+//            return Result.error("未找到对应数据");
+//        }
+//        return Result.OK(appSceneCostStandardVersion);
+//    }
+//
+//    /**
+//     * 导出excel
+//     *
+//     * @param request
+//     * @param appSceneCostStandardVersion
+//     */
+//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_version:exportXls")
+//    @RequestMapping(value = "/exportXls")
+//    public ModelAndView exportXls(HttpServletRequest request, AppSceneCostStandardVersion appSceneCostStandardVersion) {
+//        return super.exportXls(request, appSceneCostStandardVersion, AppSceneCostStandardVersion.class, "app_scene_cost_standard_version");
+//    }
+//
+//    /**
+//     * 通过excel导入数据
+//     *
+//     * @param request
+//     * @param response
+//     * @return
+//     */
+//    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_version:importExcel")
+//    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+//    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+//        return super.importExcel(request, response, AppSceneCostStandardVersion.class);
+//    }
+
+}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostMaterialBomController.java

@@ -1,70 +0,0 @@
-package com.zzsmart.qomo.kn.cost.manage.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zzsmart.qomo.kn.cost.manage.entity.CostMaterialBom;
-import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardVersion;
-import com.zzsmart.qomo.kn.cost.manage.service.CostMaterialBomService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
-/**
- * <p>
- * 物料bom 前端控制器
- * </p>
- *
- * @author
- * @since 2024-06-21
- */
-@RequestMapping("//cost-material-bom")
-@Api(tags="cost-标准成本-bom信息")
-@RestController
-public class CostMaterialBomController {
-    @Autowired
-    CostMaterialBomService costMaterialBomService;
-    /**
-     * 分页列表查询
-     *
-     * @param costMaterialBom
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    //@AutoLog(value = "app_scene_cost_standard_version-分页列表查询")
-    @ApiOperation(value="物料bom分页列表查询", notes="物料bom分页列表查询")
-    @GetMapping(value = "/pageList")
-    public Result<IPage<CostMaterialBom>> queryPageList(CostMaterialBom costMaterialBom,
-                                                            @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-                                                            @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-                                                            HttpServletRequest req) {
-        QueryWrapper<CostMaterialBom> queryWrapper = QueryGenerator.initQueryWrapper(costMaterialBom, req.getParameterMap());
-        Page<CostMaterialBom> page = new Page<CostMaterialBom>(pageNo, pageSize);
-        IPage<CostMaterialBom> pageList = costMaterialBomService.page(page, queryWrapper);
-        return Result.OK(pageList);
-    }
-    /**
-     * 列表查询
-     *
-     * @return
-     */
-    @ApiOperation(value="物料bom列表查询", notes="物料bom列表查询")
-    @GetMapping(value = "/list")
-    public Result<  List<CostMaterialBom>> queryList(@RequestParam(name = "materialNumber",required = false) String materialNumber) {
-        List<CostMaterialBom> list = costMaterialBomService.queryListResult(materialNumber);
-        return Result.OK(list);
-    }
-}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostMaterialProcessHoursController.java

@@ -1,20 +0,0 @@
-package com.zzsmart.qomo.kn.cost.manage.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 物料工时工序表 前端控制器
- * </p>
- *
- * @author  
- * @since 2024-06-19
- */
-@RestController
-@RequestMapping("/cost-material-process-hours")
-public class CostMaterialProcessHoursController {
-
-}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostPartMissingInfoController.java

@@ -1,179 +0,0 @@
-package com.zzsmart.qomo.kn.cost.manage.controller;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.zzsmart.qomo.kn.cost.manage.entity.CostPartMissingInfo;
-import com.zzsmart.qomo.kn.cost.manage.service.ICostPartMissingInfoService;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-
- /**
- * @Description: 标准成本-部件缺失信息
- * @Author: wangqiong
- * @Date:   2024-06-13
- * @Version: V1.0
- */
-@Api(tags="cost-标准成本-部件缺失信息")
-@RestController
-@RequestMapping("//costPartMissingInfo")
-@Slf4j
-public class CostPartMissingInfoController extends JeecgController<CostPartMissingInfo, ICostPartMissingInfoService> {
-	@Autowired
-	private ICostPartMissingInfoService costPartMissingInfoService;
-	
-	/**
-	 * 分页列表查询
-	 *
-	 * @param costPartMissingInfo
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	//@AutoLog(value = "app_scene_cost_part_missing_info-分页列表查询")
-	@ApiOperation(value="app_scene_cost_part_missing_info-分页列表查询", notes="app_scene_cost_part_missing_info-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<CostPartMissingInfo>> queryPageList(CostPartMissingInfo costPartMissingInfo,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		QueryWrapper<CostPartMissingInfo> queryWrapper = QueryGenerator.initQueryWrapper(costPartMissingInfo, req.getParameterMap());
-		Page<CostPartMissingInfo> page = new Page<CostPartMissingInfo>(pageNo, pageSize);
-		IPage<CostPartMissingInfo> pageList = costPartMissingInfoService.page(page, queryWrapper);
-		return Result.OK(pageList);
-	}
-	
-	/**
-	 *   添加
-	 *
-	 * @param costPartMissingInfo
-	 * @return
-	 */
-	@AutoLog(value = "app_scene_cost_part_missing_info-添加")
-	@ApiOperation(value="app_scene_cost_part_missing_info-添加", notes="app_scene_cost_part_missing_info-添加")
-//	@RequiresPermissions(":app_scene_cost_part_missing_info:add")
-	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody CostPartMissingInfo costPartMissingInfo) {
-		costPartMissingInfoService.save(costPartMissingInfo);
-		return Result.OK("添加成功！");
-	}
-	
-	/**
-	 *  编辑
-	 *
-	 * @param costPartMissingInfo
-	 * @return
-	 */
-	@AutoLog(value = "app_scene_cost_part_missing_info-编辑")
-	@ApiOperation(value="app_scene_cost_part_missing_info-编辑", notes="app_scene_cost_part_missing_info-编辑")
-//	@RequiresPermissions(":app_scene_cost_part_missing_info:edit")
-	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody CostPartMissingInfo costPartMissingInfo) {
-		costPartMissingInfoService.updateById(costPartMissingInfo);
-		return Result.OK("编辑成功!");
-	}
-	
-	/**
-	 *   通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "app_scene_cost_part_missing_info-通过id删除")
-	@ApiOperation(value="app_scene_cost_part_missing_info-通过id删除", notes="app_scene_cost_part_missing_info-通过id删除")
-//	@RequiresPermissions(":app_scene_cost_part_missing_info:delete")
-	@DeleteMapping(value = "/delete")
-	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		costPartMissingInfoService.removeById(id);
-		return Result.OK("删除成功!");
-	}
-	
-	/**
-	 *  批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "app_scene_cost_part_missing_info-批量删除")
-	@ApiOperation(value="app_scene_cost_part_missing_info-批量删除", notes="app_scene_cost_part_missing_info-批量删除")
-//	@RequiresPermissions(":app_scene_cost_part_missing_info:deleteBatch")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.costPartMissingInfoService.removeByIds(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功!");
-	}
-	
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	//@AutoLog(value = "app_scene_cost_part_missing_info-通过id查询")
-	@ApiOperation(value="app_scene_cost_part_missing_info-通过id查询", notes="app_scene_cost_part_missing_info-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<CostPartMissingInfo> queryById(@RequestParam(name="id",required=true) String id) {
-		CostPartMissingInfo costPartMissingInfo = costPartMissingInfoService.getById(id);
-		if(costPartMissingInfo==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(costPartMissingInfo);
-	}
-
-    /**
-    * 导出excel
-    *
-    * @param request
-    * @param costPartMissingInfo
-    */
-//    @RequiresPermissions(":app_scene_cost_part_missing_info:exportXls")
-    @RequestMapping(value = "/exportXls",method = RequestMethod.GET)
-    public ModelAndView exportXls(HttpServletRequest request, CostPartMissingInfo costPartMissingInfo) {
-        return super.exportXls(request, costPartMissingInfo, CostPartMissingInfo.class, "app_scene_cost_part_missing_info");
-    }
-
-    /**
-      * 通过excel导入数据
-    *
-    * @param request
-    * @param response
-    * @return
-    */
-//    @RequiresPermissions(":app_scene_cost_part_missing_info:importExcel")
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, CostPartMissingInfo.class);
-    }
-
-}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostPurchasePriceController.java

@@ -1,20 +0,0 @@
-package com.zzsmart.qomo.kn.cost.manage.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 物料采购单价 前端控制器
- * </p>
- *
- * @author  
- * @since 2024-06-19
- */
-@RestController
-@RequestMapping("/cost-purchase-price")
-public class CostPurchasePriceController {
-
-}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostStandardVersionController.java

@@ -1,178 +0,0 @@
-package com.zzsmart.qomo.kn.cost.manage.controller;
-
-import java.util.Arrays;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardVersion;
-import com.zzsmart.qomo.kn.cost.manage.service.ICostStandardVersionService;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
-
-/**
- * @Description: 标准成本-版本号
- * @Author: wangqiong
- * @Date:   2024-06-13
- * @Version: V1.0
- */
-@Api(tags="cost-标准成本-版本号")
-@RestController
-@RequestMapping("//costStandardVersion")
-@Slf4j
-public class CostStandardVersionController extends JeecgController<CostStandardVersion, ICostStandardVersionService> {
-	@Autowired
-	private ICostStandardVersionService costStandardVersionService;
-	
-	/**
-	 * 分页列表查询
-	 *
-	 * @param costStandardVersion
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	//@AutoLog(value = "app_scene_cost_standard_version-分页列表查询")
-	@ApiOperation(value="app_scene_cost_standard_version-分页列表查询", notes="app_scene_cost_standard_version-分页列表查询")
-	@GetMapping(value = "/pageList")
-	public Result<IPage<CostStandardVersion>> queryPageList(CostStandardVersion costStandardVersion,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		QueryWrapper<CostStandardVersion> queryWrapper = QueryGenerator.initQueryWrapper(costStandardVersion, req.getParameterMap());
-		Page<CostStandardVersion> page = new Page<CostStandardVersion>(pageNo, pageSize);
-		IPage<CostStandardVersion> pageList = costStandardVersionService.page(page, queryWrapper);
-		return Result.OK(pageList);
-	}
-	 /**
-	  * 列表查询
-	  *
-	  * @return
-	  */
-	 @ApiOperation(value="版本号列表查询", notes="版本号列表查询")
-	 @GetMapping(value = "/list")
-	 public Result<  List<CostStandardVersion>> queryList(@RequestParam(name = "versionNumber",required = false) String versionNumber) {
-		 List<CostStandardVersion> list = costStandardVersionService.queryListResult(versionNumber);
-		 return Result.OK(list);
-	 }
-	/**
-	 *   添加
-	 *
-	 * @param costStandardVersion
-	 * @return
-	 */
-	@AutoLog(value = "app_scene_cost_standard_version-添加")
-	@ApiOperation(value="app_scene_cost_standard_version-添加", notes="app_scene_cost_standard_version-添加")
-//	@RequiresPermissions(":app_scene_cost_standard_version:add")
-	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody CostStandardVersion costStandardVersion) {
-		boolean save = costStandardVersionService.save(costStandardVersion);
-		if(save){
-			return Result.OK("添加成功！");
-		}else {
-			return Result.OK("添加失败！");
-		}
-	}
-	
-	/**
-	 *  编辑
-	 *
-	 * @param costStandardVersion
-	 * @return
-	 */
-	@AutoLog(value = "app_scene_cost_standard_version-编辑")
-	@ApiOperation(value="app_scene_cost_standard_version-编辑", notes="app_scene_cost_standard_version-编辑")
-//	@RequiresPermissions(":app_scene_cost_standard_version:edit")
-	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody CostStandardVersion costStandardVersion) {
-		costStandardVersionService.updateById(costStandardVersion);
-		return Result.OK("编辑成功!");
-	}
-	
-	/**
-	 *   通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "app_scene_cost_standard_version-通过id删除")
-	@ApiOperation(value="app_scene_cost_standard_version-通过id删除", notes="app_scene_cost_standard_version-通过id删除")
-//	@RequiresPermissions(":app_scene_cost_standard_version:delete")
-	@DeleteMapping(value = "/delete")
-	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		costStandardVersionService.removeById(id);
-		return Result.OK("删除成功!");
-	}
-	
-	/**
-	 *  批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "app_scene_cost_standard_version-批量删除")
-	@ApiOperation(value="app_scene_cost_standard_version-批量删除", notes="app_scene_cost_standard_version-批量删除")
-//	@RequiresPermissions(":app_scene_cost_standard_version:deleteBatch")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.costStandardVersionService.removeByIds(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功!");
-	}
-	
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	//@AutoLog(value = "app_scene_cost_standard_version-通过id查询")
-	@ApiOperation(value="app_scene_cost_standard_version-通过id查询", notes="app_scene_cost_standard_version-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<CostStandardVersion> queryById(@RequestParam(name="id",required=true) String id) {
-		CostStandardVersion costStandardVersion = costStandardVersionService.getById(id);
-		if(costStandardVersion==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(costStandardVersion);
-	}
-
-    /**
-    * 导出excel
-    *
-    * @param request
-    * @param costStandardVersion
-    */
-//    @RequiresPermissions(":app_scene_cost_standard_version:exportXls")
-    @RequestMapping(value = "/exportXls", method = RequestMethod.GET)
-    public ModelAndView exportXls(HttpServletRequest request, CostStandardVersion costStandardVersion) {
-        return super.exportXls(request, costStandardVersion, CostStandardVersion.class, "app_scene_cost_standard_version");
-    }
-
-    /**
-      * 通过excel导入数据
-    *
-    * @param request
-    * @param response
-    * @return
-    */
-//    @RequiresPermissions(":app_scene_cost_standard_version:importExcel")
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return this.costStandardVersionService.importExcel(request, response, CostStandardVersion.class);
-    }
-
-}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/HourRateController.java

@@ -1,162 +0,0 @@
-package com.zzsmart.qomo.kn.cost.manage.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zzsmart.qomo.kn.cost.manage.entity.HourRate;
-import com.zzsmart.qomo.kn.cost.manage.service.IHourRateService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Arrays;
-
- /**
- * @Description: hour_rate
- * @Author: jeecg-boot
- * @Date:   2024-06-06
- * @Version: V1.0
- */
-@Api(tags="cost-小时费率")
-@RestController
-@RequestMapping("//hourRate")
-@Slf4j
-public class HourRateController extends JeecgController<HourRate, IHourRateService> {
-	@Autowired
-	private IHourRateService hourRateService;
-	
-	/**
-	 * 分页列表查询
-	 *
-	 * @param hourRate
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	//@AutoLog(value = "hour_rate-分页列表查询")
-	@ApiOperation(value="hour_rate-分页列表查询", notes="hour_rate-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<HourRate>> queryPageList(HourRate hourRate,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		QueryWrapper<HourRate> queryWrapper = QueryGenerator.initQueryWrapper(hourRate, req.getParameterMap());
-		Page<HourRate> page = new Page<HourRate>(pageNo, pageSize);
-		IPage<HourRate> pageList = hourRateService.page(page, queryWrapper);
-		return Result.OK(pageList);
-	}
-	
-	/**
-	 *   添加
-	 *
-	 * @param hourRate
-	 * @return
-	 */
-	@AutoLog(value = "hour_rate-添加")
-	@ApiOperation(value="hour_rate-添加", notes="hour_rate-添加")
-//	@RequiresPermissions(":hour_rate:add")
-	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody HourRate hourRate) {
-		hourRateService.save(hourRate);
-		return Result.OK("添加成功！");
-	}
-	
-	/**
-	 *  编辑
-	 *
-	 * @param hourRate
-	 * @return
-	 */
-	@AutoLog(value = "hour_rate-编辑")
-	@ApiOperation(value="hour_rate-编辑", notes="hour_rate-编辑")
-//	@RequiresPermissions(":hour_rate:edit")
-	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody HourRate hourRate) {
-		hourRateService.updateById(hourRate);
-		return Result.OK("编辑成功!");
-	}
-	
-	/**
-	 *   通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "hour_rate-通过id删除")
-	@ApiOperation(value="hour_rate-通过id删除", notes="hour_rate-通过id删除")
-//	@RequiresPermissions(":hour_rate:delete")
-	@DeleteMapping(value = "/delete")
-	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		hourRateService.removeById(id);
-		return Result.OK("删除成功!");
-	}
-	
-	/**
-	 *  批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "hour_rate-批量删除")
-	@ApiOperation(value="hour_rate-批量删除", notes="hour_rate-批量删除")
-//	@RequiresPermissions(":hour_rate:deleteBatch")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.hourRateService.removeByIds(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功!");
-	}
-	
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	//@AutoLog(value = "hour_rate-通过id查询")
-	@ApiOperation(value="hour_rate-通过id查询", notes="hour_rate-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<HourRate> queryById(@RequestParam(name="id",required=true) String id) {
-		HourRate hourRate = hourRateService.getById(id);
-		if(hourRate==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(hourRate);
-	}
-
-    /**
-    * 导出excel
-    *
-    * @param request
-    * @param hourRate
-    */
-    @RequiresPermissions(":hour_rate:exportXls")
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HourRate hourRate) {
-        return super.exportXls(request, hourRate, HourRate.class, "hour_rate");
-    }
-
-    /**
-      * 通过excel导入数据
-    *
-    * @param request
-    * @param response
-    * @return
-    */
-    @RequiresPermissions(":hour_rate:importExcel")
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, HourRate.class);
-    }
-
-}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/AppSceneCostHourRate.java

@@ -0,0 +1,127 @@
+package com.zzsmart.qomo.kn.cost.manage.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Description: app_scene_cost_hour_rate
+ * @Author: jeecg-boot
+ * @Date: 2024-08-02
+ * @Version: V1.0
+ */
+@Data
+@TableName("app_scene_cost_hour_rate")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "app_scene_cost_hour_rate对象", description = "app_scene_cost_hour_rate")
+public class AppSceneCostHourRate implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 年度
+     */
+    @Excel(name = "年度", width = 15)
+    @ApiModelProperty(value = "年度")
+    private String year;
+    /**
+     * 成本中心代码
+     */
+    @Excel(name = "成本中心代码", width = 15)
+    @ApiModelProperty(value = "成本中心代码")
+    private String costCenterCode;
+    /**
+     * 工厂代码
+     */
+    @Excel(name = "工厂代码", width = 15)
+    @ApiModelProperty(value = "工厂代码")
+    private String factory;
+    /**
+     * 人工小时费率
+     */
+    @Excel(name = "人工小时费率", width = 15)
+    @ApiModelProperty(value = "人工小时费率")
+    private BigDecimal laborHourRate;
+    /**
+     * 设备小时费率
+     */
+    @Excel(name = "设备小时费率", width = 15)
+    @ApiModelProperty(value = "设备小时费率")
+    private BigDecimal equipHourRate;
+    /**
+     * 燃动小时费率
+     */
+    @Excel(name = "燃动小时费率", width = 15)
+    @ApiModelProperty(value = "燃动小时费率")
+    private BigDecimal fuelHourRate;
+    /**
+     * 辅料小时费率
+     */
+    @Excel(name = "辅料小时费率", width = 15)
+    @ApiModelProperty(value = "辅料小时费率")
+    private BigDecimal auxiliaryHourRate;
+    /**
+     * 其他小时费率
+     */
+    @Excel(name = "其他小时费率", width = 15)
+    @ApiModelProperty(value = "其他小时费率")
+    private BigDecimal otherHourRate;
+    /**
+     * 生效日期
+     */
+    @Excel(name = "生效日期", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "生效日期")
+    private Date effectiveDate;
+    /**
+     * 失效日期
+     */
+    @Excel(name = "失效日期", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "失效日期")
+    private Date expirationDate;
+    /**
+     * 维护人员
+     */
+    @Excel(name = "维护人员", width = 15)
+    @ApiModelProperty(value = "维护人员")
+    private String guardian;
+    /**
+     * 维护时间
+     */
+    @Excel(name = "维护时间", width = 15)
+    @ApiModelProperty(value = "维护时间")
+    private String maintenanceTime;
+    /**
+     * 预留字段1
+     */
+    @Excel(name = "预留字段1", width = 15)
+    @ApiModelProperty(value = "预留字段1")
+    private String reserve1;
+    /**
+     * 预留字段2
+     */
+    @Excel(name = "预留字段2", width = 15)
+    @ApiModelProperty(value = "预留字段2")
+    private BigDecimal reserve2;
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/AppSceneCostMaterialBom.java

@@ -0,0 +1,261 @@
+package com.zzsmart.qomo.kn.cost.manage.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Description: app_scene_cost_material_bom
+ * @Author: jeecg-boot
+ * @Date: 2024-08-02
+ * @Version: V1.0
+ */
+@Data
+@TableName("app_scene_cost_material_bom")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "app_scene_cost_material_bom对象", description = "app_scene_cost_material_bom")
+public class AppSceneCostMaterialBom implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private String id;
+    /**
+     * 物料编码
+     */
+    @Excel(name = "物料编码", width = 15)
+    @ApiModelProperty(value = "物料编码")
+    private String materialCode;
+    /**
+     * 物料名称
+     */
+    @Excel(name = "物料名称", width = 15)
+    @ApiModelProperty(value = "物料名称")
+    private String materialName;
+    /**
+     * 父级物料编码
+     */
+    @Excel(name = "父级物料编码", width = 15)
+    @ApiModelProperty(value = "父级物料编码")
+    private String parentMaterialCode;
+    /**
+     * 级别
+     */
+    @Excel(name = "级别", width = 15)
+    @ApiModelProperty(value = "级别")
+    private String level;
+    /**
+     * 排序
+     */
+    @Excel(name = "排序", width = 15)
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+    /**
+     * 计量单位
+     */
+    @Excel(name = "计量单位", width = 15)
+    @ApiModelProperty(value = "计量单位")
+    private String unit;
+    /**
+     * 数量
+     */
+    @Excel(name = "数量", width = 15)
+    @ApiModelProperty(value = "数量")
+    private Integer number;
+    /**
+     * 人工工时（分钟）
+     */
+    @Excel(name = "人工工时（分钟）", width = 15)
+    @ApiModelProperty(value = "人工工时（分钟）")
+    private BigDecimal laborHours;
+    /**
+     * 设备工时
+     */
+    @Excel(name = "设备工时", width = 15)
+    @ApiModelProperty(value = "设备工时")
+    private BigDecimal deviceHours;
+    /**
+     * 借用物料编码
+     */
+    @Excel(name = "借用物料编码", width = 15)
+    @ApiModelProperty(value = "借用物料编码")
+    private String borrowMaterialCode;
+    /**
+     * 参考物料编码
+     */
+    @Excel(name = "参考物料编码", width = 15)
+    @ApiModelProperty(value = "参考物料编码")
+    private String referMaterialCode;
+    /**
+     * 采购类型
+     */
+    @Excel(name = "采购类型", width = 15)
+    @ApiModelProperty(value = "采购类型")
+    private String purchaseType;
+    /**
+     * 特殊采购类型
+     */
+    @Excel(name = "特殊采购类型", width = 15)
+    @ApiModelProperty(value = "特殊采购类型")
+    private String specialPurchaseType;
+    /**
+     * 说明
+     */
+    @Excel(name = "说明", width = 15)
+    @ApiModelProperty(value = "说明")
+    private String explanation;
+    /**
+     * 单位数量
+     */
+    @Excel(name = "单位数量", width = 15)
+    @ApiModelProperty(value = "单位数量")
+    private BigDecimal quantity;
+    /**
+     * 重量（g）
+     */
+    @Excel(name = "重量（g）", width = 15)
+    @ApiModelProperty(value = "重量（g）")
+    private String weight;
+    /**
+     * 材料/牌号
+     */
+    @Excel(name = "材料/牌号", width = 15)
+    @ApiModelProperty(value = "材料/牌号")
+    private String materialAndBrand;
+    /**
+     * 表面处理，材料
+     */
+    @Excel(name = "表面处理，材料", width = 15)
+    @ApiModelProperty(value = "表面处理，材料")
+    private String surfaceMaterial;
+    /**
+     * 厚度（mm）
+     */
+    @Excel(name = "厚度（mm）", width = 15)
+    @ApiModelProperty(value = "厚度（mm）")
+    private String surfaceThickness;
+    /**
+     * 表面积（mm²）
+     */
+    @Excel(name = "表面积（mm²）", width = 15)
+    @ApiModelProperty(value = "表面积（mm²）")
+    private String surfaceArea;
+    /**
+     * 长（mm）
+     */
+    @Excel(name = "长（mm）", width = 15)
+    @ApiModelProperty(value = "长（mm）")
+    private String length;
+    /**
+     * 宽（mm）
+     */
+    @Excel(name = "宽（mm）", width = 15)
+    @ApiModelProperty(value = "宽（mm）")
+    private String width;
+    /**
+     * 高（mm）
+     */
+    @Excel(name = "高（mm）", width = 15)
+    @ApiModelProperty(value = "高（mm）")
+    private String height;
+    /**
+     * 图示/图档/文档 文件ID
+     */
+    @Excel(name = "图示/图档/文档 文件ID", width = 15)
+    @ApiModelProperty(value = "图示/图档/文档 文件ID")
+    private Integer figureFileId;
+    /**
+     * 是否新摸具（0否 1是）
+     */
+    @Excel(name = "是否新摸具（0否 1是）", width = 15)
+    @ApiModelProperty(value = "是否新摸具（0否 1是）")
+    private Integer newTooling;
+    /**
+     * 成型方式（枚举）
+     */
+    @Excel(name = "成型方式（枚举）", width = 15)
+    @ApiModelProperty(value = "成型方式（枚举）")
+    private String shapingMethod;
+    /**
+     * 作业内容
+     */
+    @Excel(name = "作业内容", width = 15)
+    @ApiModelProperty(value = "作业内容")
+    private String workContent;
+    /**
+     * 加工地点
+     */
+    @Excel(name = "加工地点", width = 15)
+    @ApiModelProperty(value = "加工地点")
+    private String processLocation;
+    /**
+     * 成本中心
+     */
+    @Excel(name = "成本中心", width = 15)
+    @ApiModelProperty(value = "成本中心")
+    private String costCenter;
+    /**
+     * 单价（未税）
+     */
+    @Excel(name = "单价（未税）", width = 15)
+    @ApiModelProperty(value = "单价（未税）")
+    private BigDecimal unitPrice;
+    /**
+     * 总价（未税）
+     */
+    @Excel(name = "总价（未税）", width = 15)
+    @ApiModelProperty(value = "总价（未税）")
+    private BigDecimal totalPrice;
+    /**
+     * 摸具费（未税）
+     */
+    @Excel(name = "摸具费（未税）", width = 15)
+    @ApiModelProperty(value = "摸具费（未税）")
+    private BigDecimal mouldPrice;
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    /**
+     * 创建时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+    /**
+     * 修改人
+     */
+    @ApiModelProperty(value = "修改人")
+    private String updateBy;
+    /**
+     * 修改时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+    /**
+     * 备注（特殊技术信息）
+     */
+    @Excel(name = "备注（特殊技术信息）", width = 15)
+    @ApiModelProperty(value = "备注（特殊技术信息）")
+    private String remark;
+}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/CostMaterialProcessHours.java → qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/AppSceneCostMaterialProcessHours.java

@@ -1,174 +1,129 @@
 package com.zzsmart.qomo.kn.cost.manage.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Accessors;
+import java.util.Date;
 
 /**
- * <p>
- * 物料工时工序表
- * </p>
- *
- * @author
- * @since 2024-06-19
+ * @Description: app_scene_cost_material_process_hours
+ * @Author: jeecg-boot
+ * @Date: 2024-08-02
+ * @Version: V1.0
  */
-@Getter
-@Setter
-@Accessors(chain = true)
+@Data
 @TableName("app_scene_cost_material_process_hours")
-public class CostMaterialProcessHours implements Serializable {
-
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "app_scene_cost_material_process_hours对象", description = "app_scene_cost_material_process_hours")
+public class AppSceneCostMaterialProcessHours implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
      * 主键
      */
-    @ApiModelProperty(value = "id")
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
     private String id;
-
     /**
      * 物料编码
      */
+    @Excel(name = "物料编码", width = 15)
     @ApiModelProperty(value = "物料编码")
-    @TableField("material_code")
     private String materialCode;
-
     /**
      * 物料名称
      */
+    @Excel(name = "物料名称", width = 15)
     @ApiModelProperty(value = "物料名称")
-    @TableField("material_name")
     private String materialName;
-
     /**
      * 层级
      */
+    @Excel(name = "层级", width = 15)
     @ApiModelProperty(value = "层级")
-    @TableField("level")
     private String level;
-
     /**
      * 数量
      */
+    @Excel(name = "数量", width = 15)
     @ApiModelProperty(value = "数量")
-    @TableField("quantity")
     private BigDecimal quantity;
-
     /**
      * 采购类型
      */
+    @Excel(name = "采购类型", width = 15)
     @ApiModelProperty(value = "采购类型")
-    @TableField("purchase_type")
     private String purchaseType;
-
     /**
      * 工序
      */
+    @Excel(name = "工序", width = 15)
     @ApiModelProperty(value = "工序")
-    @TableField("work_process")
     private String workProcess;
-
     /**
      * 描述
      */
+    @Excel(name = "描述", width = 15)
     @ApiModelProperty(value = "描述")
-    @TableField("described")
     private String described;
-
     /**
      * 人工工时
      */
+    @Excel(name = "人工工时", width = 15)
     @ApiModelProperty(value = "人工工时")
-    @TableField("labor_hours")
     private BigDecimal laborHours;
-
     /**
      * 设备工时
      */
+    @Excel(name = "设备工时", width = 15)
     @ApiModelProperty(value = "设备工时")
-    @TableField("device_hours")
     private BigDecimal deviceHours;
-
     /**
      * 工作中心
      */
+    @Excel(name = "工作中心", width = 15)
     @ApiModelProperty(value = "工作中心")
-    @TableField("work_center")
     private String workCenter;
-
     /**
      * 创建人
      */
-    @TableField("create_by")
+    @ApiModelProperty(value = "创建人")
     private String createBy;
-
     /**
      * 创建时间
      */
-    @TableField("create_time")
-    private LocalDateTime createTime;
-
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
     /**
      * 修改人
      */
-    @TableField("update_by")
+    @ApiModelProperty(value = "修改人")
     private String updateBy;
-
     /**
      * 修改时间
      */
-    @TableField("update_time")
-    private LocalDateTime updateTime;
-
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
     /**
      * 备注
      */
+    @Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
-    @TableField("remark")
     private String remark;
-
-
-    public static final String ID = "id";
-
-    public static final String MATERIAL_CODE = "material_code";
-
-    public static final String MATERIAL_NAME = "material_name";
-
-    public static final String LEVEL = "level";
-
-    public static final String QUANTITY = "quantity";
-
-    public static final String PURCHASE_TYPE = "purchase_type";
-
-    public static final String WORK_PROCESS = "work_process";
-
-    public static final String DESCRIBED = "described";
-
-    public static final String LABOR_HOURS = "labor_hours";
-
-    public static final String DEVICE_HOURS = "device_hours";
-
-    public static final String WORK_CENTER = "work_center";
-
-    public static final String CREATE_BY = "create_by";
-
-    public static final String CREATE_TIME = "create_time";
-
-    public static final String UPDATE_BY = "update_by";
-
-    public static final String UPDATE_TIME = "update_time";
-
-    public static final String REMARK = "remark";
-
 }

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/CostPartMissingInfo.java → qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/AppSceneCostPartMissingInfo.java

@@ -1,28 +1,22 @@
 package com.zzsmart.qomo.kn.cost.manage.entity;
 
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import lombok.Builder;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.io.Serializable;
 
 /**
- * @Description: 标准成本-部件缺失信息
- * @Author: wangqiong
- * @Date:   2024-06-13
+ * @Description: app_scene_cost_part_missing_info
+ * @Author: jeecg-boot
+ * @Date: 2024-08-02
  * @Version: V1.0
  */
 @Data
@@ -30,28 +24,38 @@ import lombok.experimental.Accessors;
 @TableName("app_scene_cost_part_missing_info")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="app_scene_cost_part_missing_info对象", description="app_scene_cost_part_missing_info")
-public class CostPartMissingInfo implements Serializable {
+@ApiModel(value = "app_scene_cost_part_missing_info对象", description = "app_scene_cost_part_missing_info")
+public class AppSceneCostPartMissingInfo implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/**id*/
-	@TableId(type = IdType.ASSIGN_ID)
+    /**
+     * id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "id")
     private String id;
-	/**标准成本表主键id*/
-	@Excel(name = "标准成本表主键id", width = 15)
-    @ApiModelProperty(value = "标准成本表主键id")
-    private String costStandardId;
-	/**物料号*/
-	@Excel(name = "物料号", width = 15)
+    /**
+     * 物料号
+     */
+    @Excel(name = "物料号", width = 15)
     @ApiModelProperty(value = "物料号")
     private String materialNumber;
-	/**版本号*/
-	@Excel(name = "版本号", width = 15)
+    /**
+     * 版本号
+     */
+    @Excel(name = "版本号", width = 15)
     @ApiModelProperty(value = "版本号")
     private String versionNumber;
-	/**缺失信息*/
-	@Excel(name = "缺失信息", width = 15)
+    /**
+     * 缺失信息
+     */
+    @Excel(name = "缺失信息", width = 15)
     @ApiModelProperty(value = "缺失信息")
     private String missingInfo;
+    /**
+     * 标准成本表主键id
+     */
+    @Excel(name = "标准成本表主键id", width = 15)
+    @ApiModelProperty(value = "标准成本表主键id")
+    private String costStandardId;
 }

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/AppSceneCostPurchasePrice.java

@@ -0,0 +1,173 @@
+package com.zzsmart.qomo.kn.cost.manage.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Description: app_scene_cost_purchase_price
+ * @Author: jeecg-boot
+ * @Date: 2024-08-02
+ * @Version: V1.0
+ */
+@Data
+@TableName("app_scene_cost_purchase_price")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "app_scene_cost_purchase_price对象", description = "app_scene_cost_purchase_price")
+public class AppSceneCostPurchasePrice implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+    /**
+     * 物料编码
+     */
+    @Excel(name = "物料编码", width = 15)
+    @ApiModelProperty(value = "物料编码")
+    private String materialCode;
+    /**
+     * 物料名称
+     */
+    @Excel(name = "物料名称", width = 15)
+    @ApiModelProperty(value = "物料名称")
+    private String materialName;
+    /**
+     * 规格型号
+     */
+    @Excel(name = "规格型号", width = 15)
+    @ApiModelProperty(value = "规格型号")
+    private String specification;
+    /**
+     * 采购类型
+     */
+    @Excel(name = "采购类型", width = 15)
+    @ApiModelProperty(value = "采购类型")
+    private String purchaseType;
+    /**
+     * 供应商代码
+     */
+    @Excel(name = "供应商代码", width = 15)
+    @ApiModelProperty(value = "供应商代码")
+    private String supplierCode;
+    /**
+     * 供应商名称
+     */
+    @Excel(name = "供应商名称", width = 15)
+    @ApiModelProperty(value = "供应商名称")
+    private String supplierName;
+    /**
+     * 采购价时间
+     */
+    @Excel(name = "采购价时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "采购价时间")
+    private Date purchasePriceTime;
+    /**
+     * 采购价合计
+     */
+    @Excel(name = "采购价合计", width = 15)
+    @ApiModelProperty(value = "采购价合计")
+    private BigDecimal purchasePriceSum;
+    /**
+     * 最低采购单价
+     */
+    @Excel(name = "最低采购单价", width = 15)
+    @ApiModelProperty(value = "最低采购单价")
+    private BigDecimal minPurchasePrice;
+    /**
+     * 最新采购单价
+     */
+    @Excel(name = "最新采购单价", width = 15)
+    @ApiModelProperty(value = "最新采购单价")
+    private BigDecimal lastPurchasePrice;
+    /**
+     * 平均采购价
+     */
+    @Excel(name = "平均采购价", width = 15)
+    @ApiModelProperty(value = "平均采购价")
+    private BigDecimal purchasePriceAvg;
+    /**
+     * 直接材料费
+     */
+    @Excel(name = "直接材料费", width = 15)
+    @ApiModelProperty(value = "直接材料费")
+    private BigDecimal directMaterialCost;
+    /**
+     * 工艺加工费用
+     */
+    @Excel(name = "工艺加工费用", width = 15)
+    @ApiModelProperty(value = "工艺加工费用")
+    private BigDecimal processCost;
+    /**
+     * 运输费用
+     */
+    @Excel(name = "运输费用", width = 15)
+    @ApiModelProperty(value = "运输费用")
+    private BigDecimal transportCost;
+    /**
+     * 模具费用
+     */
+    @Excel(name = "模具费用", width = 15)
+    @ApiModelProperty(value = "模具费用")
+    private BigDecimal mouldCost;
+    /**
+     * 其他费用
+     */
+    @Excel(name = "其他费用", width = 15)
+    @ApiModelProperty(value = "其他费用")
+    private BigDecimal ortherCost;
+    /**
+     * 税率
+     */
+    @Excel(name = "税率", width = 15)
+    @ApiModelProperty(value = "税率")
+    private BigDecimal taxTate;
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    /**
+     * 创建时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+    /**
+     * 修改人
+     */
+    @ApiModelProperty(value = "修改人")
+    private String updateBy;
+    /**
+     * 修改时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+    /**
+     * 备注
+     */
+    @Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private String remark;
+}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/CostStandardVersion.java → qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/AppSceneCostStandardVersion.java

@@ -17,18 +17,18 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * @Description: 标准成本-版本号
- * @Author: wangqiong
- * @Date: 2024-06-13
+ * @Description: app_scene_cost_standard_version
+ * @Author: jeecg-boot
+ * @Date: 2024-08-02
  * @Version: V1.0
  */
 @Data
-@TableName("app_scene_cost_standard_version")
 @Builder
+@TableName("app_scene_cost_standard_version")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value = "app_scene_cost_standard_version对象", description = "app_scene_cost_standard_version")
-public class CostStandardVersion implements Serializable {
+public class AppSceneCostStandardVersion implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
@@ -37,7 +37,6 @@ public class CostStandardVersion implements Serializable {
     @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "id")
     private String id;
-
     /**
      * 图号
      */
@@ -47,23 +46,25 @@ public class CostStandardVersion implements Serializable {
     /**
      * 阶段，A-初始，B-首批，C-量产
      */
-    @Excel(name = "阶段", width = 15)
-    @ApiModelProperty(value = "阶段")
+    @Excel(name = "阶段，A-初始，B-首批，C-量产", width = 15)
+    @ApiModelProperty(value = "阶段，A-初始，B-首批，C-量产")
     private String stage;
     /**
-     * 物料号
+     * 物料号,关联kn_new_sap_mara表matnr字段
      */
-    @Excel(name = "物料号", width = 15)
-    @ApiModelProperty(value = "物料号")
+    @Excel(name = "物料号,关联kn_new_sap_mara表matnr字段", width = 15)
+    @ApiModelProperty(value = "物料号,关联kn_new_sap_mara表matnr字段")
     private String materialNumber;
     /**
      * 版本号
      */
+    @Excel(name = "版本号", width = 15)
     @ApiModelProperty(value = "版本号")
     private String versionNumber;
     /**
      * 版本状态
      */
+    @Excel(name = "版本状态", width = 15)
     @ApiModelProperty(value = "版本状态")
     private String versionStatus;
     /**
@@ -93,11 +94,13 @@ public class CostStandardVersion implements Serializable {
     /**
      * 备注
      */
+    @Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
     private String remark;
     /**
      * 年份
      */
+    @Excel(name = "年份", width = 15)
     @ApiModelProperty(value = "年份")
     private String versionYear;
 }

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/CostMaterialBom.java

@@ -1,335 +0,0 @@
-package com.zzsmart.qomo.kn.cost.manage.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 物料bom
- * </p>
- *
- * @author  
- * @since 2024-06-21
- */
-@Getter
-@Setter
-@Accessors(chain = true)
-@TableName("app_scene_cost_material_bom")
-public class CostMaterialBom implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * id
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private String id;
-
-    /**
-     * 物料编码
-     */
-    @TableField("material_code")
-    private String materialCode;
-
-    /**
-     * 物料名称
-     */
-    @TableField("material_name")
-    private String materialName;
-
-    /**
-     * 父级物料编码
-     */
-    @TableField("parent_material_code")
-    private String parentMaterialCode;
-
-    /**
-     * 级别
-     */
-    @TableField("level")
-    private String level;
-
-    /**
-     * 排序
-     */
-    @TableField("sort")
-    private Integer sort;
-
-    /**
-     * 计量单位
-     */
-    @TableField("unit")
-    private String unit;
-
-    /**
-     * 数量
-     */
-    @TableField("number")
-    private Integer number;
-
-    /**
-     * 人工工时（分钟）
-     */
-    @TableField("labor_hours")
-    private BigDecimal laborHours;
-
-    /**
-     * 设备工时
-     */
-    @TableField("device_hours")
-    private BigDecimal deviceHours;
-
-    /**
-     * 借用物料编码
-     */
-    @TableField("borrow_material_code")
-    private String borrowMaterialCode;
-
-    /**
-     * 参考物料编码
-     */
-    @TableField("refer_material_code")
-    private String referMaterialCode;
-
-    /**
-     * 采购类型
-     */
-    @TableField("purchase_type")
-    private String purchaseType;
-
-    /**
-     * 特殊采购类型
-     */
-    @TableField("special_purchase_type")
-    private String specialPurchaseType;
-
-    /**
-     * 说明
-     */
-    @TableField("explanation")
-    private String explanation;
-
-    /**
-     * 单位数量
-     */
-    @TableField("quantity")
-    private BigDecimal quantity;
-
-    /**
-     * 重量（g）
-     */
-    @TableField("weight")
-    private String weight;
-
-    /**
-     * 材料/牌号
-     */
-    @TableField("material_and_brand")
-    private String materialAndBrand;
-
-    /**
-     * 表面处理，材料
-     */
-    @TableField("surface_material")
-    private String surfaceMaterial;
-
-    /**
-     * 厚度（mm）
-     */
-    @TableField("surface_thickness")
-    private String surfaceThickness;
-
-    /**
-     * 表面积（mm²）
-     */
-    @TableField("surface_area")
-    private String surfaceArea;
-
-    /**
-     * 长（mm）
-     */
-    @TableField("length")
-    private String length;
-
-    /**
-     * 宽（mm）
-     */
-    @TableField("width")
-    private String width;
-
-    /**
-     * 高（mm）
-     */
-    @TableField("height")
-    private String height;
-
-    /**
-     * 图示/图档/文档 文件ID
-     */
-    @TableField("figure_file_id")
-    private Long figureFileId;
-
-    /**
-     * 是否新摸具（0否 1是）
-     */
-    @TableField("new_tooling")
-    private Boolean newTooling;
-
-    /**
-     * 成型方式（枚举）
-     */
-    @TableField("shaping_method")
-    private String shapingMethod;
-
-    /**
-     * 作业内容
-     */
-    @TableField("work_content")
-    private String workContent;
-
-    /**
-     * 加工地点
-     */
-    @TableField("process_location")
-    private String processLocation;
-
-    /**
-     * 成本中心
-     */
-    @TableField("cost_center")
-    private String costCenter;
-
-    /**
-     * 单价（未税）
-     */
-    @TableField("unit_price")
-    private BigDecimal unitPrice;
-
-    /**
-     * 总价（未税）
-     */
-    @TableField("total_price")
-    private BigDecimal totalPrice;
-
-    /**
-     * 摸具费（未税）
-     */
-    @TableField("mould_price")
-    private BigDecimal mouldPrice;
-
-    /**
-     * 创建人
-     */
-    @TableField("create_by")
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private LocalDateTime createTime;
-
-    /**
-     * 修改人
-     */
-    @TableField("update_by")
-    private String updateBy;
-
-    /**
-     * 修改时间
-     */
-    @TableField("update_time")
-    private LocalDateTime updateTime;
-
-    /**
-     * 备注（特殊技术信息）
-     */
-    @TableField("remark")
-    private String remark;
-
-
-    public static final String ID = "id";
-
-    public static final String MATERIAL_CODE = "material_code";
-
-    public static final String MATERIAL_NAME = "material_name";
-
-    public static final String PARENT_MATERIAL_CODE = "parent_material_code";
-
-    public static final String LEVEL = "level";
-
-    public static final String SORT = "sort";
-
-    public static final String UNIT = "unit";
-
-    public static final String NUMBER = "number";
-
-    public static final String LABOR_HOURS = "labor_hours";
-
-    public static final String DEVICE_HOURS = "device_hours";
-
-    public static final String BORROW_MATERIAL_CODE = "borrow_material_code";
-
-    public static final String REFER_MATERIAL_CODE = "refer_material_code";
-
-    public static final String PURCHASE_TYPE = "purchase_type";
-
-    public static final String SPECIAL_PURCHASE_TYPE = "special_purchase_type";
-
-    public static final String EXPLANATION = "explanation";
-
-    public static final String QUANTITY = "quantity";
-
-    public static final String WEIGHT = "weight";
-
-    public static final String MATERIAL_AND_BRAND = "material_and_brand";
-
-    public static final String SURFACE_MATERIAL = "surface_material";
-
-    public static final String SURFACE_THICKNESS = "surface_thickness";
-
-    public static final String SURFACE_AREA = "surface_area";
-
-    public static final String LENGTH = "length";
-
-    public static final String WIDTH = "width";
-
-    public static final String HEIGHT = "height";
-
-    public static final String FIGURE_FILE_ID = "figure_file_id";
-
-    public static final String NEW_TOOLING = "new_tooling";
-
-    public static final String SHAPING_METHOD = "shaping_method";
-
-    public static final String WORK_CONTENT = "work_content";
-
-    public static final String PROCESS_LOCATION = "process_location";
-
-    public static final String COST_CENTER = "cost_center";
-
-    public static final String UNIT_PRICE = "unit_price";
-
-    public static final String TOTAL_PRICE = "total_price";
-
-    public static final String MOULD_PRICE = "mould_price";
-
-    public static final String CREATE_BY = "create_by";
-
-    public static final String CREATE_TIME = "create_time";
-
-    public static final String UPDATE_BY = "update_by";
-
-    public static final String UPDATE_TIME = "update_time";
-
-    public static final String REMARK = "remark";
-
-}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/CostModel.java

@@ -1,135 +0,0 @@
-package com.zzsmart.qomo.kn.cost.manage.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author  
- * @since 2024-07-11
- */
-@Getter
-@Setter
-@Accessors(chain = true)
-@TableName("app_scene_cost_model")
-public class CostModel implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 模型名称
-     */
-    @ApiModelProperty(value = "模型名称")
-    @TableField("model_name")
-    private String modelName;
-
-    /**
-     * 图号
-     */
-    @ApiModelProperty(value = "图号")
-    @TableField("drawing_no")
-    private Integer drawingNo;
-
-    /**
-     * 物料号
-     */
-    @ApiModelProperty(value = "物料号")
-    @TableField("material_no")
-    private Integer materialNo;
-
-    /**
-     * 物料类型
-     */
-    @ApiModelProperty(value = "物料类型")
-    @TableField("material_type")
-    private String materialType;
-
-    /**
-     * 模型版本
-     */
-    @ApiModelProperty(value = "模型版本")
-    @TableField("model_version")
-    private String modelVersion;
-
-    /**
-     * 状态
-     */
-    @ApiModelProperty(value = "状态")
-    @TableField("status")
-    private String status;
-
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_time")
-    private LocalDateTime createTime;
-
-    /**
-     * 创建人
-     */
-    @TableField("create_by")
-    private Integer createBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField("update_time")
-    private LocalDateTime updateTime;
-
-    /**
-     * 更新人
-     */
-    @TableField("update_by")
-    private Integer updateBy;
-
-    /**
-     * 模型配置信息
-     */
-    @TableField("cost_model_detail")
-    private String costModelDetail;
-
-
-    public static final String ID = "id";
-
-    public static final String MODEL_NAME = "model_name";
-
-    public static final String DRAWING_NO = "drawing_no";
-
-    public static final String MATERIAL_NO = "material_no";
-
-    public static final String MATERIAL_TYPE = "material_type";
-
-    public static final String MODEL_VERSION = "model_version";
-
-    public static final String STATUS = "status";
-
-    public static final String CREATE_TIME = "create_time";
-
-    public static final String CREATE_BY = "create_by";
-
-    public static final String UPDATE_TIME = "update_time";
-
-    public static final String UPDATE_BY = "update_by";
-
-    public static final String COST_MODEL_DETAIL = "cost_model_detail";
-
-}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/CostPurchasePrice.java

@@ -1,215 +0,0 @@
-package com.zzsmart.qomo.kn.cost.manage.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 物料采购单价
- * </p>
- *
- * @author  
- * @since 2024-06-19
- */
-@Getter
-@Setter
-@Accessors(chain = true)
-@TableName("app_scene_cost_purchase_price")
-public class CostPurchasePrice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private String id;
-
-    /**
-     * 物料编码
-     */
-    @TableField("material_code")
-    private String materialCode;
-
-    /**
-     * 物料名称
-     */
-    @TableField("material_name")
-    private String materialName;
-
-    /**
-     * 规格型号
-     */
-    @TableField("specification")
-    private String specification;
-
-    /**
-     * 采购类型
-     */
-    @TableField("purchase_type")
-    private String purchaseType;
-
-    /**
-     * 供应商代码
-     */
-    @TableField("supplier_code")
-    private String supplierCode;
-
-    /**
-     * 供应商名称
-     */
-    @TableField("supplier_name")
-    private String supplierName;
-
-    /**
-     * 采购价时间
-     */
-    @TableField("purchase_price_time")
-    private LocalDateTime purchasePriceTime;
-
-    /**
-     * 采购价合计
-     */
-    @TableField("purchase_price_sum")
-    private BigDecimal purchasePriceSum;
-
-    /**
-     * 最低采购单价
-     */
-    @TableField("min_purchase_price")
-    private BigDecimal minPurchasePrice;
-
-    /**
-     * 最新采购单价
-     */
-    @TableField("last_purchase_price")
-    private BigDecimal lastPurchasePrice;
-
-    /**
-     * 平均采购价
-     */
-    @TableField("purchase_price_avg")
-    private BigDecimal purchasePriceAvg;
-
-    /**
-     * 直接材料费
-     */
-    @TableField("direct_material_cost")
-    private BigDecimal directMaterialCost;
-
-    /**
-     * 工艺加工费用
-     */
-    @TableField("process_cost")
-    private BigDecimal processCost;
-
-    /**
-     * 运输费用
-     */
-    @TableField("transport_cost")
-    private BigDecimal transportCost;
-
-    /**
-     * 模具费用
-     */
-    @TableField("mould_cost")
-    private BigDecimal mouldCost;
-
-    /**
-     * 其他费用
-     */
-    @TableField("orther_cost")
-    private BigDecimal ortherCost;
-
-    /**
-     * 税率
-     */
-    @TableField("tax_tate")
-    private BigDecimal taxTate;
-
-    /**
-     * 创建人
-     */
-    @TableField("create_by")
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private LocalDateTime createTime;
-
-    /**
-     * 修改人
-     */
-    @TableField("update_by")
-    private String updateBy;
-
-    /**
-     * 修改时间
-     */
-    @TableField("update_time")
-    private LocalDateTime updateTime;
-
-    /**
-     * 备注
-     */
-    @TableField("remark")
-    private String remark;
-
-
-    public static final String ID = "id";
-
-    public static final String MATERIAL_CODE = "material_code";
-
-    public static final String MATERIAL_NAME = "material_name";
-
-    public static final String SPECIFICATION = "specification";
-
-    public static final String PURCHASE_TYPE = "purchase_type";
-
-    public static final String SUPPLIER_CODE = "supplier_code";
-
-    public static final String SUPPLIER_NAME = "supplier_name";
-
-    public static final String PURCHASE_PRICE_TIME = "purchase_price_time";
-
-    public static final String PURCHASE_PRICE_SUM = "purchase_price_sum";
-
-    public static final String MIN_PURCHASE_PRICE = "min_purchase_price";
-
-    public static final String LAST_PURCHASE_PRICE = "last_purchase_price";
-
-    public static final String PURCHASE_PRICE_AVG = "purchase_price_avg";
-
-    public static final String DIRECT_MATERIAL_COST = "direct_material_cost";
-
-    public static final String PROCESS_COST = "process_cost";
-
-    public static final String TRANSPORT_COST = "transport_cost";
-
-    public static final String MOULD_COST = "mould_cost";
-
-    public static final String ORTHER_COST = "orther_cost";
-
-    public static final String TAX_TATE = "tax_tate";
-
-    public static final String CREATE_BY = "create_by";
-
-    public static final String CREATE_TIME = "create_time";
-
-    public static final String UPDATE_BY = "update_by";
-
-    public static final String UPDATE_TIME = "update_time";
-
-    public static final String REMARK = "remark";
-
-}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/HourRate.java

@@ -1,99 +0,0 @@
-package com.zzsmart.qomo.kn.cost.manage.entity;
-
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * @Description: hour_rate
- * @Author: jeecg-boot
- * @Date:   2024-06-06
- * @Version: V1.0
- */
-@Data
-@TableName("app_scene_cost_hour_rate")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="hour_rate对象", description="hour_rate")
-public class HourRate implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-	/**年度*/
-	@Excel(name = "年度", width = 15)
-    @ApiModelProperty(value = "年度")
-    private java.lang.String year;
-	/**成本中心代码*/
-	@Excel(name = "成本中心代码", width = 15)
-    @ApiModelProperty(value = "成本中心代码")
-    private java.lang.String costCenterCode;
-	/**工厂代码*/
-	@Excel(name = "工厂代码", width = 15)
-    @ApiModelProperty(value = "工厂代码")
-    private java.lang.String factory;
-	/**人工小时费率*/
-	@Excel(name = "人工小时费率", width = 15)
-    @ApiModelProperty(value = "人工小时费率")
-    private java.math.BigDecimal laborHourRate;
-	/**设备小时费率*/
-	@Excel(name = "设备小时费率", width = 15)
-    @ApiModelProperty(value = "设备小时费率")
-    private java.math.BigDecimal equipHourRate;
-	/**燃动小时费率*/
-	@Excel(name = "燃动小时费率", width = 15)
-    @ApiModelProperty(value = "燃动小时费率")
-    private java.math.BigDecimal fuelHourRate;
-	/**辅料小时费率*/
-	@Excel(name = "辅料小时费率", width = 15)
-    @ApiModelProperty(value = "辅料小时费率")
-    private java.math.BigDecimal auxiliaryHourRate;
-	/**其他小时费率*/
-	@Excel(name = "其他小时费率", width = 15)
-    @ApiModelProperty(value = "其他小时费率")
-    private java.math.BigDecimal otherHourRate;
-	/**生效日期*/
-	@Excel(name = "生效日期", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    @ApiModelProperty(value = "生效日期")
-    private java.util.Date effectiveDate;
-	/**失效日期*/
-	@Excel(name = "失效日期", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    @ApiModelProperty(value = "失效日期")
-    private java.util.Date expirationDate;
-	/**维护人员*/
-	@Excel(name = "维护人员", width = 15)
-    @ApiModelProperty(value = "维护人员")
-    private java.lang.String guardian;
-	/**维护时间*/
-	@Excel(name = "维护时间", width = 15)
-    @ApiModelProperty(value = "维护时间")
-    private java.lang.String maintenanceTime;
-	/**预留字段1*/
-	@Excel(name = "预留字段1", width = 15)
-    @ApiModelProperty(value = "预留字段1")
-    @TableField(value = "reserve_1")
-    private java.lang.String reserve1;
-	/**预留字段2*/
-	@Excel(name = "预留字段2", width = 15)
-    @ApiModelProperty(value = "预留字段2")
-    @TableField(value = "reserve_2")
-    private java.math.BigDecimal reserve2;
-	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
-    @ApiModelProperty(value = "主键")
-    private java.lang.String id;
-}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/AppSceneCostHourRateMapper.java

@@ -0,0 +1,14 @@
+package com.zzsmart.qomo.kn.cost.manage.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zzsmart.qomo.kn.cost.manage.entity.AppSceneCostHourRate;
+
+/**
+ * @Description: app_scene_cost_hour_rate
+ * @Author: jeecg-boot
+ * @Date: 2024-08-02
+ * @Version: V1.0
+ */
+public interface AppSceneCostHourRateMapper extends BaseMapper<AppSceneCostHourRate> {
+
+}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/CostMaterialBomMapper.java → qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/AppSceneCostMaterialBomMapper.java

@@ -2,24 +2,19 @@ package com.zzsmart.qomo.kn.cost.manage.mapper;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zzsmart.qomo.kn.cost.manage.entity.CostMaterialBom;
-import org.apache.ibatis.annotations.Mapper;
+import com.zzsmart.qomo.kn.cost.manage.entity.AppSceneCostMaterialBom;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
-import java.sql.Blob;
 import java.util.List;
 
 /**
- * <p>
- * 物料bom Mapper 接口
- * </p>
- *
- * @author
- * @since 2024-06-21
+ * @Description: app_scene_cost_material_bom
+ * @Author: jeecg-boot
+ * @Date: 2024-08-02
+ * @Version: V1.0
  */
-@Mapper
-public interface CostMaterialBomMapper extends BaseMapper<CostMaterialBom> {
+public interface AppSceneCostMaterialBomMapper extends BaseMapper<AppSceneCostMaterialBom> {
     /**
      * 根据动态SQL语句查询物料BOM表
      *
@@ -27,11 +22,13 @@ public interface CostMaterialBomMapper extends BaseMapper<CostMaterialBom> {
      * @return
      */
     @Select("${selectCommand}")
-    List<CostMaterialBom> customSelect(@Param("selectCommand") String selectCommand);
+    List<AppSceneCostMaterialBom> customSelect(@Param("selectCommand") String selectCommand);
 
 
     @Select("${selectSql}")
     JSONObject customSelectOne(@Param("selectSql") String selectSql);
+
     @Select("${SelectBlobModel}")
     String customSelectBlobModelJson(@Param("SelectBlobModel") String SelectBlobModel);
+
 }

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/AppSceneCostMaterialProcessHoursMapper.java

@@ -0,0 +1,14 @@
+package com.zzsmart.qomo.kn.cost.manage.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zzsmart.qomo.kn.cost.manage.entity.AppSceneCostMaterialProcessHours;
+
+/**
+ * @Description: app_scene_cost_material_process_hours
+ * @Author: jeecg-boot
+ * @Date: 2024-08-02
+ * @Version: V1.0
+ */
+public interface AppSceneCostMaterialProcessHoursMapper extends BaseMapper<AppSceneCostMaterialProcessHours> {
+
+}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/AppSceneCostPartMissingInfoMapper.java

@@ -0,0 +1,14 @@
+package com.zzsmart.qomo.kn.cost.manage.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zzsmart.qomo.kn.cost.manage.entity.AppSceneCostPartMissingInfo;
+
+/**
+ * @Description: app_scene_cost_part_missing_info
+ * @Author: jeecg-boot
+ * @Date: 2024-08-02
+ * @Version: V1.0
+ */
+public interface AppSceneCostPartMissingInfoMapper extends BaseMapper<AppSceneCostPartMissingInfo> {
+
+}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/AppSceneCostPurchasePriceMapper.java

@@ -0,0 +1,14 @@
+package com.zzsmart.qomo.kn.cost.manage.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zzsmart.qomo.kn.cost.manage.entity.AppSceneCostPurchasePrice;
+
+/**
+ * @Description: app_scene_cost_purchase_price
+ * @Author: jeecg-boot
+ * @Date: 2024-08-02
+ * @Version: V1.0
+ */
+public interface AppSceneCostPurchasePriceMapper extends BaseMapper<AppSceneCostPurchasePrice> {
+
+}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/AppSceneCostStandardVersionMapper.java

@@ -0,0 +1,17 @@
+package com.zzsmart.qomo.kn.cost.manage.mapper;
+
+import java.util.List;
+
+import com.zzsmart.qomo.kn.cost.manage.entity.AppSceneCostStandardVersion;
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: app_scene_cost_standard_version
+ * @Author: jeecg-boot
+ * @Date:   2024-08-02
+ * @Version: V1.0
+ */
+public interface AppSceneCostStandardVersionMapper extends BaseMapper<AppSceneCostStandardVersion> {
+
+}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/CostMaterialProcessHoursMapper.java

@@ -1,18 +0,0 @@
-package com.zzsmart.qomo.kn.cost.manage.mapper;
-
-import com.zzsmart.qomo.kn.cost.manage.entity.CostMaterialProcessHours;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- * 物料工时工序表 Mapper 接口
- * </p>
- *
- * @author  
- * @since 2024-06-19
- */
-@Mapper
-public interface CostMaterialProcessHoursMapper extends BaseMapper<CostMaterialProcessHours> {
-
-}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/CostPartMissingInfoMapper.java

@@ -1,18 +0,0 @@
-package com.zzsmart.qomo.kn.cost.manage.mapper;
-
-import java.util.List;
-
-import com.zzsmart.qomo.kn.cost.manage.entity.CostPartMissingInfo;
-import org.apache.ibatis.annotations.Param;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 标准成本-部件缺失信息
- * @Author: wangqiong
- * @Date:   2024-06-13
- * @Version: V1.0
- */
-public interface CostPartMissingInfoMapper extends BaseMapper<CostPartMissingInfo> {
-
-}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/CostPurchasePriceMapper.java

@@ -1,18 +0,0 @@
-package com.zzsmart.qomo.kn.cost.manage.mapper;
-
-import com.zzsmart.qomo.kn.cost.manage.entity.CostPurchasePrice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- * 物料采购单价 Mapper 接口
- * </p>
- *
- * @author  
- * @since 2024-06-19
- */
-@Mapper
-public interface CostPurchasePriceMapper extends BaseMapper<CostPurchasePrice> {
-
-}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/CostStandardVersionMapper.java

@@ -1,18 +0,0 @@
-package com.zzsmart.qomo.kn.cost.manage.mapper;
-
-import java.util.List;
-
-import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardVersion;
-import org.apache.ibatis.annotations.Param;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 标准成本-版本号
- * @Author: wangqiong
- * @Date:   2024-06-13
- * @Version: V1.0
- */
-public interface CostStandardVersionMapper extends BaseMapper<CostStandardVersion> {
-
-}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/HourRateMapper.java

@@ -1,14 +0,0 @@
-package com.zzsmart.qomo.kn.cost.manage.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zzsmart.qomo.kn.cost.manage.entity.HourRate;
-
-/**
- * @Description: hour_rate
- * @Author: jeecg-boot
- * @Date:   2024-06-06
- * @Version: V1.0
- */
-public interface HourRateMapper extends BaseMapper<HourRate> {
-
-}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml/CostStandardVersionMapper.xml → qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml/AppSceneCostHourRateMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zzsmart.qomo.kn.cost.manage.mapper.CostStandardVersionMapper">
+<mapper namespace="com.zzsmart.qomo.kn.cost.manage.mapper.AppSceneCostHourRateMapper">
 
 </mapper>

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml/CostPartMissingInfoMapper.xml → qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml/AppSceneCostMaterialBomMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zzsmart.qomo.kn.cost.manage.mapper.CostPartMissingInfoMapper">
+<mapper namespace="com.zzsmart.qomo.kn.cost.manage.mapper.AppSceneCostMaterialBomMapper">
 
 </mapper>

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml/AppSceneCostMaterialProcessHoursMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zzsmart.qomo.kn.cost.manage.mapper.AppSceneCostMaterialProcessHoursMapper">
+
+</mapper>

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml/AppSceneCostPartMissingInfoMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zzsmart.qomo.kn.cost.manage.mapper.AppSceneCostPartMissingInfoMapper">
+
+</mapper>

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml/HourRateMapper.xml → qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml/AppSceneCostPurchasePriceMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zzsmart.qomo.kn.cost.manage.mapper.HourRateMapper">
+<mapper namespace="com.zzsmart.qomo.kn.cost.manage.mapper.AppSceneCostPurchasePriceMapper">
 
 </mapper>

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml/AppSceneCostStandardDetailMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zzsmart.qomo.modules.demo.com.zzsmart.qomo.kn.cost.manage.mapper.AppSceneCostStandardDetailMapper">
+<mapper namespace="com.zzsmart.qomo.kn.cost.manage.mapper.AppSceneCostStandardDetailMapper">
 
 </mapper>

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml/AppSceneCostStandardVersionMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zzsmart.qomo.kn.cost.manage.mapper.AppSceneCostStandardVersionMapper">
+
+</mapper>

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml/CostMaterialBomMapper.xml

@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zzsmart.qomo.kn.cost.manage.mapper.CostMaterialBomMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.zzsmart.qomo.kn.cost.manage.entity.CostMaterialBom">
-        <id column="id" property="id" />
-        <result column="material_code" property="materialCode" />
-        <result column="material_name" property="materialName" />
-        <result column="parent_material_code" property="parentMaterialCode" />
-        <result column="level" property="level" />
-        <result column="sort" property="sort" />
-        <result column="unit" property="unit" />
-        <result column="number" property="number" />
-        <result column="labor_hours" property="laborHours" />
-        <result column="device_hours" property="deviceHours" />
-        <result column="borrow_material_code" property="borrowMaterialCode" />
-        <result column="refer_material_code" property="referMaterialCode" />
-        <result column="purchase_type" property="purchaseType" />
-        <result column="special_purchase_type" property="specialPurchaseType" />
-        <result column="explanation" property="explanation" />
-        <result column="quantity" property="quantity" />
-        <result column="weight" property="weight" />
-        <result column="material_and_brand" property="materialAndBrand" />
-        <result column="surface_material" property="surfaceMaterial" />
-        <result column="surface_thickness" property="surfaceThickness" />
-        <result column="surface_area" property="surfaceArea" />
-        <result column="length" property="length" />
-        <result column="width" property="width" />
-        <result column="height" property="height" />
-        <result column="figure_file_id" property="figureFileId" />
-        <result column="new_tooling" property="newTooling" />
-        <result column="shaping_method" property="shapingMethod" />
-        <result column="work_content" property="workContent" />
-        <result column="process_location" property="processLocation" />
-        <result column="cost_center" property="costCenter" />
-        <result column="unit_price" property="unitPrice" />
-        <result column="total_price" property="totalPrice" />
-        <result column="mould_price" property="mouldPrice" />
-        <result column="create_by" property="createBy" />
-        <result column="create_time" property="createTime" />
-        <result column="update_by" property="updateBy" />
-        <result column="update_time" property="updateTime" />
-        <result column="remark" property="remark" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, material_code, material_name, parent_material_code, level, sort, unit, number, labor_hours, device_hours, borrow_material_code, refer_material_code, purchase_type, special_purchase_type, explanation, quantity, weight, material_and_brand, surface_material, surface_thickness, surface_area, length, width, height, figure_file_id, new_tooling, shaping_method, work_content, process_location, cost_center, unit_price, total_price, mould_price, create_by, create_time, update_by, update_time, remark
-    </sql>
-
-</mapper>

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml/CostMaterialProcessHoursMapper.xml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zzsmart.qomo.kn.cost.manage.mapper.CostMaterialProcessHoursMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.zzsmart.qomo.kn.cost.manage.entity.CostMaterialProcessHours">
-        <id column="id" property="id" />
-        <result column="material_code" property="materialCode" />
-        <result column="material_name" property="materialName" />
-        <result column="level" property="level" />
-        <result column="quantity" property="quantity" />
-        <result column="purchase_type" property="purchaseType" />
-        <result column="work_process" property="workProcess" />
-        <result column="described" property="described" />
-        <result column="labor_hours" property="laborHours" />
-        <result column="device_hours" property="deviceHours" />
-        <result column="work_center" property="workCenter" />
-        <result column="create_by" property="createBy" />
-        <result column="create_time" property="createTime" />
-        <result column="update_by" property="updateBy" />
-        <result column="update_time" property="updateTime" />
-        <result column="remark" property="remark" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, material_code, material_name, level, quantity, purchase_type, work_process, described, labor_hours, device_hours, work_center, create_by, create_time, update_by, update_time, remark
-    </sql>
-
-</mapper>

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml/CostPurchasePriceMapper.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zzsmart.qomo.kn.cost.manage.mapper.CostPurchasePriceMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.zzsmart.qomo.kn.cost.manage.entity.CostPurchasePrice">
-        <id column="id" property="id" />
-        <result column="material_code" property="materialCode" />
-        <result column="material_name" property="materialName" />
-        <result column="specification" property="specification" />
-        <result column="purchase_type" property="purchaseType" />
-        <result column="supplier_code" property="supplierCode" />
-        <result column="supplier_name" property="supplierName" />
-        <result column="purchase_price_time" property="purchasePriceTime" />
-        <result column="purchase_price_sum" property="purchasePriceSum" />
-        <result column="min_purchase_price" property="minPurchasePrice" />
-        <result column="last_purchase_price" property="lastPurchasePrice" />
-        <result column="purchase_price_avg" property="purchasePriceAvg" />
-        <result column="direct_material_cost" property="directMaterialCost" />
-        <result column="process_cost" property="processCost" />
-        <result column="transport_cost" property="transportCost" />
-        <result column="mould_cost" property="mouldCost" />
-        <result column="orther_cost" property="ortherCost" />
-        <result column="tax_tate" property="taxTate" />
-        <result column="create_by" property="createBy" />
-        <result column="create_time" property="createTime" />
-        <result column="update_by" property="updateBy" />
-        <result column="update_time" property="updateTime" />
-        <result column="remark" property="remark" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, material_code, material_name, specification, purchase_type, supplier_code, supplier_name, purchase_price_time, purchase_price_sum, min_purchase_price, last_purchase_price, purchase_price_avg, direct_material_cost, process_cost, transport_cost, mould_cost, orther_cost, tax_tate, create_by, create_time, update_by, update_time, remark
-    </sql>
-
-</mapper>

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/plugin/StandardCostService.java

@@ -6,7 +6,7 @@ import com.zzsmart.qomo.kn.cost.manage.entity.*;
 import com.zzsmart.qomo.kn.cost.manage.enums.FeeTypeEnum;
 import com.zzsmart.qomo.kn.cost.manage.enums.HourOrRateTypeEnum;
 import com.zzsmart.qomo.kn.cost.manage.enums.TotalCostEnum;
-import com.zzsmart.qomo.kn.cost.manage.mapper.CostMaterialBomMapper;
+import com.zzsmart.qomo.kn.cost.manage.mapper.AppSceneCostMaterialBomMapper;
 import com.zzsmart.qomo.kn.cost.manage.service.*;
 import com.zzsmart.qomo.kn.cost.manage.vo.FlowTaskInfoVO;
 import com.zzsmart.qomo.kn.cost.manage.vo.TotalResultValue;
@@ -32,25 +32,25 @@ public class StandardCostService {
      * 物料BOM信息
      */
     @Autowired
-    CostMaterialBomMapper costMaterialBomMapper;
+    AppSceneCostMaterialBomMapper costMaterialBomMapper;
     @Autowired
-    CostMaterialBomService costMaterialBomService;
+    IAppSceneCostMaterialBomService costMaterialBomService;
 
     /**
      * 小时费率
      */
     @Autowired
-    IHourRateService iHourRateService;
+    IAppSceneCostHourRateService iHourRateService;
     /**
      * 采购单价
      */
     @Autowired
-    CostPurchasePriceService costPurchasePriceService;
+    IAppSceneCostPurchasePriceService costPurchasePriceService;
     /**
      * 工序
      */
     @Autowired
-    CostMaterialProcessHoursService costMaterialProcessHoursService;
+    IAppSceneCostMaterialProcessHoursService costMaterialProcessHoursService;
     /**
      * 标准成本计算结果
      */
@@ -111,11 +111,11 @@ public class StandardCostService {
             String sql = flowTaskInfoVO.getSqlString();
             log.info("传递过来的SQL语句：" + sql);
             //TODO 查询最顶部的BOM物料编号下所有的物料并进行层级排序
-            List<CostMaterialBom> list = standardCostService.costMaterialBomService.queryAllBomInfoBytopMaterialCode(topMaterialCode);
+            List<AppSceneCostMaterialBom> list = standardCostService.costMaterialBomService.queryAllBomInfoBytopMaterialCode(topMaterialCode);
             log.info("Full EmptyTask list: {}", list);
             //2.把查询的结果存放在临时表里（表命名规则：前缀_流程id_组件code）
             for (int i = 0; list != null && i < list.size(); i++) {
-                CostMaterialBom material = list.get(i);
+                AppSceneCostMaterialBom material = list.get(i);
                 AppSceneCostResultValue appSceneCostResultValue = AppSceneCostResultValue.builder().belongTopMaterialNo(topMaterialCode).marterialNo(material.getMaterialCode()).parentMarterialNo(material.getParentMaterialCode()).taskType(taskType).taskCode(taskCode).flowInstanceId(flowInstanceId).num(material.getNumber()).build();
                 standardCostService.iAppSceneCostResultValueService.save(appSceneCostResultValue);
             }
@@ -271,7 +271,7 @@ public class StandardCostService {
             JSONObject jsonObject = standardCostService.costMaterialBomMapper.customSelectOne(sql);
             BigDecimal hourRate = new BigDecimal("0");
             if (jsonObject != null) {
-                HourRate rate = JSON.toJavaObject(jsonObject, HourRate.class);
+                AppSceneCostHourRate rate = JSON.toJavaObject(jsonObject, AppSceneCostHourRate.class);
                 hourRate = rate.getLaborHourRate();
             }
             //1.查询出物料编号对应的下所有的BOM信息
@@ -283,17 +283,17 @@ public class StandardCostService {
                 MarterialNoList = list.stream().filter(s -> s.getMarterialNo() != null).map(AppSceneCostResultValue::getMarterialNo).collect(Collectors.toList());
             }
             //查询工序工时
-            Map<String, List<CostMaterialProcessHours>> processHoursMap = standardCostService.costMaterialProcessHoursService.getProcessHoursByMaterialNo(MarterialNoList);
+            Map<String, List<AppSceneCostMaterialProcessHours>> processHoursMap = standardCostService.costMaterialProcessHoursService.getProcessHoursByMaterialNo(MarterialNoList);
             for (int i = 0; i < list.size(); i++) {
                 AppSceneCostResultValue appSceneCostResultValue = list.get(i);
                 String marterialNo = appSceneCostResultValue.getMarterialNo();
                 if (marterialNo != null) {
                     BigDecimal totalCost = new BigDecimal("0.0");
                     BigDecimal laborHours = new BigDecimal("0.0");
-                    List<CostMaterialProcessHours> costMaterialProcessHours = processHoursMap.get(marterialNo);
+                    List<AppSceneCostMaterialProcessHours> costMaterialProcessHours = processHoursMap.get(marterialNo);
                     if (costMaterialProcessHours != null && costMaterialProcessHours.size() > 0) {
                         for (int j = 0; j < costMaterialProcessHours.size(); j++) {
-                            CostMaterialProcessHours processHours = costMaterialProcessHours.get(j);
+                            AppSceneCostMaterialProcessHours processHours = costMaterialProcessHours.get(j);
                             laborHours = laborHours.add(processHours.getLaborHours());
                             //计算总人工成本
                             totalCost = totalCost.add(processHours.getLaborHours().multiply(hourRate));
@@ -339,7 +339,7 @@ public class StandardCostService {
             JSONObject jsonObject = standardCostService.costMaterialBomMapper.customSelectOne(sql);
             BigDecimal hourRate = new BigDecimal("0");
             if (jsonObject != null) {
-                HourRate rate = JSON.toJavaObject(jsonObject, HourRate.class);
+                AppSceneCostHourRate rate = JSON.toJavaObject(jsonObject, AppSceneCostHourRate.class);
                 hourRate = rate.getLaborHourRate();
             }
             //1.查询出物料编号对应的下所有的BOM信息
@@ -350,7 +350,7 @@ public class StandardCostService {
             if (list != null && list.size() > 0) {
                 MarterialNoList = list.stream().filter(s -> s.getMarterialNo() != null).map(AppSceneCostResultValue::getMarterialNo).collect(Collectors.toList());
             }
-            Map<String, List<CostMaterialProcessHours>> processHoursMap = standardCostService.costMaterialProcessHoursService.getProcessHoursByMaterialNo(MarterialNoList);
+            Map<String, List<AppSceneCostMaterialProcessHours>> processHoursMap = standardCostService.costMaterialProcessHoursService.getProcessHoursByMaterialNo(MarterialNoList);
             //2.1机器折旧费（机器工时*费率）
             if (FeeTypeEnum.EquipmentFee.getCode().equals(feeType)) {
                 for (int i = 0; i < list.size(); i++) {
@@ -359,10 +359,10 @@ public class StandardCostService {
                     if (marterialNo != null) {
                         BigDecimal totalCost = new BigDecimal("0.0");
                         BigDecimal laborHours = new BigDecimal("0.0");
-                        List<CostMaterialProcessHours> costMaterialProcessHours = processHoursMap.get(marterialNo);
+                        List<AppSceneCostMaterialProcessHours> costMaterialProcessHours = processHoursMap.get(marterialNo);
                         if (costMaterialProcessHours != null && costMaterialProcessHours.size() > 0) {
                             for (int j = 0; j < costMaterialProcessHours.size(); j++) {
-                                CostMaterialProcessHours processHours = costMaterialProcessHours.get(j);
+                                AppSceneCostMaterialProcessHours processHours = costMaterialProcessHours.get(j);
                                 laborHours = laborHours.add(processHours.getDeviceHours());
                                 //计算机器成本
                                 totalCost = totalCost.add(processHours.getDeviceHours().multiply(hourRate));
@@ -381,10 +381,10 @@ public class StandardCostService {
                     if (marterialNo != null) {
                         BigDecimal totalCost = new BigDecimal("0.0");
                         BigDecimal laborHours = new BigDecimal("0.0");
-                        List<CostMaterialProcessHours> costMaterialProcessHours = processHoursMap.get(marterialNo);
+                        List<AppSceneCostMaterialProcessHours> costMaterialProcessHours = processHoursMap.get(marterialNo);
                         if (costMaterialProcessHours != null && costMaterialProcessHours.size() > 0) {
                             for (int j = 0; j < costMaterialProcessHours.size(); j++) {
-                                CostMaterialProcessHours processHours = costMaterialProcessHours.get(j);
+                                AppSceneCostMaterialProcessHours processHours = costMaterialProcessHours.get(j);
                                 //TODO 辅料工时来源
                                 laborHours = laborHours.add(processHours.getDeviceHours());
                                 //机物料消耗
@@ -404,10 +404,10 @@ public class StandardCostService {
                     if (marterialNo != null) {
                         BigDecimal totalCost = new BigDecimal("0.0");
                         BigDecimal laborHours = new BigDecimal("0.0");
-                        List<CostMaterialProcessHours> costMaterialProcessHours = processHoursMap.get(marterialNo);
+                        List<AppSceneCostMaterialProcessHours> costMaterialProcessHours = processHoursMap.get(marterialNo);
                         if (costMaterialProcessHours != null && costMaterialProcessHours.size() > 0) {
                             for (int j = 0; j < costMaterialProcessHours.size(); j++) {
-                                CostMaterialProcessHours processHours = costMaterialProcessHours.get(j);
+                                AppSceneCostMaterialProcessHours processHours = costMaterialProcessHours.get(j);
                                 //TODO 燃动力工时来源
                                 laborHours = laborHours.add(processHours.getDeviceHours());
                                 //水电费（燃动力工时*费率）成本
@@ -427,10 +427,10 @@ public class StandardCostService {
                     if (marterialNo != null) {
                         BigDecimal totalCost = new BigDecimal("0.0");
                         BigDecimal laborHours = new BigDecimal("0.0");
-                        List<CostMaterialProcessHours> costMaterialProcessHours = processHoursMap.get(marterialNo);
+                        List<AppSceneCostMaterialProcessHours> costMaterialProcessHours = processHoursMap.get(marterialNo);
                         if (costMaterialProcessHours != null && costMaterialProcessHours.size() > 0) {
                             for (int j = 0; j < costMaterialProcessHours.size(); j++) {
-                                CostMaterialProcessHours processHours = costMaterialProcessHours.get(j);
+                                AppSceneCostMaterialProcessHours processHours = costMaterialProcessHours.get(j);
                                 //TODO 其他工时来源
                                 laborHours = laborHours.add(processHours.getDeviceHours());
                                 //其他制费成本

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/CostMaterialBomService.java

@@ -1,30 +0,0 @@
-package com.zzsmart.qomo.kn.cost.manage.service;
-
-import com.zzsmart.qomo.kn.cost.manage.entity.CostMaterialBom;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 物料bom 服务类
- * </p>
- *
- * @author
- * @since 2024-06-21
- */
-public interface CostMaterialBomService extends IService<CostMaterialBom> {
-    /**
-     * 分页查询
-     * @param
-     * @return
-     */
-    List<CostMaterialBom> queryListResult(String materialNumber);
-
-    /**
-     * 查询最顶层物料编号下所有的物料
-     * @param topMaterialCode
-     * @return
-     */
-    List<CostMaterialBom> queryAllBomInfoBytopMaterialCode(String topMaterialCode);
-}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/CostMaterialProcessHoursService.java

@@ -1,22 +0,0 @@
-package com.zzsmart.qomo.kn.cost.manage.service;
-
-import com.zzsmart.qomo.kn.cost.manage.entity.CostMaterialProcessHours;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 物料工时工序表 服务类
- * </p>
- *
- * @author  
- * @since 2024-06-19
- */
-public interface CostMaterialProcessHoursService extends IService<CostMaterialProcessHours> {
-/**
- * 查询满足物料编号的工时工序
- */
- Map<String,List<CostMaterialProcessHours>> getProcessHoursByMaterialNo(List<String> materialNos);
-}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/IAppSceneCostHourRateService.java

@@ -0,0 +1,14 @@
+package com.zzsmart.qomo.kn.cost.manage.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zzsmart.qomo.kn.cost.manage.entity.AppSceneCostHourRate;
+
+/**
+ * @Description: app_scene_cost_hour_rate
+ * @Author: jeecg-boot
+ * @Date:   2024-08-02
+ * @Version: V1.0
+ */
+public interface IAppSceneCostHourRateService extends IService<AppSceneCostHourRate> {
+
+}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/IAppSceneCostMaterialBomService.java

@@ -0,0 +1,28 @@
+package com.zzsmart.qomo.kn.cost.manage.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zzsmart.qomo.kn.cost.manage.entity.AppSceneCostMaterialBom;
+
+import java.util.List;
+
+/**
+ * @Description: app_scene_cost_material_bom
+ * @Author: jeecg-boot
+ * @Date:   2024-08-02
+ * @Version: V1.0
+ */
+public interface IAppSceneCostMaterialBomService extends IService<AppSceneCostMaterialBom> {
+    /**
+     * 分页查询
+     * @param
+     * @return
+     */
+    List<AppSceneCostMaterialBom> queryListResult(String materialNumber);
+
+    /**
+     * 查询最顶层物料编号下所有的物料
+     * @param topMaterialCode
+     * @return
+     */
+    List<AppSceneCostMaterialBom> queryAllBomInfoBytopMaterialCode(String topMaterialCode);
+}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/IAppSceneCostMaterialProcessHoursService.java

@@ -0,0 +1,22 @@
+package com.zzsmart.qomo.kn.cost.manage.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zzsmart.qomo.kn.cost.manage.entity.AppSceneCostMaterialProcessHours;
+import com.zzsmart.qomo.kn.cost.manage.mapper.AppSceneCostMaterialProcessHoursMapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: app_scene_cost_material_process_hours
+ * @Author: jeecg-boot
+ * @Date:   2024-08-02
+ * @Version: V1.0
+ */
+public interface IAppSceneCostMaterialProcessHoursService extends IService<AppSceneCostMaterialProcessHours> {
+    /**
+     * 查询满足物料编号的工时工序
+     */
+    Map<String, List<AppSceneCostMaterialProcessHours>> getProcessHoursByMaterialNo(List<String> materialNos);
+
+}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/IAppSceneCostPartMissingInfoService.java

@@ -0,0 +1,14 @@
+package com.zzsmart.qomo.kn.cost.manage.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zzsmart.qomo.kn.cost.manage.entity.AppSceneCostPartMissingInfo;
+
+/**
+ * @Description: app_scene_cost_part_missing_info
+ * @Author: jeecg-boot
+ * @Date: 2024-08-02
+ * @Version: V1.0
+ */
+public interface IAppSceneCostPartMissingInfoService extends IService<AppSceneCostPartMissingInfo> {
+
+}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/CostPurchasePriceService.java → qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/IAppSceneCostPurchasePriceService.java

@@ -1,24 +1,22 @@
 package com.zzsmart.qomo.kn.cost.manage.service;
 
-import com.zzsmart.qomo.kn.cost.manage.entity.CostMaterialProcessHours;
-import com.zzsmart.qomo.kn.cost.manage.entity.CostPurchasePrice;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zzsmart.qomo.kn.cost.manage.entity.AppSceneCostPurchasePrice;
 
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
 /**
- * <p>
- * 物料采购单价 服务类
- * </p>
- *
- * @author  
- * @since 2024-06-19
+ * @Description: app_scene_cost_purchase_price
+ * @Author: jeecg-boot
+ * @Date:   2024-08-02
+ * @Version: V1.0
  */
-public interface CostPurchasePriceService extends IService<CostPurchasePrice> {
+public interface IAppSceneCostPurchasePriceService extends IService<AppSceneCostPurchasePrice> {
     /**
      * 查询满足物料编号的最低采购价
      */
     Map<String, BigDecimal> getMinCostPurchasePriceByMaterialNo(List<String> materialNos);
+
 }

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/IAppSceneCostStandardVersionService.java

@@ -0,0 +1,14 @@
+package com.zzsmart.qomo.kn.cost.manage.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zzsmart.qomo.kn.cost.manage.entity.AppSceneCostStandardVersion;
+
+/**
+ * @Description: app_scene_cost_standard_version
+ * @Author: jeecg-boot
+ * @Date:   2024-08-02
+ * @Version: V1.0
+ */
+public interface IAppSceneCostStandardVersionService extends IService<AppSceneCostStandardVersion> {
+
+}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/ICostPartMissingInfoService.java

@@ -1,14 +0,0 @@
-package com.zzsmart.qomo.kn.cost.manage.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zzsmart.qomo.kn.cost.manage.entity.CostPartMissingInfo;
-
-/**
- * @Description: 标准成本-部件缺失信息
- * @Author: wangqiong
- * @Date:   2024-06-13
- * @Version: V1.0
- */
-public interface ICostPartMissingInfoService extends IService<CostPartMissingInfo> {
-
-}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/ICostStandardVersionService.java

@@ -1,35 +0,0 @@
-package com.zzsmart.qomo.kn.cost.manage.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zzsmart.qomo.kn.cost.manage.entity.CostMaterialBom;
-import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardVersion;
-import org.jeecg.common.api.vo.Result;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
-
-/**
- * @Description: 标准成本-版本号
- * @Author: wangqiong
- * @Date:   2024-06-13
- * @Version: V1.0
- */
-public interface ICostStandardVersionService extends IService<CostStandardVersion> {
-    /**
-     * excel导入
-     * @param request
-     * @param response
-     * @param costStandardVersionClass
-     * @return
-     */
-    Result<?> importExcel(HttpServletRequest request, HttpServletResponse response, Class<CostStandardVersion> costStandardVersionClass);
-    /**
-     * 分页查询
-     * @param
-     * @return
-     */
-    List<CostStandardVersion> queryListResult(String versionNumber);
-}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/IHourRateService.java

@@ -1,15 +0,0 @@
-package com.zzsmart.qomo.kn.cost.manage.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zzsmart.qomo.kn.cost.manage.entity.HourRate;
-
-/**
- * @Description: hour_rate
- * @Author: jeecg-boot
- * @Date:   2024-06-06
- * @Version: V1.0
- */
-public interface IHourRateService extends IService<HourRate> {
-
-}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/AppSceneCostCountServiceImpl.java

@@ -3,12 +3,12 @@ package com.zzsmart.qomo.kn.cost.manage.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zzsmart.qomo.kn.cost.manage.entity.AppSceneCostCount;
-import com.zzsmart.qomo.kn.cost.manage.entity.CostPartMissingInfo;
-import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardVersion;
+import com.zzsmart.qomo.kn.cost.manage.entity.AppSceneCostPartMissingInfo;
+import com.zzsmart.qomo.kn.cost.manage.entity.AppSceneCostStandardVersion;
 import com.zzsmart.qomo.kn.cost.manage.mapper.AppSceneCostCountMapper;
-import com.zzsmart.qomo.kn.cost.manage.mapper.CostPartMissingInfoMapper;
+import com.zzsmart.qomo.kn.cost.manage.mapper.AppSceneCostPartMissingInfoMapper;
 import com.zzsmart.qomo.kn.cost.manage.service.IAppSceneCostCountService;
-import com.zzsmart.qomo.kn.cost.manage.service.ICostStandardVersionService;
+import com.zzsmart.qomo.kn.cost.manage.service.IAppSceneCostStandardVersionService;
 import com.zzsmart.qomo.kn.cost.manage.vo.MissingComponentVO;
 import com.zzsmart.qomo.service.IDataFlowInstanceService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,11 +27,11 @@ import java.util.List;
 @Service
 public class AppSceneCostCountServiceImpl extends ServiceImpl<AppSceneCostCountMapper, AppSceneCostCount> implements IAppSceneCostCountService {
     @Autowired
-    private ICostStandardVersionService costStandardVersionService;
+    private IAppSceneCostStandardVersionService costStandardVersionService;
     @Autowired
     private IDataFlowInstanceService flowInstanceService;
     @Autowired
-    private CostPartMissingInfoMapper costPartMissingInfoMapper;
+    private AppSceneCostPartMissingInfoMapper costPartMissingInfoMapper;
 
     /**
      * 查看关键缺失部件
@@ -43,12 +43,12 @@ public class AppSceneCostCountServiceImpl extends ServiceImpl<AppSceneCostCountM
     public List<MissingComponentVO> queryMissingComponentById(String id) {
         List<MissingComponentVO> list = new ArrayList<>();
         if (id != null) {
-            QueryWrapper<CostPartMissingInfo> queryWrapper = new QueryWrapper<>();
+            QueryWrapper<AppSceneCostPartMissingInfo> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("costStandardId", id);
-            List<CostPartMissingInfo> costPartMissingInfos = costPartMissingInfoMapper.selectList(queryWrapper);
+            List<AppSceneCostPartMissingInfo> costPartMissingInfos = costPartMissingInfoMapper.selectList(queryWrapper);
             if (costPartMissingInfos != null && costPartMissingInfos.size() > 0) {
                 for (int i = 0; i < costPartMissingInfos.size(); i++) {
-                    CostPartMissingInfo costPartMissingInfo = costPartMissingInfos.get(i);
+                    AppSceneCostPartMissingInfo costPartMissingInfo = costPartMissingInfos.get(i);
                     if (costPartMissingInfo.getMissingInfo() != null) {
                         String[] split = costPartMissingInfo.getMissingInfo().split(";");
                         for (int j = 0; j < split.length; j++) {
@@ -99,7 +99,7 @@ public class AppSceneCostCountServiceImpl extends ServiceImpl<AppSceneCostCountM
     @Override
     public void addCostCountTask(AppSceneCostCount appSceneCostCount) {
         //1.新增版本号记录成功后
-        CostStandardVersion costStandardVersion = CostStandardVersion.builder().figureNumber(appSceneCostCount.getDrawingNo()).materialNumber(appSceneCostCount.getMaterialNo()).stage(appSceneCostCount.getStage()).versionNumber(appSceneCostCount.getCostVersion()).versionYear(appSceneCostCount.getYear()).build();
+        AppSceneCostStandardVersion costStandardVersion = AppSceneCostStandardVersion.builder().figureNumber(appSceneCostCount.getDrawingNo()).materialNumber(appSceneCostCount.getMaterialNo()).stage(appSceneCostCount.getStage()).versionNumber(appSceneCostCount.getCostVersion()).versionYear(appSceneCostCount.getYear()).build();
         boolean save = costStandardVersionService.save(costStandardVersion);
         //2.新增标准成本计算任务，并立即执行标准成本计算
         if (save) {
@@ -109,7 +109,7 @@ public class AppSceneCostCountServiceImpl extends ServiceImpl<AppSceneCostCountM
                 //执行标准成本计算
                 executeStandardCost(appSceneCostCount1.getId(), appSceneCostCount1.getFlowDefinitionId());
                 //TODO 新增部件缺失信息记录
-                CostPartMissingInfo costPartMissingInfo = CostPartMissingInfo.builder().costStandardId(appSceneCostCount1.getId().toString()).materialNumber(appSceneCostCount1.getMaterialNo()).versionNumber(appSceneCostCount1.getCostVersion()).missingInfo("电源线;绝缘层涂料").build();
+                AppSceneCostPartMissingInfo costPartMissingInfo = AppSceneCostPartMissingInfo.builder().costStandardId(appSceneCostCount1.getId().toString()).materialNumber(appSceneCostCount1.getMaterialNo()).versionNumber(appSceneCostCount1.getCostVersion()).missingInfo("电源线;绝缘层涂料").build();
                 costPartMissingInfoMapper.insert(costPartMissingInfo);
             }
         }

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/AppSceneCostHourRateServiceImpl.java

@@ -0,0 +1,18 @@
+package com.zzsmart.qomo.kn.cost.manage.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zzsmart.qomo.kn.cost.manage.entity.AppSceneCostHourRate;
+import com.zzsmart.qomo.kn.cost.manage.mapper.AppSceneCostHourRateMapper;
+import com.zzsmart.qomo.kn.cost.manage.service.IAppSceneCostHourRateService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description: app_scene_cost_hour_rate
+ * @Author: jeecg-boot
+ * @Date: 2024-08-02
+ * @Version: V1.0
+ */
+@Service
+public class AppSceneCostHourRateServiceImpl extends ServiceImpl<AppSceneCostHourRateMapper, AppSceneCostHourRate> implements IAppSceneCostHourRateService {
+
+}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/CostMaterialBomServiceImpl.java → qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/AppSceneCostMaterialBomServiceImpl.java

@@ -2,27 +2,26 @@ package com.zzsmart.qomo.kn.cost.manage.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.zzsmart.qomo.kn.cost.manage.entity.CostMaterialBom;
-import com.zzsmart.qomo.kn.cost.manage.mapper.CostMaterialBomMapper;
-import com.zzsmart.qomo.kn.cost.manage.service.CostMaterialBomService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zzsmart.qomo.kn.cost.manage.entity.AppSceneCostMaterialBom;
+import com.zzsmart.qomo.kn.cost.manage.mapper.AppSceneCostMaterialBomMapper;
+import com.zzsmart.qomo.kn.cost.manage.service.IAppSceneCostMaterialBomService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
 import java.util.List;
 
 /**
- * <p>
- * 物料bom 服务实现类
- * </p>
- *
- * @author
- * @since 2024-06-21
+ * @Description: app_scene_cost_material_bom
+ * @Author: jeecg-boot
+ * @Date: 2024-08-02
+ * @Version: V1.0
  */
 @Service
-public class CostMaterialBomServiceImpl extends ServiceImpl<CostMaterialBomMapper, CostMaterialBom> implements CostMaterialBomService {
+public class AppSceneCostMaterialBomServiceImpl extends ServiceImpl<AppSceneCostMaterialBomMapper, AppSceneCostMaterialBom> implements IAppSceneCostMaterialBomService {
     @Autowired
-    CostMaterialBomMapper costMaterialBomMapper;
+    AppSceneCostMaterialBomMapper costMaterialBomMapper;
 
     /**
      * 分页查询
@@ -31,7 +30,7 @@ public class CostMaterialBomServiceImpl extends ServiceImpl<CostMaterialBomMappe
      * @return
      */
     @Override
-    public List<CostMaterialBom> queryListResult(String materialNumber) {
+    public List<AppSceneCostMaterialBom> queryListResult(String materialNumber) {
         QueryWrapper queryWrapper = new QueryWrapper();
         if (StrUtil.isNotEmpty(materialNumber)) {
             // 物料号
@@ -48,7 +47,7 @@ public class CostMaterialBomServiceImpl extends ServiceImpl<CostMaterialBomMappe
      * @return
      */
     @Override
-    public List<CostMaterialBom> queryAllBomInfoBytopMaterialCode(String topMaterialCode) {
+    public List<AppSceneCostMaterialBom> queryAllBomInfoBytopMaterialCode(String topMaterialCode) {
         QueryWrapper queryWrapper = new QueryWrapper();
         //TODO 循环遍历查出所有的物料下的物料（包含最上层的物料）
 //        if (StrUtil.isNotEmpty(topMaterialCode)) {

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/AppSceneCostMaterialProcessHoursServiceImpl.java

@@ -0,0 +1,55 @@
+package com.zzsmart.qomo.kn.cost.manage.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zzsmart.qomo.kn.cost.manage.entity.AppSceneCostMaterialProcessHours;
+import com.zzsmart.qomo.kn.cost.manage.mapper.AppSceneCostMaterialProcessHoursMapper;
+import com.zzsmart.qomo.kn.cost.manage.service.IAppSceneCostMaterialProcessHoursService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: app_scene_cost_material_process_hours
+ * @Author: jeecg-boot
+ * @Date: 2024-08-02
+ * @Version: V1.0
+ */
+@Service
+public class AppSceneCostMaterialProcessHoursServiceImpl extends ServiceImpl<AppSceneCostMaterialProcessHoursMapper, AppSceneCostMaterialProcessHours> implements IAppSceneCostMaterialProcessHoursService {
+    @Autowired
+    AppSceneCostMaterialProcessHoursMapper costMaterialProcessHoursMapper;
+
+    /**
+     * 查询满足物料编号的工时工序
+     *
+     * @param materialNos
+     */
+    @Override
+    public Map<String, List<AppSceneCostMaterialProcessHours>> getProcessHoursByMaterialNo(List<String> materialNos) {
+        Map<String, List<AppSceneCostMaterialProcessHours>> map = new HashMap<>();
+        QueryWrapper<AppSceneCostMaterialProcessHours> queryWrapper = new QueryWrapper();
+        if (materialNos != null && materialNos.size() > 0) {
+            queryWrapper.in("material_code", materialNos);
+            List<AppSceneCostMaterialProcessHours> costMaterialProcessHours = costMaterialProcessHoursMapper.selectList(queryWrapper);
+            for (int i = 0; i < costMaterialProcessHours.size(); i++) {
+                AppSceneCostMaterialProcessHours costMaterialProcessHours1 = costMaterialProcessHours.get(i);
+                String materialCode = costMaterialProcessHours1.getMaterialCode();
+                if (map.containsKey(materialCode)) {
+                    List<AppSceneCostMaterialProcessHours> list = map.get(materialCode);
+                    list.add(costMaterialProcessHours1);
+                    map.put(materialCode, list);
+                } else {
+                    List<AppSceneCostMaterialProcessHours> list = new ArrayList<>();
+                    list.add(costMaterialProcessHours1);
+                    map.put(materialCode, list);
+                }
+            }
+        }
+        return map;
+    }
+}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/AppSceneCostPartMissingInfoServiceImpl.java

@@ -0,0 +1,18 @@
+package com.zzsmart.qomo.kn.cost.manage.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zzsmart.qomo.kn.cost.manage.entity.AppSceneCostPartMissingInfo;
+import com.zzsmart.qomo.kn.cost.manage.mapper.AppSceneCostPartMissingInfoMapper;
+import com.zzsmart.qomo.kn.cost.manage.service.IAppSceneCostPartMissingInfoService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description: app_scene_cost_part_missing_info
+ * @Author: jeecg-boot
+ * @Date: 2024-08-02
+ * @Version: V1.0
+ */
+@Service
+public class AppSceneCostPartMissingInfoServiceImpl extends ServiceImpl<AppSceneCostPartMissingInfoMapper, AppSceneCostPartMissingInfo> implements IAppSceneCostPartMissingInfoService {
+
+}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/CostPurchasePriceServiceImpl.java → qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/AppSceneCostPurchasePriceServiceImpl.java

@@ -1,33 +1,29 @@
 package com.zzsmart.qomo.kn.cost.manage.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.zzsmart.qomo.kn.cost.manage.entity.CostMaterialProcessHours;
-import com.zzsmart.qomo.kn.cost.manage.entity.CostPurchasePrice;
-import com.zzsmart.qomo.kn.cost.manage.mapper.CostPurchasePriceMapper;
-import com.zzsmart.qomo.kn.cost.manage.service.CostPurchasePriceService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.checkerframework.checker.units.qual.A;
+import com.zzsmart.qomo.kn.cost.manage.entity.AppSceneCostPurchasePrice;
+import com.zzsmart.qomo.kn.cost.manage.mapper.AppSceneCostPurchasePriceMapper;
+import com.zzsmart.qomo.kn.cost.manage.service.IAppSceneCostPurchasePriceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
 import java.math.BigDecimal;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 /**
- * <p>
- * 物料采购单价 服务实现类
- * </p>
- *
- * @author
- * @since 2024-06-19
+ * @Description: app_scene_cost_purchase_price
+ * @Author: jeecg-boot
+ * @Date:   2024-08-02
+ * @Version: V1.0
  */
 @Service
-public class CostPurchasePriceServiceImpl extends ServiceImpl<CostPurchasePriceMapper, CostPurchasePrice> implements CostPurchasePriceService {
+public class AppSceneCostPurchasePriceServiceImpl extends ServiceImpl<AppSceneCostPurchasePriceMapper, AppSceneCostPurchasePrice> implements IAppSceneCostPurchasePriceService {
     @Autowired
-    CostPurchasePriceMapper costPurchasePriceMapper;
+    AppSceneCostPurchasePriceMapper costPurchasePriceMapper;
 
     /**
      * 查询满足物料编号的最低采购价
@@ -37,12 +33,12 @@ public class CostPurchasePriceServiceImpl extends ServiceImpl<CostPurchasePriceM
     @Override
     public Map<String, BigDecimal> getMinCostPurchasePriceByMaterialNo(List<String> materialNos) {
         Map<String, BigDecimal> map = new HashMap<>();
-        QueryWrapper<CostPurchasePrice> queryWrapper = new QueryWrapper();
+        QueryWrapper<AppSceneCostPurchasePrice> queryWrapper = new QueryWrapper();
         if (materialNos != null && materialNos.size() > 0) {
             queryWrapper.in("material_code", materialNos);
-            List<CostPurchasePrice> costPurchasePrices = costPurchasePriceMapper.selectList(queryWrapper);
+            List<AppSceneCostPurchasePrice> costPurchasePrices = costPurchasePriceMapper.selectList(queryWrapper);
             for (int i = 0; i < costPurchasePrices.size(); i++) {
-                CostPurchasePrice costPurchasePrice = costPurchasePrices.get(i);
+                AppSceneCostPurchasePrice costPurchasePrice = costPurchasePrices.get(i);
                 map.put(costPurchasePrice.getMaterialCode(), costPurchasePrice.getMinPurchasePrice());
             }
         }

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/AppSceneCostStandardVersionServiceImpl.java

@@ -0,0 +1,19 @@
+package com.zzsmart.qomo.kn.cost.manage.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zzsmart.qomo.kn.cost.manage.entity.AppSceneCostStandardVersion;
+import com.zzsmart.qomo.kn.cost.manage.mapper.AppSceneCostStandardVersionMapper;
+import com.zzsmart.qomo.kn.cost.manage.service.IAppSceneCostStandardVersionService;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * @Description: app_scene_cost_standard_version
+ * @Author: jeecg-boot
+ * @Date:   2024-08-02
+ * @Version: V1.0
+ */
+@Service
+public class AppSceneCostStandardVersionServiceImpl extends ServiceImpl<AppSceneCostStandardVersionMapper, AppSceneCostStandardVersion> implements IAppSceneCostStandardVersionService {
+
+}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/CostMaterialProcessHoursServiceImpl.java

@@ -1,57 +0,0 @@
-package com.zzsmart.qomo.kn.cost.manage.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zzsmart.qomo.kn.cost.manage.entity.CostMaterialProcessHours;
-import com.zzsmart.qomo.kn.cost.manage.mapper.CostMaterialProcessHoursMapper;
-import com.zzsmart.qomo.kn.cost.manage.service.CostMaterialProcessHoursService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 物料工时工序表 服务实现类
- * </p>
- *
- * @author
- * @since 2024-06-19
- */
-@Service
-public class CostMaterialProcessHoursServiceImpl extends ServiceImpl<CostMaterialProcessHoursMapper, CostMaterialProcessHours> implements CostMaterialProcessHoursService {
-    @Autowired
-    CostMaterialProcessHoursMapper costMaterialProcessHoursMapper;
-
-    /**
-     * 查询满足物料编号的工时工序
-     *
-     * @param materialNos
-     */
-    @Override
-    public Map<String, List<CostMaterialProcessHours>> getProcessHoursByMaterialNo(List<String> materialNos) {
-        Map<String, List<CostMaterialProcessHours>> map = new HashMap<>();
-        QueryWrapper<CostMaterialProcessHours> queryWrapper = new QueryWrapper();
-        if (materialNos != null && materialNos.size() > 0) {
-            queryWrapper.in("material_code", materialNos);
-            List<CostMaterialProcessHours> costMaterialProcessHours = costMaterialProcessHoursMapper.selectList(queryWrapper);
-            for (int i = 0; i < costMaterialProcessHours.size(); i++) {
-                CostMaterialProcessHours costMaterialProcessHours1 = costMaterialProcessHours.get(i);
-                String materialCode = costMaterialProcessHours1.getMaterialCode();
-                if (map.containsKey(materialCode)) {
-                    List<CostMaterialProcessHours> list = map.get(materialCode);
-                    list.add(costMaterialProcessHours1);
-                    map.put(materialCode, list);
-                } else {
-                    List<CostMaterialProcessHours> list = new ArrayList<>();
-                    list.add(costMaterialProcessHours1);
-                    map.put(materialCode, list);
-                }
-            }
-        }
-        return map;
-    }
-}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/CostPartMissingInfoServiceImpl.java

@@ -1,20 +0,0 @@
-package com.zzsmart.qomo.kn.cost.manage.service.impl;
-
-
-import com.zzsmart.qomo.kn.cost.manage.entity.CostPartMissingInfo;
-import com.zzsmart.qomo.kn.cost.manage.mapper.CostPartMissingInfoMapper;
-import com.zzsmart.qomo.kn.cost.manage.service.ICostPartMissingInfoService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 标准成本-部件缺失信息
- * @Author: wangqiong
- * @Date:   2024-06-13
- * @Version: V1.0
- */
-@Service
-public class CostPartMissingInfoServiceImpl extends ServiceImpl<CostPartMissingInfoMapper, CostPartMissingInfo> implements ICostPartMissingInfoService {
-
-}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/CostStandardVersionServiceImpl.java

@@ -1,214 +0,0 @@
-package com.zzsmart.qomo.kn.cost.manage.service.impl;
-
-
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.zzsmart.qomo.kn.cost.manage.constants.Constants;
-import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardVersion;
-import com.zzsmart.qomo.kn.cost.manage.enums.StandardStageEnum;
-import com.zzsmart.qomo.kn.cost.manage.mapper.CostStandardVersionMapper;
-import com.zzsmart.qomo.kn.cost.manage.service.ICostStandardVersionService;
-
-import org.apache.shiro.SecurityUtils;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.vo.LoginUser;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.time.ZoneId;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * @Description: 标准成本-版本号
- * @Author: wangqiong
- * @Date: 2024-06-13
- * @Version: V1.0
- */
-@Service
-public class CostStandardVersionServiceImpl extends ServiceImpl<CostStandardVersionMapper, CostStandardVersion> implements ICostStandardVersionService {
-    @Autowired
-    private CostStandardVersionMapper costStandardVersionMapper;
-    private static final Logger log = LoggerFactory.getLogger(CostStandardVersionServiceImpl.class);
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public boolean save(CostStandardVersion costStandardVersion) {
-        // todo 查物料表看是否存在改物料，没有抛异常
-        LoginUser sysUser = null;
-        try {
-            sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        } catch (Exception ignored) {
-
-        }
-        if (sysUser != null) {
-            costStandardVersion.setCreateBy(sysUser.getUsername());
-        }
-        // 保存版本号表
-        boolean save = super.save(costStandardVersion);
-        return save;
-    }
-
-
-    /**
-     * 标准成本计算
-     *
-     * @param costStandardVersion 版本号
-     * @return
-     */
-   // private CostStandard standardCalculate(CostStandardVersion costStandardVersion) {
-        // 计算逻辑，生成版本号输入的物料号是根节点物料号，
-        // 1，根据根节点物料号查找物料表kn_new_sap_mara
-
-        // 2,去bom表找出对应下的所有层级物料app_scene_cost_material_bom
-
-        // 3，根据物料去工时工序表找出对应工序，工序表中包含所计算的工时，app_scene_cost_material_process_hours
-        // 4，查小时费率表，找到对应工时费率app_scene_cost_hour_rate
-        // 5，查采购单价表，找到对应采购单价app_scene_cost_purchase_price
-        // 5，计算每层级的物料标准成本，存到标准成本明细表app_scene_cost_standard_detail
-
-        // 4，计算bom费用，BOM表清单物料用量*采购单价
-        // 5，计算包装费
-        // 6，计算辅料费
-        // 7，计算人工费，人工工时*费率
-        // 8，计算机器折旧费，机器工时*费率
-        // 9，计算机物料消耗费，辅料工时*费率
-        // 10，计算水电费，燃动力工时*费率
-        // 11，计算其他制造费，其他工时*费率
-        // 12，计算物流费，物流费用=（机器折旧+机物料消耗+水电费+其他制费）*10.16%
-        // 13，计算制造成本，前面所有费用汇总（即人工费+机器折旧费+机物料消耗费+水电费+其他制造费+物流费）
-        // 18，计算总成本
-
-//        return standard;
-//    }
-
-
-
-    /**
-     * excel导入
-     *
-     * @param request
-     * @param response
-     * @param clazz
-     * @return
-     */
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response, Class<CostStandardVersion> clazz) {
-        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-        Iterator iterator = fileMap.entrySet().iterator();
-        if (iterator.hasNext()) {
-            Map.Entry<String, MultipartFile> entity = (Map.Entry) iterator.next();
-            MultipartFile file = (MultipartFile) entity.getValue();
-            ImportParams params = new ImportParams();
-            params.setTitleRows(2);
-            params.setHeadRows(1);
-            params.setNeedSave(true);
-            try {
-                List<CostStandardVersion> list = ExcelImportUtil.importExcel(file.getInputStream(), clazz, params);
-                if (CollectionUtil.isEmpty(list)) {
-                    log.error("无可导入的数据！");
-                    return Result.error("无可导入的数据！");
-                }
-                int successNum = 0;
-                int failureNum = 0;
-                //   StringBuilder successMsg = new StringBuilder();
-                StringBuilder failureMsg = new StringBuilder();
-                long start = System.currentTimeMillis();
-                // 校验并组装list
-                for (int i = 0; i < list.size(); i++) {
-                    CostStandardVersion standardVersion = list.get(i);
-                    // 校验物料号是否为空
-                    if (StrUtil.isEmpty(standardVersion.getMaterialNumber())) {
-                        failureNum++;
-                        failureMsg.append("<br/>第 " + (i + 2) + " 行【物料号】字段不能为空：");
-                        continue;
-                    }
-                    if (StrUtil.isNotEmpty(standardVersion.getStage())) {
-                        standardVersion.setStage(StandardStageEnum.getCodeByText(standardVersion.getStage()));
-                    }
-                    // 创建日期
-                    Date createDate = new Date();
-                    standardVersion.setCreateTime(createDate);
-                    String dateStr = new SimpleDateFormat("yyyyMMddHHmmss").format(createDate);
-                    // 生成版本号,版本号=图号_阶段_创建日期(格式：yyyyMMddHHmmss)
-                    standardVersion.setVersionNumber(standardVersion.getFigureNumber()+ Constants.UNDER_LINE +standardVersion.getStage()+Constants.UNDER_LINE+dateStr);
-                    // 设置年份
-                    standardVersion.setVersionYear(String.valueOf(createDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate().getYear()));
-                    // 调用保存方法
-                    try {
-                        save(standardVersion);
-                    } catch (Exception e) {
-                        failureNum++;
-                        String msg = "<br/>第 " + (i + 2) + " 行数据导入失败；";
-                        failureMsg.append(msg);
-                        log.error(msg, e);
-                    }
-                    successNum++;
-                }
-                //   costStandardVersionService.saveBatch(list);
-                log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒");
-                String returnMsg = "文件导入成功！数据行数：" + successNum;
-                if (failureNum > 0) {
-                    returnMsg += "<br/>失败数据行数：" + failureNum + "，失败信息如下：<br/>" + failureMsg.toString();
-                }
-                return Result.ok(returnMsg);
-            } catch (Exception exception) {
-                String msg = exception.getMessage();
-                log.error(msg, exception);
-                Result result;
-                String duplicateEntry = "Duplicate entry";
-                if (msg != null && msg.contains(duplicateEntry)) {
-                    result = Result.error("文件导入失败:有重复数据！");
-                    return result;
-                } else {
-                    result = Result.error("文件导入失败:" + exception.getMessage());
-                    return result;
-                }
-            } finally {
-                try {
-                    file.getInputStream().close();
-                } catch (IOException var23) {
-                    var23.printStackTrace();
-                }
-            }
-        } else {
-            return Result.error("文件导入失败！");
-        }
-
-    }
-
-    /**
-     * 分页查询
-     *
-     * @param versionNumber@return
-     */
-    @Override
-    public List<CostStandardVersion> queryListResult(String versionNumber) {
-        QueryWrapper queryWrapper = new QueryWrapper();
-        if (StrUtil.isNotEmpty(versionNumber)) {
-            // 物料号
-            queryWrapper.like("version_number", versionNumber);
-        }
-        List list = costStandardVersionMapper.selectList(queryWrapper);
-        return list;
-    }
-}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/HourRateServiceImpl.java

@@ -1,19 +0,0 @@
-package com.zzsmart.qomo.kn.cost.manage.service.impl;
-
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zzsmart.qomo.kn.cost.manage.entity.HourRate;
-import com.zzsmart.qomo.kn.cost.manage.mapper.HourRateMapper;
-import com.zzsmart.qomo.kn.cost.manage.service.IHourRateService;
-import org.springframework.stereotype.Service;
-
-/**
- * @Description: hour_rate
- * @Author: jeecg-boot
- * @Date:   2024-06-06
- * @Version: V1.0
- */
-@Service
-public class HourRateServiceImpl extends ServiceImpl<HourRateMapper, HourRate> implements IHourRateService {
-
-}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/vo/AppSceneCostCountVO.java

@@ -1,14 +1,12 @@
 package com.zzsmart.qomo.kn.cost.manage.vo;
 
 import com.zzsmart.qomo.kn.cost.manage.entity.AppSceneCostCount;
-import lombok.Builder;
 import lombok.Data;
 
 @Data
-@Builder
 public class AppSceneCostCountVO extends AppSceneCostCount {
     /**
      * 状态名称
      */
-    private String statusName;
+    public String statusName;
 }