Merge branch 'bgy' of kn-cost/cost-backend into dev

pom.xml

@@ -138,11 +138,6 @@
                 <artifactId>qomo-data-selfReport</artifactId>
                 <version>${dmp.version}</version>
             </dependency>
-<!--            <dependency>-->
-<!--                <groupId>commons-io</groupId>-->
-<!--                <artifactId>commons-io</artifactId>-->
-<!--                <version>2.11.0</version>-->
-<!--            </dependency>-->
         </dependencies>
     </dependencyManagement>
     <!-- 环境 -->

qomo-kn-cost-manage-start/src/main/resources/application-dev.yml

@@ -15,7 +15,7 @@ v2:
   defaultFormat: .png
 
 server:
-  port: 8082
+  port: 8099
   tomcat:
     max-swallow-size: -1
   error:
@@ -205,10 +205,15 @@ spring:
         # 通过connectProperties属性来打开mergeSql功能；慢SQL记录
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
+#        master:
+#          url: jdbc:mysql://192.168.50.9:2212/selef_report?useUnicode=true&allowMultiQueries=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&serverTimezone=Asia/Shanghai&useSSL=false
+#          username: zzzz
+#          password: knphm2021
+#          driver-class-name: com.mysql.cj.jdbc.Driver
         master:
-          url: jdbc:mysql://192.168.50.9:2212/selef_report?useUnicode=true&allowMultiQueries=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&serverTimezone=Asia/Shanghai&useSSL=false
+          url: jdbc:mysql://158.158.4.51:3386/kn_energy_cost?useUnicode=true&allowMultiQueries=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&serverTimezone=Asia/Shanghai&useSSL=false
-          username: zzzz
+          username: root
-          password: knphm2021
+          password: knEnergyCost0826#
           driver-class-name: com.mysql.cj.jdbc.Driver
           # 多数据源配置
           #multi-datasource1:
@@ -217,16 +222,23 @@ spring:
           #password: root
           #driver-class-name: com.mysql.cj.jdbc.Driver
   #redis 配置
-  redis:
+#  redis:
 #    database: 5
 #      host: 121.40.189.20
 #      port: 6389
+  redis:
     database: 9
     host: 192.168.50.9
     port: 7379
     password: 'zzboard'
     main:
       allow-circular-references: true
+#  redis:
+#    database: 10
+#    host: localhost
+#    port: 6379
+#    main:
+#      allow-circular-references: true
 
   #rabbitmq 配置
   rabbitmq:
@@ -260,6 +272,8 @@ mybatis-plus:
     #    log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
     # 返回类型为Map,显示null对应的字段
     call-setters-on-nulls: true
+  security:
+    enabled: false
 #jeecg专用配置
 minidao:
   base-package: org.jeecg.modules.jmreport.*,org.jeecg.modules.drag.*
@@ -282,9 +296,8 @@ jeecg:
     #webapp文件路径
     webapp: /opt/webapp
   shiro:
-#    excludeUrls: /api/**,/api/internalService/**,/test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/api/getUserInfo,/sys/sysDepart/**,/taskSocket/**,/flowSocket/**,/dataCheck/**
+    excludeUrls: /api/internalService/**,/test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/api/getUserInfo,/sys/sysDepart/**,/taskSocket/**,/flowSocket/**,/dataCheck/**
-#    excludeUrls: /api/internalService/**,/test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/api/getUserInfo,/sys/sysDepart/**,/taskSocket/**,/flowSocket/**,/dataCheck/**
+  #    excludeUrls: /**/**,/**/**/**
-    excludeUrls: /**/**,/**/**/**
 
   #阿里云oss存储和大鱼短信秘钥配置
   oss:
@@ -437,7 +450,8 @@ seaTunnelHome: /opt/service/apache-seatunnel-2.3.4
 hiveMetastoreUri: thrift://192.168.50.102:9083
 hiveSitePath: /opt/service/apache-seatunnel-2.3.4/deploy/hive-site.xml
 hdfsSitePath: /opt/service/apache-seatunnel-2.3.4/deploy/hdfs-site.xml
-
+hdfs:
+  enable: false
 minio:
   server: http://192.168.50.9
   port: 9100

qomo-kn-cost-manage/pom.xml

@@ -13,12 +13,7 @@
         <dependency>
             <groupId>org.qomo.boot</groupId>
             <artifactId>qomo-system-biz</artifactId>
-            <version>${revision}</version>
+            <version>2.0.1-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.google.auto.service</groupId>
@@ -28,34 +23,21 @@
         <dependency>
             <groupId>com.zzsmart.qomo</groupId>
             <artifactId>qomo-data-integration</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.zzsmart.hdp.hive</groupId>
+                    <artifactId>hive-jdbc</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.projectlombok</groupId>
+            <groupId>com.zzsmart.hdp.hive</groupId>
-            <artifactId>lombok</artifactId>
+            <artifactId>hive-jdbc</artifactId>
-            <version>RELEASE</version>
+            <version>2.6.5.0-292</version>
-            <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.poi</groupId>
+            <groupId>com.zzsmart.qomo</groupId>
-            <artifactId>poi</artifactId>
+            <artifactId>qomo-data-selfReport</artifactId>
-            <version>5.2.3</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml</artifactId>
-            <version>5.2.3</version>
-        </dependency>
-        <!--自己添加的依赖-->
-<!--        <dependency>-->
-<!--            <groupId>commons-io</groupId>-->
-<!--            <artifactId>commons-io</artifactId>-->
-<!--            <version>2.11.0</version>-->
-<!--        </dependency>-->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>easyexcel</artifactId>
-            <version>4.0.1</version> <!-- 请检查并使用最新稳定版本 -->
-        </dependency>
-
     </dependencies>
 </project>

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/AppSceneCostBomRelevancyController.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.AppSceneCostBomRelevancy;
+import com.zzsmart.qomo.kn.cost.manage.service.IAppSceneCostBomRelevancyService;
+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_bom_relevancy
+ * @Author: jeecg-boot
+ * @Date: 2024-09-08
+ * @Version: V1.0
+ */
+@Api(tags = "app_scene_cost_bom_relevancy")
+@RestController
+@RequestMapping("//appSceneCostBomRelevancy")
+@Slf4j
+public class AppSceneCostBomRelevancyController extends JeecgController<AppSceneCostBomRelevancy, IAppSceneCostBomRelevancyService> {
+    @Autowired
+    private IAppSceneCostBomRelevancyService appSceneCostBomRelevancyService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param appSceneCostBomRelevancy
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    //@AutoLog(value = "app_scene_cost_bom_relevancy-分页列表查询")
+    @ApiOperation(value = "app_scene_cost_bom_relevancy-分页列表查询", notes = "app_scene_cost_bom_relevancy-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<AppSceneCostBomRelevancy>> queryPageList(AppSceneCostBomRelevancy appSceneCostBomRelevancy, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+        QueryWrapper<AppSceneCostBomRelevancy> queryWrapper = QueryGenerator.initQueryWrapper(appSceneCostBomRelevancy, req.getParameterMap());
+        Page<AppSceneCostBomRelevancy> page = new Page<AppSceneCostBomRelevancy>(pageNo, pageSize);
+        IPage<AppSceneCostBomRelevancy> pageList = appSceneCostBomRelevancyService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    /**
+     * 添加
+     *
+     * @param appSceneCostBomRelevancy
+     * @return
+     */
+    @AutoLog(value = "app_scene_cost_bom_relevancy-添加")
+    @ApiOperation(value = "app_scene_cost_bom_relevancy-添加", notes = "app_scene_cost_bom_relevancy-添加")
+    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_bom_relevancy:add")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody AppSceneCostBomRelevancy appSceneCostBomRelevancy) {
+        appSceneCostBomRelevancyService.save(appSceneCostBomRelevancy);
+        return Result.OK("添加成功！");
+    }
+
+    /**
+     * 编辑
+     *
+     * @param appSceneCostBomRelevancy
+     * @return
+     */
+    @AutoLog(value = "app_scene_cost_bom_relevancy-编辑")
+    @ApiOperation(value = "app_scene_cost_bom_relevancy-编辑", notes = "app_scene_cost_bom_relevancy-编辑")
+    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_bom_relevancy:edit")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody AppSceneCostBomRelevancy appSceneCostBomRelevancy) {
+        appSceneCostBomRelevancyService.updateById(appSceneCostBomRelevancy);
+        return Result.OK("编辑成功!");
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "app_scene_cost_bom_relevancy-通过id删除")
+    @ApiOperation(value = "app_scene_cost_bom_relevancy-通过id删除", notes = "app_scene_cost_bom_relevancy-通过id删除")
+    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_bom_relevancy:delete")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        appSceneCostBomRelevancyService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "app_scene_cost_bom_relevancy-批量删除")
+    @ApiOperation(value = "app_scene_cost_bom_relevancy-批量删除", notes = "app_scene_cost_bom_relevancy-批量删除")
+    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_bom_relevancy:deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        this.appSceneCostBomRelevancyService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    //@AutoLog(value = "app_scene_cost_bom_relevancy-通过id查询")
+    @ApiOperation(value = "app_scene_cost_bom_relevancy-通过id查询", notes = "app_scene_cost_bom_relevancy-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<AppSceneCostBomRelevancy> queryById(@RequestParam(name = "id", required = true) String id) {
+        AppSceneCostBomRelevancy appSceneCostBomRelevancy = appSceneCostBomRelevancyService.getById(id);
+        if (appSceneCostBomRelevancy == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(appSceneCostBomRelevancy);
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param appSceneCostBomRelevancy
+     */
+    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_bom_relevancy:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, AppSceneCostBomRelevancy appSceneCostBomRelevancy) {
+        return super.exportXls(request, appSceneCostBomRelevancy, AppSceneCostBomRelevancy.class, "app_scene_cost_bom_relevancy");
+    }
+
+    /**
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_bom_relevancy:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, AppSceneCostBomRelevancy.class);
+    }
+
+}

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

@@ -4,7 +4,10 @@ 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.AppSceneCostCount;
+import com.zzsmart.qomo.kn.cost.manage.enums.CostCountStatusEnum;
 import com.zzsmart.qomo.kn.cost.manage.service.IAppSceneCostCountService;
+import com.zzsmart.qomo.kn.cost.manage.vo.AppSceneCostCountVO;
+import com.zzsmart.qomo.kn.cost.manage.vo.MissingComponentVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -13,13 +16,16 @@ 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.BeanUtils;
 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.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 
 /**
  * @Description: app_scene_cost_count
@@ -47,14 +53,22 @@ public class AppSceneCostCountController extends JeecgController<AppSceneCostCou
     //@AutoLog(value = "app_scene_cost_count-分页列表查询")
     @ApiOperation(value = "标准成本计算-分页列表查询", notes = "标准成本计算-分页列表查询")
     @GetMapping(value = "/list")
-    public Result<IPage<AppSceneCostCount>> queryPageList(AppSceneCostCount appSceneCostCount,
+    public Result<IPage<AppSceneCostCountVO>> queryPageList(AppSceneCostCount appSceneCostCount, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
-                                                          @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                          HttpServletRequest req) {
         QueryWrapper<AppSceneCostCount> queryWrapper = QueryGenerator.initQueryWrapper(appSceneCostCount, req.getParameterMap());
         Page<AppSceneCostCount> page = new Page<AppSceneCostCount>(pageNo, pageSize);
         IPage<AppSceneCostCount> pageList = appSceneCostCountService.page(page, queryWrapper);
-        return Result.OK(pageList);
+        IPage<AppSceneCostCountVO> pageList1 = new Page<>();
+        BeanUtils.copyProperties(pageList, pageList1);
+        List<AppSceneCostCountVO>list=new ArrayList<>();
+        for(int i=0;i<pageList.getRecords().size();i++){
+            AppSceneCostCount appSceneCostCount1 = pageList.getRecords().get(i);
+            AppSceneCostCountVO appSceneCostCountVO = new AppSceneCostCountVO();
+            BeanUtils.copyProperties(appSceneCostCount1, appSceneCostCountVO);
+            appSceneCostCountVO.setStatusName(CostCountStatusEnum.getTextByValue(appSceneCostCount1.getStatus()));
+            list.add(appSceneCostCountVO);
+        }
+        pageList1.setRecords(list);
+        return Result.OK(pageList1);
     }
 
     /**
@@ -65,7 +79,7 @@ public class AppSceneCostCountController extends JeecgController<AppSceneCostCou
      */
     @AutoLog(value = "app_scene_cost_count-添加")
     @ApiOperation(value = "添加标准成本计算任务", notes = "添加标准成本计算任务")
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_count:addCostCountTask")
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_count:addCostCountTask")
     @PostMapping(value = "/addCostCountTask")
     public Result<String> addCostCountTask(@RequestBody AppSceneCostCount appSceneCostCount) {
         appSceneCostCountService.addCostCountTask(appSceneCostCount);
@@ -81,27 +95,27 @@ public class AppSceneCostCountController extends JeecgController<AppSceneCostCou
      */
     @AutoLog(value = "app_scene_cost_count-通过id删除")
     @ApiOperation(value = "标准成本计算-通过id删除", notes = "标准成本计算-通过id删除")
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_count:delete")
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_count:delete")
     @DeleteMapping(value = "/delete")
     public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
         appSceneCostCountService.removeById(id);
         return Result.OK("删除成功!");
     }
 
-    /**
+//    /**
-     * 批量删除
+//     * 批量删除
-     *
+//     *
-     * @param ids
+//     * @param ids
-     * @return
+//     * @return
-     */
+//     */
-    @AutoLog(value = "app_scene_cost_count-批量删除")
+//    @AutoLog(value = "app_scene_cost_count-批量删除")
-    @ApiOperation(value = "app_scene_cost_count-批量删除", notes = "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")
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_count:deleteBatch")
-    @DeleteMapping(value = "/deleteBatch")
+//    @DeleteMapping(value = "/deleteBatch")
-    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+//    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        this.appSceneCostCountService.removeByIds(Arrays.asList(ids.split(",")));
+//        this.appSceneCostCountService.removeByIds(Arrays.asList(ids.split(",")));
-        return Result.OK("批量删除成功!");
+//        return Result.OK("批量删除成功!");
-    }
+//    }
 
     /**
      * 重新计算
@@ -129,12 +143,12 @@ public class AppSceneCostCountController extends JeecgController<AppSceneCostCou
     //@AutoLog(value = "app_scene_cost_count-通过id查询")
     @ApiOperation(value = "标准成本计算-查看关键缺失部件", notes = "标准成本计算-查看关键缺失部件")
     @GetMapping(value = "/queryMissingComponentById")
-    public Result<AppSceneCostCount> queryMissingComponentById(@RequestParam(name = "id", required = true) String id) {
+    public Result<List<MissingComponentVO>> queryMissingComponentById(@RequestParam(name = "id", required = true) String id) {
-        AppSceneCostCount appSceneCostCount = appSceneCostCountService.queryMissingComponentById(id);
+        List<MissingComponentVO> result = appSceneCostCountService.queryMissingComponentById(id);
-        if (appSceneCostCount == null) {
+        if (result == null) {
             return Result.error("未找到对应数据");
         }
-        return Result.OK(appSceneCostCount);
+        return Result.OK(result);
     }
 
     /**
@@ -143,7 +157,7 @@ public class AppSceneCostCountController extends JeecgController<AppSceneCostCou
      * @param request
      * @param appSceneCostCount
      */
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_count:exportXls")
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_count:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, AppSceneCostCount appSceneCostCount) {
         return super.exportXls(request, appSceneCostCount, AppSceneCostCount.class, "app_scene_cost_count");
@@ -156,7 +170,7 @@ public class AppSceneCostCountController extends JeecgController<AppSceneCostCou
      * @param response
      * @return
      */
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_count:importExcel")
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_count:importExcel")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, AppSceneCostCount.class);

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/AppSceneCostModelController.java

@@ -5,22 +5,27 @@ 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.dao.entity.FlowDefinition;
+import com.zzsmart.qomo.kn.cost.manage.entity.AppSceneCostCount;
 import com.zzsmart.qomo.kn.cost.manage.entity.AppSceneCostModel;
+import com.zzsmart.qomo.kn.cost.manage.enums.CostModelStatusEnum;
+import com.zzsmart.qomo.kn.cost.manage.mapper.AppSceneCostCountMapper;
+import com.zzsmart.qomo.kn.cost.manage.mapper.AppSceneCostModelMapper;
 import com.zzsmart.qomo.kn.cost.manage.service.IAppSceneCostModelService;
+import com.zzsmart.qomo.kn.cost.manage.vo.CostModelDefinitionVO;
 import com.zzsmart.qomo.service.IDataFlowDefinitionService;
 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 javax.servlet.http.HttpServletRequest;
+import java.util.Date;
 import java.util.List;
+import java.util.Random;
 
 /**
  * @Description: app_scene_cost_model
@@ -32,12 +37,15 @@ import java.util.List;
 @RestController
 @RequestMapping("//cost-model")
 @Slf4j
-public class AppSceneCostModelController  {
+public class AppSceneCostModelController {
     @Autowired
     private IAppSceneCostModelService appSceneCostModelService;
     @Autowired
     private IDataFlowDefinitionService flowDefinitionService;
-
+    @Autowired
+    private AppSceneCostCountMapper appSceneCostCountMapper;
+    @Autowired
+    private AppSceneCostModelMapper costModelMapper;
     /**
      * 标准成本模型分页列表查询
      *
@@ -72,15 +80,41 @@ public class AppSceneCostModelController  {
     /**
      * 添加标准成本模型
      *
-     * @param flowDefinition
+     * @param modelDefinitionVO
      * @return
      */
     @AutoLog(value = "app_scene_cost_model-添加")
     @ApiOperation(value = "app_scene_cost_model-添加", notes = "app_scene_cost_model-添加")
     @PostMapping(value = "/add")
-    public Result<FlowDefinition> add(@RequestBody FlowDefinition flowDefinition) {
+    public Result<FlowDefinition> add(@RequestBody CostModelDefinitionVO modelDefinitionVO) {
-        FlowDefinition definition = flowDefinitionService.add(flowDefinition);
+        try {
-        return Result.OK(definition);
+            FlowDefinition flowDefinition = new FlowDefinition();
+            //TODO 新增平台层模型定义记录
+            String flowCode = "FLOW_" + System.currentTimeMillis() + new Random(10000).nextInt();
+            flowDefinition.setUpdateTime(new Date());
+            flowDefinition.setCreateTime(new Date());
+            flowDefinition.setCode(flowCode);
+            flowDefinition.setProjectId(modelDefinitionVO.getProjectId());
+            flowDefinition.setUserId("1744546658109349889");
+            flowDefinition.setUserName("系统管理员");
+            flowDefinition.setTenantId(-1);
+            flowDefinition.setEnvironmentId(1);
+            flowDefinition.setName(modelDefinitionVO.getModelName());
+            FlowDefinition definition = flowDefinitionService.add(flowDefinition);
+            AppSceneCostModel forecastModel = new AppSceneCostModel();
+            forecastModel.setModelType(modelDefinitionVO.getModelType());
+            forecastModel.setModelName(modelDefinitionVO.getModelName());
+            forecastModel.setStatus(CostModelStatusEnum.Draft.getCode());
+            //2.新模型记录
+            forecastModel.setFlowDefinitionId(definition.getId());
+            forecastModel.setUpdateTime(new Date());
+            forecastModel.setCreateTime(new Date());
+            costModelMapper.insert(forecastModel);
+
+        } catch (Exception e) {
+            return Result.error("新增失败");
+        }
+        return Result.OK("新增成功");
     }
 
     /**
@@ -91,9 +125,9 @@ public class AppSceneCostModelController  {
      */
     @AutoLog(value = "app_scene_cost_model-编辑")
     @ApiOperation(value = "app_scene_cost_model-编辑", notes = "app_scene_cost_model-编辑")
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_model:edit")
     @PostMapping(value = "/edit")
     public Result<FlowDefinition> edit(@RequestBody FlowDefinition flowDefinition) {
+        flowDefinition.setUpdateTime(new Date());
         return Result.OK(flowDefinitionService.edit(flowDefinition));
     }
 
@@ -105,9 +139,21 @@ public class AppSceneCostModelController  {
      */
     @AutoLog(value = "app_scene_cost_model-通过id删除")
     @ApiOperation(value = "app_scene_cost_model-通过id删除", notes = "app_scene_cost_model-通过id删除")
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_model:delete")
     @DeleteMapping(value = "/delete")
     public Result<String> delete(@RequestParam(name = "id", required = true) Integer id) {
+        //检查模型是否被引用或挂载
+        if (id != null) {
+            FlowDefinition flowDefinition = flowDefinitionService.getById(id);
+            if (flowDefinition != null) {
+                Integer id1 = flowDefinition.getId();
+                QueryWrapper<AppSceneCostCount> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("flow_definition_id", id1);
+                Long aLong = appSceneCostCountMapper.selectCount(queryWrapper);
+                if (aLong > 0) {
+                    return Result.error("该模型正在被引用，无法删除！");
+                }
+            }
+        }
         flowDefinitionService.delete(id);
         return Result.OK("删除成功!");
     }

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/AppSceneCostProductProcessMaintenanceController.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.AppSceneCostProductProcessMaintenance;
+import com.zzsmart.qomo.kn.cost.manage.service.IAppSceneCostProductProcessMaintenanceService;
+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_product_process_maintenance
+ * @Author: jeecg-boot
+ * @Date: 2024-09-08
+ * @Version: V1.0
+ */
+//@Api(tags = "app_scene_cost_product_process_maintenance")
+@RestController
+@RequestMapping("//appSceneCostProductProcessMaintenance")
+@Slf4j
+public class AppSceneCostProductProcessMaintenanceController extends JeecgController<AppSceneCostProductProcessMaintenance, IAppSceneCostProductProcessMaintenanceService> {
+    @Autowired
+    private IAppSceneCostProductProcessMaintenanceService appSceneCostProductProcessMaintenanceService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param appSceneCostProductProcessMaintenance
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    //@AutoLog(value = "app_scene_cost_product_process_maintenance-分页列表查询")
+    @ApiOperation(value = "app_scene_cost_product_process_maintenance-分页列表查询", notes = "app_scene_cost_product_process_maintenance-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<AppSceneCostProductProcessMaintenance>> queryPageList(AppSceneCostProductProcessMaintenance appSceneCostProductProcessMaintenance, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+        QueryWrapper<AppSceneCostProductProcessMaintenance> queryWrapper = QueryGenerator.initQueryWrapper(appSceneCostProductProcessMaintenance, req.getParameterMap());
+        Page<AppSceneCostProductProcessMaintenance> page = new Page<AppSceneCostProductProcessMaintenance>(pageNo, pageSize);
+        IPage<AppSceneCostProductProcessMaintenance> pageList = appSceneCostProductProcessMaintenanceService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    /**
+     * 添加
+     *
+     * @param appSceneCostProductProcessMaintenance
+     * @return
+     */
+    @AutoLog(value = "app_scene_cost_product_process_maintenance-添加")
+    @ApiOperation(value = "app_scene_cost_product_process_maintenance-添加", notes = "app_scene_cost_product_process_maintenance-添加")
+    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_product_process_maintenance:add")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody AppSceneCostProductProcessMaintenance appSceneCostProductProcessMaintenance) {
+        appSceneCostProductProcessMaintenanceService.save(appSceneCostProductProcessMaintenance);
+        return Result.OK("添加成功！");
+    }
+
+    /**
+     * 编辑
+     *
+     * @param appSceneCostProductProcessMaintenance
+     * @return
+     */
+    @AutoLog(value = "app_scene_cost_product_process_maintenance-编辑")
+    @ApiOperation(value = "app_scene_cost_product_process_maintenance-编辑", notes = "app_scene_cost_product_process_maintenance-编辑")
+    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_product_process_maintenance:edit")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody AppSceneCostProductProcessMaintenance appSceneCostProductProcessMaintenance) {
+        appSceneCostProductProcessMaintenanceService.updateById(appSceneCostProductProcessMaintenance);
+        return Result.OK("编辑成功!");
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "app_scene_cost_product_process_maintenance-通过id删除")
+    @ApiOperation(value = "app_scene_cost_product_process_maintenance-通过id删除", notes = "app_scene_cost_product_process_maintenance-通过id删除")
+    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_product_process_maintenance:delete")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        appSceneCostProductProcessMaintenanceService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "app_scene_cost_product_process_maintenance-批量删除")
+    @ApiOperation(value = "app_scene_cost_product_process_maintenance-批量删除", notes = "app_scene_cost_product_process_maintenance-批量删除")
+    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_product_process_maintenance:deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        this.appSceneCostProductProcessMaintenanceService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    //@AutoLog(value = "app_scene_cost_product_process_maintenance-通过id查询")
+    @ApiOperation(value = "app_scene_cost_product_process_maintenance-通过id查询", notes = "app_scene_cost_product_process_maintenance-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<AppSceneCostProductProcessMaintenance> queryById(@RequestParam(name = "id", required = true) String id) {
+        AppSceneCostProductProcessMaintenance appSceneCostProductProcessMaintenance = appSceneCostProductProcessMaintenanceService.getById(id);
+        if (appSceneCostProductProcessMaintenance == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(appSceneCostProductProcessMaintenance);
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param appSceneCostProductProcessMaintenance
+     */
+    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_product_process_maintenance:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, AppSceneCostProductProcessMaintenance appSceneCostProductProcessMaintenance) {
+        return super.exportXls(request, appSceneCostProductProcessMaintenance, AppSceneCostProductProcessMaintenance.class, "app_scene_cost_product_process_maintenance");
+    }
+
+    /**
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_product_process_maintenance:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, AppSceneCostProductProcessMaintenance.class);
+    }
+
+}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/AppSceneCostPurchaseEvaluateController.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.AppSceneCostPurchaseEvaluate;
+import com.zzsmart.qomo.kn.cost.manage.service.IAppSceneCostPurchaseEvaluateService;
+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_evaluate
+ * @Author: jeecg-boot
+ * @Date: 2024-08-02
+ * @Version: V1.0
+ */
+@Api(tags = "cost-采购合同")
+@RestController
+@RequestMapping("//PurchaseEvaluate")
+@Slf4j
+public class AppSceneCostPurchaseEvaluateController extends JeecgController<AppSceneCostPurchaseEvaluate, IAppSceneCostPurchaseEvaluateService> {
+    @Autowired
+    private IAppSceneCostPurchaseEvaluateService appSceneCostPurchaseEvaluateService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param appSceneCostPurchaseEvaluate
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    //@AutoLog(value = "app_scene_cost_purchase_evaluate-分页列表查询")
+    @ApiOperation(value = "app_scene_cost_purchase_evaluate-分页列表查询", notes = "app_scene_cost_purchase_evaluate-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<AppSceneCostPurchaseEvaluate>> queryPageList(AppSceneCostPurchaseEvaluate appSceneCostPurchaseEvaluate,
+                                                                     @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                     @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                                     HttpServletRequest req) {
+        QueryWrapper<AppSceneCostPurchaseEvaluate> queryWrapper = QueryGenerator.initQueryWrapper(appSceneCostPurchaseEvaluate, req.getParameterMap());
+        Page<AppSceneCostPurchaseEvaluate> page = new Page<AppSceneCostPurchaseEvaluate>(pageNo, pageSize);
+        IPage<AppSceneCostPurchaseEvaluate> pageList = appSceneCostPurchaseEvaluateService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    /**
+     * 添加
+     *
+     * @param appSceneCostPurchaseEvaluate
+     * @return
+     */
+    @AutoLog(value = "app_scene_cost_purchase_evaluate-添加")
+    @ApiOperation(value = "app_scene_cost_purchase_evaluate-添加", notes = "app_scene_cost_purchase_evaluate-添加")
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_evaluate:add")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody AppSceneCostPurchaseEvaluate appSceneCostPurchaseEvaluate) {
+        appSceneCostPurchaseEvaluateService.save(appSceneCostPurchaseEvaluate);
+        return Result.OK("添加成功！");
+    }
+
+    /**
+     * 编辑
+     *
+     * @param appSceneCostPurchaseEvaluate
+     * @return
+     */
+    @AutoLog(value = "app_scene_cost_purchase_evaluate-编辑")
+    @ApiOperation(value = "app_scene_cost_purchase_evaluate-编辑", notes = "app_scene_cost_purchase_evaluate-编辑")
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_evaluate:edit")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody AppSceneCostPurchaseEvaluate appSceneCostPurchaseEvaluate) {
+        appSceneCostPurchaseEvaluateService.updateById(appSceneCostPurchaseEvaluate);
+        return Result.OK("编辑成功!");
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "app_scene_cost_purchase_evaluate-通过id删除")
+    @ApiOperation(value = "app_scene_cost_purchase_evaluate-通过id删除", notes = "app_scene_cost_purchase_evaluate-通过id删除")
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_evaluate:delete")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        appSceneCostPurchaseEvaluateService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+//
+//    /**
+//     * 批量删除
+//     *
+//     * @param ids
+//     * @return
+//     */
+//    @AutoLog(value = "app_scene_cost_purchase_evaluate-批量删除")
+//    @ApiOperation(value = "app_scene_cost_purchase_evaluate-批量删除", notes = "app_scene_cost_purchase_evaluate-批量删除")
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_evaluate:deleteBatch")
+//    @DeleteMapping(value = "/deleteBatch")
+//    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+//        this.appSceneCostPurchaseEvaluateService.removeByIds(Arrays.asList(ids.split(",")));
+//        return Result.OK("批量删除成功!");
+//    }
+//
+//    /**
+//     * 通过id查询
+//     *
+//     * @param id
+//     * @return
+//     */
+//    //@AutoLog(value = "app_scene_cost_purchase_evaluate-通过id查询")
+//    @ApiOperation(value = "app_scene_cost_purchase_evaluate-通过id查询", notes = "app_scene_cost_purchase_evaluate-通过id查询")
+//    @GetMapping(value = "/queryById")
+//    public Result<AppSceneCostPurchaseEvaluate> queryById(@RequestParam(name = "id", required = true) String id) {
+//        AppSceneCostPurchaseEvaluate appSceneCostPurchaseEvaluate = appSceneCostPurchaseEvaluateService.getById(id);
+//        if (appSceneCostPurchaseEvaluate == null) {
+//            return Result.error("未找到对应数据");
+//        }
+//        return Result.OK(appSceneCostPurchaseEvaluate);
+//    }
+//
+//    /**
+//     * 导出excel
+//     *
+//     * @param request
+//     * @param appSceneCostPurchaseEvaluate
+//     */
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_evaluate:exportXls")
+//    @RequestMapping(value = "/exportXls")
+//    public ModelAndView exportXls(HttpServletRequest request, AppSceneCostPurchaseEvaluate appSceneCostPurchaseEvaluate) {
+//        return super.exportXls(request, appSceneCostPurchaseEvaluate, AppSceneCostPurchaseEvaluate.class, "app_scene_cost_purchase_evaluate");
+//    }
+//
+//    /**
+//     * 通过excel导入数据
+//     *
+//     * @param request
+//     * @param response
+//     * @return
+//     */
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_evaluate:importExcel")
+//    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+//    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+//        return super.importExcel(request, response, AppSceneCostPurchaseEvaluate.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/AppSceneCostPurchaseRecordController.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.AppSceneCostPurchaseRecord;
+import com.zzsmart.qomo.kn.cost.manage.service.IAppSceneCostPurchaseRecordService;
+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_record
+ * @Author: jeecg-boot
+ * @Date: 2024-09-08
+ * @Version: V1.0
+ */
+//@Api(tags = "app_scene_cost_purchase_record")
+@RestController
+@RequestMapping("//appSceneCostPurchaseRecord")
+@Slf4j
+public class AppSceneCostPurchaseRecordController extends JeecgController<AppSceneCostPurchaseRecord, IAppSceneCostPurchaseRecordService> {
+    @Autowired
+    private IAppSceneCostPurchaseRecordService appSceneCostPurchaseRecordService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param appSceneCostPurchaseRecord
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    //@AutoLog(value = "app_scene_cost_purchase_record-分页列表查询")
+    @ApiOperation(value = "app_scene_cost_purchase_record-分页列表查询", notes = "app_scene_cost_purchase_record-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<AppSceneCostPurchaseRecord>> queryPageList(AppSceneCostPurchaseRecord appSceneCostPurchaseRecord, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+        QueryWrapper<AppSceneCostPurchaseRecord> queryWrapper = QueryGenerator.initQueryWrapper(appSceneCostPurchaseRecord, req.getParameterMap());
+        Page<AppSceneCostPurchaseRecord> page = new Page<AppSceneCostPurchaseRecord>(pageNo, pageSize);
+        IPage<AppSceneCostPurchaseRecord> pageList = appSceneCostPurchaseRecordService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    /**
+     * 添加
+     *
+     * @param appSceneCostPurchaseRecord
+     * @return
+     */
+    @AutoLog(value = "app_scene_cost_purchase_record-添加")
+    @ApiOperation(value = "app_scene_cost_purchase_record-添加", notes = "app_scene_cost_purchase_record-添加")
+    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_record:add")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody AppSceneCostPurchaseRecord appSceneCostPurchaseRecord) {
+        appSceneCostPurchaseRecordService.save(appSceneCostPurchaseRecord);
+        return Result.OK("添加成功！");
+    }
+
+    /**
+     * 编辑
+     *
+     * @param appSceneCostPurchaseRecord
+     * @return
+     */
+    @AutoLog(value = "app_scene_cost_purchase_record-编辑")
+    @ApiOperation(value = "app_scene_cost_purchase_record-编辑", notes = "app_scene_cost_purchase_record-编辑")
+    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_record:edit")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody AppSceneCostPurchaseRecord appSceneCostPurchaseRecord) {
+        appSceneCostPurchaseRecordService.updateById(appSceneCostPurchaseRecord);
+        return Result.OK("编辑成功!");
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "app_scene_cost_purchase_record-通过id删除")
+    @ApiOperation(value = "app_scene_cost_purchase_record-通过id删除", notes = "app_scene_cost_purchase_record-通过id删除")
+    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_record:delete")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        appSceneCostPurchaseRecordService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "app_scene_cost_purchase_record-批量删除")
+    @ApiOperation(value = "app_scene_cost_purchase_record-批量删除", notes = "app_scene_cost_purchase_record-批量删除")
+    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_record:deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        this.appSceneCostPurchaseRecordService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    //@AutoLog(value = "app_scene_cost_purchase_record-通过id查询")
+    @ApiOperation(value = "app_scene_cost_purchase_record-通过id查询", notes = "app_scene_cost_purchase_record-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<AppSceneCostPurchaseRecord> queryById(@RequestParam(name = "id", required = true) String id) {
+        AppSceneCostPurchaseRecord appSceneCostPurchaseRecord = appSceneCostPurchaseRecordService.getById(id);
+        if (appSceneCostPurchaseRecord == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(appSceneCostPurchaseRecord);
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param appSceneCostPurchaseRecord
+     */
+    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_record:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, AppSceneCostPurchaseRecord appSceneCostPurchaseRecord) {
+        return super.exportXls(request, appSceneCostPurchaseRecord, AppSceneCostPurchaseRecord.class, "app_scene_cost_purchase_record");
+    }
+
+    /**
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_purchase_record:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, AppSceneCostPurchaseRecord.class);
+    }
+
+}

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

@@ -157,7 +157,7 @@ public class AppSceneCostResultValueController extends JeecgController<AppSceneC
     * @param request
     * @param appSceneCostResultValue
     */
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_result_value:exportXls")
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_result_value:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, AppSceneCostResultValue appSceneCostResultValue) {
         return super.exportXls(request, appSceneCostResultValue, AppSceneCostResultValue.class, "app_scene_cost_result_value");
@@ -170,7 +170,7 @@ public class AppSceneCostResultValueController extends JeecgController<AppSceneC
     * @param response
     * @return
     */
-    @RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_result_value:importExcel")
+    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_result_value:importExcel")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, AppSceneCostResultValue.class);

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

@@ -0,0 +1,160 @@
+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.AppSceneCostStandardDetail;
+import com.zzsmart.qomo.kn.cost.manage.service.IAppSceneCostStandardDetailService;
+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.system.base.controller.JeecgController;
+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 org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @Description: app_scene_cost_standard_detail
+ * @Author: jeecg-boot
+ * @Date: 2024-07-31
+ * @Version: V1.0
+ */
+@Api(tags = "cost-标准成本单行查询")
+@RestController
+@RequestMapping("//costStandardDetail")
+@Slf4j
+public class AppSceneCostStandardDetailController extends JeecgController<AppSceneCostStandardDetail, IAppSceneCostStandardDetailService> {
+    @Autowired
+    private IAppSceneCostStandardDetailService appSceneCostStandardDetailService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param appSceneCostStandardDetail
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    //@AutoLog(value = "app_scene_cost_standard_detail-分页列表查询")
+    @ApiOperation(value = "app_scene_cost_standard_detail-分页列表查询", notes = "app_scene_cost_standard_detail-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<AppSceneCostStandardDetail>> queryPageList(AppSceneCostStandardDetail appSceneCostStandardDetail, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+        QueryWrapper<AppSceneCostStandardDetail> queryWrapper = QueryGenerator.initQueryWrapper(appSceneCostStandardDetail, req.getParameterMap());
+        Page<AppSceneCostStandardDetail> page = new Page<AppSceneCostStandardDetail>(pageNo, pageSize);
+        IPage<AppSceneCostStandardDetail> pageList = appSceneCostStandardDetailService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+//
+//    /**
+//     * 添加
+//     *
+//     * @param appSceneCostStandardDetail
+//     * @return
+//     */
+//    @AutoLog(value = "app_scene_cost_standard_detail-添加")
+//    @ApiOperation(value = "app_scene_cost_standard_detail-添加", notes = "app_scene_cost_standard_detail-添加")
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_detail:add")
+//    @PostMapping(value = "/add")
+//    public Result<String> add(@RequestBody AppSceneCostStandardDetail appSceneCostStandardDetail) {
+//        appSceneCostStandardDetailService.save(appSceneCostStandardDetail);
+//        return Result.OK("添加成功！");
+//    }
+
+//    /**
+//     * 编辑
+//     *
+//     * @param appSceneCostStandardDetail
+//     * @return
+//     */
+//    @AutoLog(value = "app_scene_cost_standard_detail-编辑")
+//    @ApiOperation(value = "app_scene_cost_standard_detail-编辑", notes = "app_scene_cost_standard_detail-编辑")
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_detail:edit")
+//    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+//    public Result<String> edit(@RequestBody AppSceneCostStandardDetail appSceneCostStandardDetail) {
+//        appSceneCostStandardDetailService.updateById(appSceneCostStandardDetail);
+//        return Result.OK("编辑成功!");
+//    }
+//
+//    /**
+//     * 通过id删除
+//     *
+//     * @param id
+//     * @return
+//     */
+//    @AutoLog(value = "app_scene_cost_standard_detail-通过id删除")
+//    @ApiOperation(value = "app_scene_cost_standard_detail-通过id删除", notes = "app_scene_cost_standard_detail-通过id删除")
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_detail:delete")
+//    @DeleteMapping(value = "/delete")
+//    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+//        appSceneCostStandardDetailService.removeById(id);
+//        return Result.OK("删除成功!");
+//    }
+//
+//    /**
+//     * 批量删除
+//     *
+//     * @param ids
+//     * @return
+//     */
+//    @AutoLog(value = "app_scene_cost_standard_detail-批量删除")
+//    @ApiOperation(value = "app_scene_cost_standard_detail-批量删除", notes = "app_scene_cost_standard_detail-批量删除")
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_detail:deleteBatch")
+//    @DeleteMapping(value = "/deleteBatch")
+//    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+//        this.appSceneCostStandardDetailService.removeByIds(Arrays.asList(ids.split(",")));
+//        return Result.OK("批量删除成功!");
+//    }
+
+//    /**
+//     * 通过id查询
+//     *
+//     * @param id
+//     * @return
+//     */
+//    //@AutoLog(value = "app_scene_cost_standard_detail-通过id查询")
+//    @ApiOperation(value = "app_scene_cost_standard_detail-通过id查询", notes = "app_scene_cost_standard_detail-通过id查询")
+//    @GetMapping(value = "/queryById")
+//    public Result<AppSceneCostStandardDetail> queryById(@RequestParam(name = "id", required = true) String id) {
+//        AppSceneCostStandardDetail appSceneCostStandardDetail = appSceneCostStandardDetailService.getById(id);
+//        if (appSceneCostStandardDetail == null) {
+//            return Result.error("未找到对应数据");
+//        }
+//        return Result.OK(appSceneCostStandardDetail);
+//    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param appSceneCostStandardDetail
+     */
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_detail:exportXls")
+    @RequestMapping(value = "/exportXls")
+    @ApiOperation(value = "cost-单行查询导出", notes = "cost-单行查询导出")
+    public ModelAndView exportXls(HttpServletRequest request, AppSceneCostStandardDetail appSceneCostStandardDetail) {
+        return super.exportXls(request, appSceneCostStandardDetail, AppSceneCostStandardDetail.class, "app_scene_cost_standard_detail");
+    }
+
+//    /**
+//     * 通过excel导入数据
+//     *
+//     * @param request
+//     * @param response
+//     * @return
+//     */
+//    //@RequiresPermissions("com.zzsmart.qomo.kn.cost.manage:app_scene_cost_standard_detail:importExcel")
+//    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+//    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+//        return super.importExcel(request, response, AppSceneCostStandardDetail.class);
+//    }
+
+}

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

@@ -0,0 +1,155 @@
+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.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.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;
+
+/**
+ * @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/CostStandardDetailController.java

@@ -1,70 +0,0 @@
-package com.zzsmart.qomo.kn.cost.manage.controller;
-
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardDetail;
-import com.zzsmart.qomo.kn.cost.manage.service.CostStandardDetailService;
-import com.zzsmart.qomo.kn.cost.manage.vo.CostStandardDetailSearch;
-import com.zzsmart.qomo.kn.cost.manage.vo.CostStandardDetailVO;
-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.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-/**
- * <p>
- * 标准成本明细表 前端控制器
- * </p>
- *
- * @author app_scene_cost_purchase_price
- * @since 2024-06-19
- */
-@Api(tags = "cost-标准成本单行查询")
-@RestController
-@RequestMapping("//costStandardDetail")
-@Slf4j
-public class CostStandardDetailController extends JeecgController<CostStandardDetail, CostStandardDetailService> {
-    @Autowired
-    private CostStandardDetailService costStandardDetailService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param costStandard
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    //@AutoLog(value = "标准成本单行列表查询")
-    @ApiOperation(value = "标准成本单行列表查询", notes = "标准成本单行列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<CostStandardDetailVO>> queryPageList(CostStandardDetailVO costStandard, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
-
-        Page<CostStandardDetailVO> page = new Page<CostStandardDetailVO>(pageNo, pageSize);
-        IPage<CostStandardDetailVO> pageList = costStandardDetailService.pageList(page, costStandard);
-        return Result.OK(pageList);
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param costStandardDetailSearch
-     */
-    @RequestMapping(value = "/exportXls", method = RequestMethod.GET)
-    @ApiOperation(value = "单行查询导出", notes = "单行查询导出")
-    public Result exportXls(HttpServletRequest request, HttpServletResponse response, CostStandardDetailSearch costStandardDetailSearch) throws IOException {
-        JSONObject result = costStandardDetailService.exportExcel(request, response, costStandardDetailSearch);
-        return Result.OK(result);
-    }
-}

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/AppSceneCostBomRelevancy.java

@@ -0,0 +1,87 @@
+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.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: app_scene_cost_bom_relevancy
+ * @Author: jeecg-boot
+ * @Date:   2024-09-08
+ * @Version: V1.0
+ */
+@Data
+@TableName("app_scene_cost_bom_relevancy")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="app_scene_cost_bom_relevancy对象", description="app_scene_cost_bom_relevancy")
+public class AppSceneCostBomRelevancy implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**父物料号*/
+	@Excel(name = "父物料号", width = 15)
+    @ApiModelProperty(value = "父物料号")
+    private String matnr;
+	/**版本号*/
+	@Excel(name = "版本号", width = 15)
+    @ApiModelProperty(value = "版本号")
+    private String versionNumber;
+	/**posnr*/
+	@Excel(name = "posnr", width = 15)
+    @ApiModelProperty(value = "posnr")
+    private String posnr;
+	/**工厂*/
+	@Excel(name = "工厂", width = 15)
+    @ApiModelProperty(value = "工厂")
+    private String werks;
+	/**bmeng*/
+	@Excel(name = "bmeng", width = 15)
+    @ApiModelProperty(value = "bmeng")
+    private BigDecimal bmeng;
+	/**stlan*/
+	@Excel(name = "stlan", width = 15)
+    @ApiModelProperty(value = "stlan")
+    private String stlan;
+	/**antxt*/
+	@Excel(name = "antxt", width = 15)
+    @ApiModelProperty(value = "antxt")
+    private String antxt;
+	/**子物料号*/
+	@Excel(name = "子物料号", width = 15)
+    @ApiModelProperty(value = "子物料号")
+    private String idnrk;
+	/**领用量*/
+	@Excel(name = "领用量", width = 15)
+    @ApiModelProperty(value = "领用量")
+    private String meins;
+	/**menge*/
+	@Excel(name = "menge", width = 15)
+    @ApiModelProperty(value = "menge")
+    private BigDecimal menge;
+	/**ausch*/
+	@Excel(name = "ausch", width = 15)
+    @ApiModelProperty(value = "ausch")
+    private BigDecimal ausch;
+	/**datuv*/
+	@Excel(name = "datuv", width = 15)
+    @ApiModelProperty(value = "datuv")
+    private String datuv;
+	/**potx1*/
+	@Excel(name = "potx1", width = 15)
+    @ApiModelProperty(value = "potx1")
+    private String potx1;
+}

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

@@ -1,85 +1,106 @@
 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.EqualsAndHashCode;
+import lombok.*;
 import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Description: app_scene_cost_count
  * @Author: jeecg-boot
- * @Date:   2024-07-29
+ * @Date: 2024-07-29
  * @Version: V1.0
  */
 @Data
 @TableName("app_scene_cost_count")
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="app_scene_cost_count对象", description="app_scene_cost_count")
+@ApiModel(value = "app_scene_cost_count对象", description = "app_scene_cost_count")
 public class AppSceneCostCount implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/**主键*/
+    /**
-	@TableId(type = IdType.ASSIGN_ID)
+     * 主键
+     */
+    @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
     private Integer id;
-	/**物料编号*/
+    /**
-	@Excel(name = "物料编号", width = 15)
+     * 物料编号
+     */
+    @Excel(name = "物料编号", width = 15)
     @ApiModelProperty(value = "物料编号")
     private String materialNo;
-	/**图号*/
+    /**
-	@Excel(name = "图号", width = 15)
+     * 图号
+     */
+    @Excel(name = "图号", width = 15)
     @ApiModelProperty(value = "图号")
     private String drawingNo;
-	/**stage*/
+    /**
-	@Excel(name = "stage", width = 15)
+     * stage
+     */
+    @Excel(name = "阶段", width = 15)
     @ApiModelProperty(value = "stage")
     private String stage;
-	/**标准成本计算流程id*/
+    /**
-	@Excel(name = "标准成本计算流程id", width = 15)
+     * 标准成本计算流程id
+     */
+    @Excel(name = "标准成本计算流程id", width = 15)
     @ApiModelProperty(value = "标准成本计算流程id")
     private Integer flowDefinitionId;
-	/**year*/
+    /**
-	@Excel(name = "year", width = 15)
+     * year
+     */
+    @Excel(name = "年份", width = 15)
     @ApiModelProperty(value = "year")
     private String year;
-	/**状态*/
+    /**
-	@Excel(name = "状态", width = 15)
+     * 状态
+     */
+    @Excel(name = "状态", width = 15)
     @ApiModelProperty(value = "状态")
     private Integer status;
-	/**模型版本*/
+    /**
-	@Excel(name = "模型版本", width = 15)
+     * 模型版本
-    @ApiModelProperty(value = "模型版本")
+     */
+    @Excel(name = "标准成本版本", width = 15)
+    @ApiModelProperty(value = "标准成本版本")
     private String costVersion;
-	/**创建人*/
+    /**
+     * 创建人
+     */
     @ApiModelProperty(value = "创建人")
     private Integer createBy;
-	/**创建时间*/
+    /**
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+     * 创建时间
-    @DateTimeFormat(pattern="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 createTime;
-	/**更新人*/
+    /**
+     * 更新人
+     */
     @ApiModelProperty(value = "更新人")
     private Integer updateBy;
-	/**更新时间*/
+    /**
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+     * 更新时间
-    @DateTimeFormat(pattern="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 updateTime;
 }

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

@@ -0,0 +1,114 @@
+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;
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+    /**
+     * 年度
+     */
+    @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;
+}

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/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 java.util.Date;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Accessors;
 
 /**
- * <p>
+ * @Description: app_scene_cost_material_process_hours
- * 物料工时工序表
+ * @Author: jeecg-boot
- * </p>
+ * @Date: 2024-08-02
- *
+ * @Version: V1.0
- * @author
- * @since 2024-06-19
  */
-@Getter
+@Data
-@Setter
-@Accessors(chain = true)
 @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(type = IdType.ASSIGN_ID)
-    @TableId(value = "id", type = IdType.AUTO)
+    @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")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime createTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
     /**
      * 修改人
      */
-    @TableField("update_by")
+    @ApiModelProperty(value = "修改人")
     private String updateBy;
-
     /**
      * 修改时间
      */
-    @TableField("update_time")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime updateTime;
+    @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/AppSceneCostModel.java

@@ -1,75 +1,88 @@
 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.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.*;
 import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Description: app_scene_cost_model
  * @Author: jeecg-boot
- * @Date:   2024-07-29
+ * @Date: 2024-09-09
  * @Version: V1.0
  */
 @Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 @TableName("app_scene_cost_model")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="app_scene_cost_model对象", description="app_scene_cost_model")
+@ApiModel(value = "app_scene_cost_model对象", description = "app_scene_cost_model")
 public class AppSceneCostModel implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/**主键*/
+    /**
-	@TableId(type = IdType.ASSIGN_ID)
+     * 主键
+     */
+    @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
     private Integer id;
-	/**物料编号*/
+    /**
-	@Excel(name = "物料编号", width = 15)
+     * 模型名称
-    @ApiModelProperty(value = "物料编号")
+     */
-    private String materialNo;
+    @Excel(name = "模型名称", width = 15)
-	/**图号*/
+    @ApiModelProperty(value = "模型名称")
-	@Excel(name = "图号", width = 15)
+    private String modelName;
-    @ApiModelProperty(value = "图号")
+    /**
-    private String drawingNo;
+     * 模型类型（标准成本、成本挖掘）
-	/**标准成本计算流程id*/
+     */
-	@Excel(name = "标准成本计算流程id", width = 15)
+    @Excel(name = "模型类型（标准成本、成本挖掘）", width = 15)
-    @ApiModelProperty(value = "标准成本计算流程id")
+    @ApiModelProperty(value = "模型类型（标准成本、成本挖掘）")
+    private String modelType;
+    /**
+     * 模型定义id
+     */
+    @Excel(name = "模型定义id", width = 15)
+    @ApiModelProperty(value = "模型定义id")
     private Integer flowDefinitionId;
-	/**状态*/
+    /**
-	@Excel(name = "状态", width = 15)
+     * 状态(草稿、已发布、已作废)
-    @ApiModelProperty(value = "状态")
+     */
-    private Integer status;
+    @Excel(name = "状态(草稿、已发布、已作废)", width = 15)
-	/**模型版本*/
+    @ApiModelProperty(value = "状态(草稿、已发布、已作废)")
-	@Excel(name = "模型版本", width = 15)
+    private String status;
-    @ApiModelProperty(value = "模型版本")
+    /**
-    private String modelVersion;
+     * 创建时间
-	/**创建人*/
+     */
-    @ApiModelProperty(value = "创建人")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    private Integer createBy;
+    @DateTimeFormat(pattern = "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 createTime;
-	/**更新人*/
+    /**
-    @ApiModelProperty(value = "更新人")
+     * 创建人
-    private Integer updateBy;
+     */
-	/**更新时间*/
+    @ApiModelProperty(value = "创建人")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    private String createBy;
-    @DateTimeFormat(pattern="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 updateTime;
+    /**
+     * 更新人
+     */
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
 }

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

@@ -1,55 +1,61 @@
 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.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: 标准成本-部件缺失信息
+ * @Description: app_scene_cost_part_missing_info
- * @Author: wangqiong
+ * @Author: jeecg-boot
- * @Date:   2024-06-13
+ * @Date: 2024-08-02
  * @Version: V1.0
  */
 @Data
+@Builder
 @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")
+@ApiModel(value = "app_scene_cost_part_missing_info对象", description = "app_scene_cost_part_missing_info")
-public class CostPartMissingInfo implements Serializable {
+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/AppSceneCostProductProcessMaintenance.java

@@ -0,0 +1,111 @@
+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.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: app_scene_cost_product_process_maintenance
+ * @Author: jeecg-boot
+ * @Date:   2024-09-08
+ * @Version: V1.0
+ */
+@Data
+@TableName("app_scene_cost_product_process_maintenance")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="app_scene_cost_product_process_maintenance对象", description="app_scene_cost_product_process_maintenance")
+public class AppSceneCostProductProcessMaintenance implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**工厂*/
+	@Excel(name = "工厂", width = 15)
+    @ApiModelProperty(value = "工厂")
+    private String factory;
+	/**物料号*/
+	@Excel(name = "物料号", width = 15)
+    @ApiModelProperty(value = "物料号")
+    private String mainPartNumber;
+	/**工序编号*/
+	@Excel(name = "工序编号", width = 15)
+    @ApiModelProperty(value = "工序编号")
+    private String processRouteNumber;
+	/**序号*/
+	@Excel(name = "序号", width = 15)
+    @ApiModelProperty(value = "序号")
+    private String serialNumber;
+	/**工序名称*/
+	@Excel(name = "工序名称", width = 15)
+    @ApiModelProperty(value = "工序名称")
+    private String processName;
+	/**成本中心*/
+	@Excel(name = "成本中心", width = 15)
+    @ApiModelProperty(value = "成本中心")
+    private String costCenterCode;
+	/**准备工时*/
+	@Excel(name = "准备工时", width = 15)
+    @ApiModelProperty(value = "准备工时")
+    private BigDecimal prepareHour;
+	/**人工工时*/
+	@Excel(name = "人工工时", width = 15)
+    @ApiModelProperty(value = "人工工时")
+    private BigDecimal laborHour;
+	/**设备工时*/
+	@Excel(name = "设备工时", width = 15)
+    @ApiModelProperty(value = "设备工时")
+    private BigDecimal machineHour;
+	/**燃动工时*/
+	@Excel(name = "燃动工时", width = 15)
+    @ApiModelProperty(value = "燃动工时")
+    private BigDecimal burningHour;
+	/**辅料工时*/
+	@Excel(name = "辅料工时", width = 15)
+    @ApiModelProperty(value = "辅料工时")
+    private BigDecimal auxiliaryHour;
+	/**其他工时*/
+	@Excel(name = "其他工时", width = 15)
+    @ApiModelProperty(value = "其他工时")
+    private BigDecimal otherHour;
+	/**hourType*/
+	@Excel(name = "hourType", width = 15)
+    @ApiModelProperty(value = "hourType")
+    private String hourType;
+	/**版本号*/
+	@Excel(name = "版本号", width = 15)
+    @ApiModelProperty(value = "版本号")
+    private String versionNumber;
+	/**guardian*/
+	@Excel(name = "guardian", width = 15)
+    @ApiModelProperty(value = "guardian")
+    private String guardian;
+	/**maintenanceTime*/
+	@Excel(name = "maintenanceTime", width = 15)
+    @ApiModelProperty(value = "maintenanceTime")
+    private String maintenanceTime;
+	/**reserve1*/
+	@Excel(name = "reserve1", width = 15)
+    @ApiModelProperty(value = "reserve1")
+    private String reserve1;
+	/**reserve2*/
+	@Excel(name = "reserve2", width = 15)
+    @ApiModelProperty(value = "reserve2")
+    private BigDecimal reserve2;
+	/**jobCode*/
+	@Excel(name = "jobCode", width = 15)
+    @ApiModelProperty(value = "jobCode")
+    private String jobCode;
+}

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

@@ -0,0 +1,86 @@
+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.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: app_scene_cost_purchase_evaluate
+ * @Author: jeecg-boot
+ * @Date: 2024-08-02
+ * @Version: V1.0
+ */
+@Data
+@Builder
+@TableName("app_scene_cost_purchase_evaluate")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "app_scene_cost_purchase_evaluate对象", description = "app_scene_cost_purchase_evaluate")
+public class AppSceneCostPurchaseEvaluate implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private Integer id;
+    /**
+     * 合同编号
+     */
+    @Excel(name = "合同编号", width = 15)
+    @ApiModelProperty(value = "合同编号")
+    private String contractNo;
+    /**
+     * 估价
+     */
+    @Excel(name = "估价", width = 15)
+    @ApiModelProperty(value = "估价")
+    private BigDecimal evaluate;
+    /**
+     * 合同名称
+     */
+    @Excel(name = "合同名称", width = 15)
+    @ApiModelProperty(value = "合同名称")
+    private String contractName;
+    /**
+     * 创建时间
+     */
+    @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 Integer createBy;
+    /**
+     * 更新时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+    /**
+     * 更新人
+     */
+    @ApiModelProperty(value = "更新人")
+    private Integer updateBy;
+}

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/AppSceneCostPurchaseRecord.java

@@ -0,0 +1,94 @@
+package com.zzsmart.qomo.kn.cost.manage.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+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 java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @Description: app_scene_cost_purchase_record
+ * @Author: jeecg-boot
+ * @Date: 2024-09-08
+ * @Version: V1.0
+ */
+@Data
+@TableName("app_scene_cost_purchase_record")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "app_scene_cost_purchase_record对象", description = "app_scene_cost_purchase_record")
+public class AppSceneCostPurchaseRecord implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 工厂
+     */
+    @Excel(name = "工厂", width = 15)
+    @ApiModelProperty(value = "工厂")
+    private String werks;
+    /**
+     * 组织
+     */
+    @Excel(name = "组织", width = 15)
+    @ApiModelProperty(value = "组织")
+    private String ekorg;
+    /**
+     * 物料号
+     */
+    @Excel(name = "物料号", width = 15)
+    @ApiModelProperty(value = "物料号")
+    private String infnr;
+    /**
+     * 供应商代码
+     */
+    @Excel(name = "供应商代码", width = 15)
+    @ApiModelProperty(value = "供应商代码")
+    private String lifnr;
+    /**
+     * esokz
+     */
+    @Excel(name = "esokz", width = 15)
+    @ApiModelProperty(value = "esokz")
+    private String esokz;
+    /**
+     * 单价
+     */
+    @Excel(name = "单价", width = 15)
+    @ApiModelProperty(value = "单价")
+    private BigDecimal netpr;
+    /**
+     * 币种
+     */
+    @Excel(name = "币种", width = 15)
+    @ApiModelProperty(value = "币种")
+    private String waers;
+    /**
+     * 有效截止时间
+     */
+    @Excel(name = "有效截止时间", width = 15)
+    @ApiModelProperty(value = "有效截止时间")
+    private String prdat;
+    /**
+     * 有效开始时间
+     */
+    @Excel(name = "有效开始时间", width = 15)
+    @ApiModelProperty(value = "有效开始时间")
+    private String erdat;
+    /**
+     * ukurs
+     */
+    @Excel(name = "ukurs", width = 15)
+    @ApiModelProperty(value = "ukurs")
+    private BigDecimal ukurs;
+    /**
+     * 人名币单价
+     */
+    @Excel(name = "人名币单价", width = 15)
+    @ApiModelProperty(value = "人名币单价")
+    private BigDecimal cnyPrice;
+}

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

@@ -14,6 +14,7 @@ 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;
 
 /**
@@ -34,7 +35,7 @@ public class AppSceneCostResultValue implements Serializable {
     /**
      * 主键
      */
-    @TableId(type = IdType.ASSIGN_ID)
+    @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键")
     private Integer id;
     /**
@@ -115,4 +116,22 @@ public class AppSceneCostResultValue implements Serializable {
     @Excel(name = "成本类别", width = 15)
     @ApiModelProperty(value = "成本类别")
     private String costType;
+    /**
+     * 成本明细
+     */
+    @Excel(name = "成本明细", width = 15)
+    @ApiModelProperty(value = "成本明细")
+    private String costDetail;
+    /**
+     * 单价或费率
+     */
+    @Excel(name = "单价或费率", width = 15)
+    @ApiModelProperty(value = "单价或费率")
+    private BigDecimal priceOrRate;
+    /**
+     * 工时
+     */
+    @Excel(name = "工时", width = 15)
+    @ApiModelProperty(value = "工时")
+    private BigDecimal hour;
 }

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

@@ -0,0 +1,159 @@
+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.Builder;
+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_standard_detail
+ * @Author: jeecg-boot
+ * @Date: 2024-07-31
+ * @Version: V1.0
+ */
+@Data
+@Builder
+@TableName("app_scene_cost_standard_detail")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "app_scene_cost_standard_detail对象", description = "app_scene_cost_standard_detail")
+public class AppSceneCostStandardDetail 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 figureNumber;
+    /**物料号,关联kn_new_sap_mara表matnr字段*/
+    @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 materialName;
+    /**父类物料号*/
+    @Excel(name = "父类物料号", width = 15)
+    @ApiModelProperty(value = "父类物料号")
+    private String parentMaterialNumber;
+    /**版本号*/
+    @Excel(name = "版本号", width = 15)
+    @ApiModelProperty(value = "版本号")
+    private String versionNumber;
+    /**层级*/
+    @Excel(name = "层级", width = 15)
+    @ApiModelProperty(value = "层级")
+    private Integer level;
+    /**序号*/
+    @Excel(name = "序号", width = 15)
+    @ApiModelProperty(value = "序号")
+    private Integer sort;
+    /**用量*/
+    @Excel(name = "用量", width = 15)
+    @ApiModelProperty(value = "用量")
+    private Double dosage;
+    /**单位*/
+    @Excel(name = "单位", width = 15)
+    @ApiModelProperty(value = "单位")
+    private String unit;
+    /**本阶材料费*/
+    @Excel(name = "本阶材料费", width = 15)
+    @ApiModelProperty(value = "本阶材料费")
+    private BigDecimal materialCost;
+    /**本阶人工费*/
+    @Excel(name = "本阶人工陈本", width = 15)
+    @ApiModelProperty(value = "本阶人工成本")
+    private BigDecimal laborCost;
+    /**本阶辅料费*/
+    @Excel(name = "本阶辅料费", width = 15)
+    @ApiModelProperty(value = "本阶辅料费")
+    private BigDecimal supplyMaterialCost;
+    /**本阶机器折旧费*/
+    @Excel(name = "本阶机器折旧费", width = 15)
+    @ApiModelProperty(value = "本阶机器折旧费")
+    private BigDecimal equipmentCost;
+    /**本阶水电费（燃动费）*/
+    @Excel(name = "本阶水电费（燃动费）", width = 15)
+    @ApiModelProperty(value = "本阶水电费（燃动费）")
+    private BigDecimal driveCost;
+    /**本阶其他制造费*/
+    @Excel(name = "本阶其他费用", width = 15)
+    @ApiModelProperty(value = "本阶其他费用")
+    private BigDecimal otherCost;
+    /**本阶物流费*/
+    @Excel(name = "本阶物流费", width = 15)
+    @ApiModelProperty(value = "本阶物流费")
+    private BigDecimal logisticsCost;
+    /**累计物料成本*/
+    @Excel(name = "累计物料成本", width = 15)
+    @ApiModelProperty(value = "累计物料成本")
+    private BigDecimal totalMaterialCost;
+    /**累计人工成本*/
+    @Excel(name = "累计人工成本", width = 15)
+    @ApiModelProperty(value = "累计人工成本")
+    private BigDecimal totalLaborCost;
+    /**累计辅料费*/
+    @Excel(name = "累计辅料费", width = 15)
+    @ApiModelProperty(value = "累计辅料费")
+    private BigDecimal totalSupplyMaterialCost;
+    /**累计机器折旧费*/
+    @Excel(name = "累计机器折旧费", width = 15)
+    @ApiModelProperty(value = "累计机器折旧费")
+    private BigDecimal totalEquipmentCost;
+    /**累计水电费（燃动费）*/
+    @Excel(name = "累计水电费（燃动费）", width = 15)
+    @ApiModelProperty(value = "累计水电费（燃动费）")
+    private BigDecimal totalDriveCost;
+    /**累计其他费用*/
+    @Excel(name = "累计其他费用", width = 15)
+    @ApiModelProperty(value = "累计其他费用")
+    private BigDecimal totalOtherCost;
+    /**累计物流费用*/
+    @Excel(name = "累计物流费用", width = 15)
+    @ApiModelProperty(value = "累计物流费用")
+    private BigDecimal totalLogisticsCost;
+    /**本阶标准成本*/
+    @Excel(name = "本阶标准成本", width = 15)
+    @ApiModelProperty(value = "本阶标准成本")
+    private BigDecimal currentStandardCost;
+    /**累计标准成本*/
+    @Excel(name = "累计标准成本", width = 15)
+    @ApiModelProperty(value = "累计标准成本")
+    private BigDecimal totalStandardCost;
+    /**创建人*/
+    @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/AppSceneCostStandardVersion.java

@@ -0,0 +1,146 @@
+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.Builder;
+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.util.Date;
+
+/**
+ * @Description: app_scene_cost_standard_version
+ * @Author: jeecg-boot
+ * @Date: 2024-09-08
+ * @Version: V1.0
+ */
+@Data
+@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 AppSceneCostStandardVersion implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键id")
+    private Integer id;
+    /**
+     * 项目名称
+     */
+    @Excel(name = "项目名称", width = 15)
+    @ApiModelProperty(value = "项目名称")
+    private String projectname;
+    /**
+     * 阶段
+     */
+    @Excel(name = "阶段", width = 15)
+    @ApiModelProperty(value = "阶段")
+    private String stage;
+    /**
+     * 日期
+     */
+    @Excel(name = "日期", width = 15)
+    @ApiModelProperty(value = "日期")
+    private String date;
+    /**
+     * 版本号
+     */
+    @Excel(name = "版本号", width = 15)
+    @ApiModelProperty(value = "版本号")
+    private String version;
+    /**
+     * 工厂
+     */
+    @Excel(name = "工厂", width = 15)
+    @ApiModelProperty(value = "工厂")
+    private String werks;
+    /**
+     * 物料号
+     */
+    @Excel(name = "物料号", width = 15)
+    @ApiModelProperty(value = "物料号")
+    private String matnr;
+    /**
+     * 状态
+     */
+    @Excel(name = "状态", width = 15)
+    @ApiModelProperty(value = "状态")
+    private String status;
+    /**
+     * 创建时间
+     */
+    @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 createdtime;
+    /**
+     * 完成时间
+     */
+    @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 finishtime;
+    /**
+     * batchname
+     */
+    @Excel(name = "batchname", width = 15)
+    @ApiModelProperty(value = "batchname")
+    private String batchname;
+    /**
+     * userid
+     */
+    @Excel(name = "userid", width = 15)
+    @ApiModelProperty(value = "userid")
+    private Integer userid;
+    /**
+     * 图号
+     */
+    @Excel(name = "图号", width = 15)
+    @ApiModelProperty(value = "图号")
+    private String graphicnumber;
+    /**
+     * projectpspid
+     */
+    @Excel(name = "projectpspid", width = 15)
+    @ApiModelProperty(value = "projectpspid")
+    private String projectpspid;
+    /**
+     * projectcate
+     */
+    @Excel(name = "projectcate", width = 15)
+    @ApiModelProperty(value = "projectcate")
+    private String projectcate;
+    /**
+     * keylost
+     */
+    @Excel(name = "keylost", width = 15)
+    @ApiModelProperty(value = "keylost")
+    private Integer keylost;
+    /**
+     * mknum
+     */
+    @Excel(name = "mknum", width = 15)
+    @ApiModelProperty(value = "mknum")
+    private Integer mknum;
+    /**
+     * 年份
+     */
+    @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/CostStandardDetail.java

@@ -1,273 +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 io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 标准成本明细表
- * </p>
- *
- * @author
- * @since 2024-06-20
- */
-@Data
-@Accessors(chain = true)
-@TableName("app_scene_cost_standard_detail")
-@EqualsAndHashCode
-public class CostStandardDetail implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * id
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private String id;
-
-    /**
-     * 物料号,关联kn_new_sap_mara表matnr字段
-     */
-    @TableField("material_number")
-    @ApiModelProperty(value = "物料号,关联kn_new_sap_mara表matnr字段")
-    @Excel(name = "物料号")
-    private String materialNumber;
-
-    /**
-     * 物料名称
-     */
-    @TableField("material_name")
-    @ApiModelProperty(value = "物料名称")
-    @Excel(name = "物料名称")
-    private String materialName;
-
-    /**
-     * 父类物料号
-     */
-    @TableField("parent_material_number")
-    @ApiModelProperty(value = "父类物料号")
-    @Excel(name = "父类物料号")
-    private String parentMaterialNumber;
-
-    /**
-     * 版本号id
-     */
-    @TableField("version_number_id")
-    @ApiModelProperty(value = "版本号id")
-    private String versionNumberId;
-
-    /**
-     * 层级
-     */
-    @TableField("level")
-    @ApiModelProperty(value = "层级")
-    @Excel(name = "层级")
-    private Integer level;
-
-    /**
-     * 图号
-     */
-    @TableField("figure_number")
-    @ApiModelProperty(value = "图号")
-    @Excel(name = "图号")
-    private String figureNumber;
-
-    /**
-     * 用量
-     */
-    @TableField("dosage")
-    @ApiModelProperty(value = "用量")
-    @Excel(name = "用量")
-    private Double dosage;
-
-    /**
-     * 单位
-     */
-    @TableField("unit")
-    @ApiModelProperty(value = "单位")
-    @Excel(name = "单位")
-    private String unit;
-
-    /**
-     * 规格
-     */
-    @TableField("specification")
-    @ApiModelProperty(value = "规格")
-    @Excel(name = "规格")
-    private String specification;
-
-    /**
-     * bom材料费
-     */
-    @TableField("bom_cost")
-    @ApiModelProperty(value = "bom材料费")
-    @Excel(name = "bom材料费")
-    private BigDecimal bomCost;
-
-    /**
-     * 包装费
-     */
-    @TableField("packing_cost")
-    @ApiModelProperty(value = "包装费")
-    @Excel(name = "包装费")
-    private BigDecimal packingCost;
-
-    /**
-     * 本阶辅料费
-     */
-    @TableField("auxiliary_cost")
-    @ApiModelProperty(value = "本阶辅料费")
-    @Excel(name = "本阶辅料费")
-    private BigDecimal auxiliaryCost;
-
-    /**
-     * 本阶人工费
-     */
-    @TableField("labor_cost")
-    @ApiModelProperty(value = "本阶人工费")
-    @Excel(name = "本阶人工费")
-    private BigDecimal laborCost;
-
-    /**
-     * 机器折旧费
-     */
-    @TableField("euip_depreciation_cost")
-    @ApiModelProperty(value = "机器折旧费")
-    @Excel(name = "机器折旧费")
-    private BigDecimal euipDepreciationCost;
-
-    /**
-     * 机物料消耗费
-     */
-    @TableField("equip_consume_cost")
-    @ApiModelProperty(value = "机物料消耗费")
-    @Excel(name = "机物料消耗费")
-    private BigDecimal equipConsumeCost;
-
-    /**
-     * 水电费
-     */
-    @TableField("hydroelectricity_cost")
-    @ApiModelProperty(value = "水电费")
-    @Excel(name = "水电费")
-    private BigDecimal hydroelectricityCost;
-
-    /**
-     * 其他制造费
-     */
-    @TableField("other_cost")
-    @ApiModelProperty(value = "其他制造费")
-    @Excel(name = "其他制造费")
-    private BigDecimal otherCost;
-
-    /**
-     * 物流费
-     */
-    @TableField("trail_cost")
-    @ApiModelProperty(value = "物流费")
-    @Excel(name = "物流费")
-    private BigDecimal trailCost;
-
-    /**
-     * 制造成本
-     */
-    @TableField("manufacture_cost")
-    @ApiModelProperty(value = "制造成本")
-    @Excel(name = "制造成本")
-    private BigDecimal manufactureCost;
-
-    /**
-     * 累计人工费
-     */
-    @TableField("total_labor_cost")
-    @ApiModelProperty(value = "累计人工费")
-    @Excel(name = "累计人工费")
-    private BigDecimal totalLaborCost;
-
-    /**
-     * 累计机器消耗费
-     */
-    @TableField("total_equip_consume_cost")
-    @ApiModelProperty(value = "累计机器消耗费")
-    @Excel(name = "累计机器消耗费")
-    private BigDecimal totalEquipConsumeCost;
-
-    /**
-     * 累计机器折旧费
-     */
-    @TableField("total_euip_depreciation_cost")
-    @ApiModelProperty(value = "累计机器折旧费")
-    @Excel(name = "累计机器折旧费")
-    private BigDecimal totalEuipDepreciationCost;
-
-    /**
-     * 累计水电费
-     */
-    @TableField("total_hydroelectricity_cost")
-    @ApiModelProperty(value = "累计水电费")
-    @Excel(name = "累计水电费")
-    private BigDecimal totalHydroelectricityCost;
-
-    /**
-     * 累计其它费用
-     */
-    @TableField("total_other_cost")
-    @ApiModelProperty(value = "累计其它费用")
-    @Excel(name = "累计其它费用")
-    private BigDecimal totalOtherCost;
-
-    /**
-     * 创建人
-     */
-    @TableField("create_by")
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-
-    /**
-     * 创建日期
-     */
-    @TableField("create_time")
-    @ApiModelProperty(value = "创建日期")
-    private LocalDateTime createTime;
-
-    /**
-     * 修改人
-     */
-    @TableField("update_by")
-    @ApiModelProperty(value = "修改人")
-    private String updateBy;
-
-    /**
-     * 修改日期
-     */
-    @TableField("update_time")
-    @ApiModelProperty(value = "修改日期")
-    private LocalDateTime updateTime;
-
-    /**
-     * 备注
-     */
-    @TableField("remark")
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    /**
-     * 序号
-     */
-    @TableField("sort")
-    @ApiModelProperty(value = "序号")
-    @Excel(name = "序号")
-    private Integer sort;
-
-}

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

@@ -1,103 +0,0 @@
-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.Builder;
-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.util.Date;
-
-/**
- * @Description: 标准成本-版本号
- * @Author: wangqiong
- * @Date: 2024-06-13
- * @Version: V1.0
- */
-@Data
-@TableName("app_scene_cost_standard_version")
-@Builder
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "app_scene_cost_standard_version对象", description = "app_scene_cost_standard_version")
-public class CostStandardVersion 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 figureNumber;
-    /**
-     * 阶段，A-初始，B-首批，C-量产
-     */
-    @Excel(name = "阶段", width = 15)
-    @ApiModelProperty(value = "阶段")
-    private String stage;
-    /**
-     * 物料号
-     */
-    @Excel(name = "物料号", width = 15)
-    @ApiModelProperty(value = "物料号")
-    private String materialNumber;
-    /**
-     * 版本号
-     */
-    @ApiModelProperty(value = "版本号")
-    private String versionNumber;
-    /**
-     * 版本状态
-     */
-    @ApiModelProperty(value = "版本状态")
-    private String versionStatus;
-    /**
-     * 创建人
-     */
-    @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;
-    /**
-     * 备注
-     */
-    @ApiModelProperty(value = "备注")
-    private String remark;
-    /**
-     * 年份
-     */
-    @ApiModelProperty(value = "年份")
-    private String versionYear;
-}

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/enums/CostCountStatusEnum.java

@@ -0,0 +1,73 @@
+package com.zzsmart.qomo.kn.cost.manage.enums;
+
+/**
+ * @Classname StandardStageEnum
+ * @Description 阶段枚举
+ * @Version 1.0.0
+ * @Date 2024/6/18 9:51
+ * @Created wangqiong
+ */
+public enum CostCountStatusEnum {
+
+    NotExecute("NotExecute", "未执行", 0), Executing("Executing", "计算中", 1), ExecutedFinished("ExecutedFinished", "计算完成", 2), ExecutedError("ExecutedError", "出错中止", 3);
+    private final String code;
+    private final String name;
+    private final Integer value;
+
+    CostCountStatusEnum(String code, String name, Integer value) {
+        this.code = code;
+        this.name = name;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Integer getValue() {
+        return value;
+    }
+
+    /**
+     * 根据code获取text
+     *
+     * @param codeNo
+     * @return
+     */
+    public static String getTextByCode(String codeNo) {
+        for (CostCountStatusEnum value : CostCountStatusEnum.values()) {
+            if (value.getCode().equals(codeNo)) {
+                return value.name();
+            }
+        }
+        return codeNo.toString();
+    }
+
+    public static String getTextByValue(Integer indexNo) {
+        for (CostCountStatusEnum value : CostCountStatusEnum.values()) {
+            if (value.getValue().equals(indexNo)) {
+                return value.name();
+            }
+        }
+        return indexNo.toString();
+    }
+
+    /**
+     * 根据text获取code
+     *
+     * @param name
+     * @return
+     */
+    public static String getCodeByName(String name) {
+        for (CostCountStatusEnum value : CostCountStatusEnum.values()) {
+            if (value.name().equals(name)) {
+                return value.name();
+            }
+        }
+        return name;
+    }
+}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/enums/CostModelStatusEnum.java

@@ -0,0 +1,65 @@
+package com.zzsmart.qomo.kn.cost.manage.enums;
+
+/**
+ * 预测模型状态枚举
+ */
+public enum CostModelStatusEnum {
+    /**
+     * 草稿
+     */
+    Draft("Draft", "草稿"),
+    /**
+     * 已删除
+     */
+    Delete("Deleted", "已删除"),
+    /**
+     * 已发布
+     */
+    Published("Published", "已发布");
+
+    private final String code;
+    private final String name;
+
+    CostModelStatusEnum(String code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * 根据code获取text
+     *
+     * @param codeNo
+     * @return
+     */
+    public static String getTextByCode(String codeNo) {
+        for (CostModelStatusEnum value : CostModelStatusEnum.values()) {
+            if (value.getCode().equals(codeNo)) {
+                return value.name();
+            }
+        }
+        return codeNo.toString();
+    }
+
+    /**
+     * 根据text获取code
+     *
+     * @param name
+     * @return
+     */
+    public static String getCodeByName(String name) {
+        for (CostModelStatusEnum value : CostModelStatusEnum.values()) {
+            if (value.name().equals(name)) {
+                return value.name();
+            }
+        }
+        return name;
+    }
+}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/enums/FeeTypeEnum.java

@@ -9,24 +9,22 @@ package com.zzsmart.qomo.kn.cost.manage.enums;
  */
 public enum FeeTypeEnum {
 
-    LaborCost("LaborCost", "人工成本"),
+    LaborCost("LaborCost", "人工成本"), MaterialCost("MaterialCost", "物料成本"), EquipmentFee("EquipmentFee", "设备费"), SupplyMaterialFee("SupplyMaterialFee", "辅料费"), DriverFee("DriverFee", "水电费"), OtherFee("OtherFee", "其他费用"), LogisticsFee("LogisticsFee", "物流费"), StandardCost("StandardCost", "标准成本");
-    MaterialCost("MaterialCost", "物料成本"),
-    EquipmentFee("EquipmentFee", "设备费"), SupplyMaterialFee("SupplyMaterialFee", "辅料费"), DriverFee("DriverFee", "水电费"), OtherFee("OtherFee", "其他费用"), LogisticsFee("LogisticsFee", "物流费");
 
     private final String code;
-    private final String text;
+    private final String name;
 
-    FeeTypeEnum(String code, String text) {
+    FeeTypeEnum(String code, String name) {
         this.code = code;
-        this.text = text;
+        this.name = name;
     }
 
     public String getCode() {
         return code;
     }
 
-    public String getText() {
+    public String getName() {
-        return text;
+        return name;
     }
 
     /**
@@ -38,7 +36,7 @@ public enum FeeTypeEnum {
     public static String getTextByCode(String codeNo) {
         for (FeeTypeEnum value : FeeTypeEnum.values()) {
             if (value.getCode().equals(codeNo)) {
-                return value.getText();
+                return value.name();
             }
         }
         return codeNo.toString();
@@ -47,15 +45,15 @@ public enum FeeTypeEnum {
     /**
      * 根据text获取code
      *
-     * @param textStr
+     * @param name
      * @return
      */
-    public static String getCodeByText(String textStr) {
+    public static String getCodeByName(String name) {
         for (FeeTypeEnum value : FeeTypeEnum.values()) {
-            if (value.getText().equals(textStr)) {
+            if (value.name().equals(name)) {
-                return value.getText();
+                return value.name();
             }
         }
-        return textStr;
+        return name;
     }
 }

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/enums/HourOrRateTypeEnum.java

@@ -0,0 +1,69 @@
+package com.zzsmart.qomo.kn.cost.manage.enums;
+
+/**
+ * @Classname StandardStageEnum
+ * @Description 阶段枚举
+ * @Version 1.0.0
+ * @Date 2024/6/18 9:51
+ * @Created wangqiong
+ */
+public enum HourOrRateTypeEnum {
+
+    LaborHour("LaborHour", "人员工时"),
+    LaborHourRate("LaborHourRate", "人员小时费率"),
+    MaterialUnitPrice("MaterialUnitPrice", "物料采购单价"),
+    EquipmentHour("EquipmentHour", "设备工时"),
+    EquipmentHourRate("EquipmentHourRate", "设备小时费率"),
+    SupplyMaterialHour("SupplyMaterialHour", "辅料工时"),
+    SupplyMaterialHourRate("SupplyMaterialHourRate", "辅料小时费率"),
+    DriverHour("DriverHour", "燃动工时"),
+    DriverHourRate("DriverHourRate", "燃动小时费率"),
+    OtherHour("OtherHour", "其他工时"),
+    OtherHourRate("OtherHourRate", "其他小时费率");
+
+    private final String code;
+    private final String name;
+
+    HourOrRateTypeEnum(String code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * 根据code获取text
+     *
+     * @param codeNo
+     * @return
+     */
+    public static String getTextByCode(String codeNo) {
+        for (HourOrRateTypeEnum value : HourOrRateTypeEnum.values()) {
+            if (value.getCode().equals(codeNo)) {
+                return value.name();
+            }
+        }
+        return codeNo.toString();
+    }
+
+    /**
+     * 根据text获取code
+     *
+     * @param name
+     * @return
+     */
+    public static String getCodeByName(String name) {
+        for (HourOrRateTypeEnum value : HourOrRateTypeEnum.values()) {
+            if (value.name().equals(name)) {
+                return value.name();
+            }
+        }
+        return name;
+    }
+}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/enums/TotalCostEnum.java

@@ -0,0 +1,61 @@
+package com.zzsmart.qomo.kn.cost.manage.enums;
+
+/**
+ * @Classname StandardStageEnum
+ * @Description 阶段枚举
+ * @Version 1.0.0
+ * @Date 2024/6/18 9:51
+ * @Created wangqiong
+ */
+public enum TotalCostEnum {
+
+
+    TotalLaborCost("TotalLaborCost", "总人工成本"), TotalMaterialCost("TotalMaterialCost", "总物料成本"), TotalEquipmentFee("TotalEquipmentFee", "总设备费"), TotalSupplyMaterialFee("TotalSupplyMaterialFee", "总辅料费"), TotalDriverFee("TotalDriverFee", "总水电费"), TotalOtherFee("TotalOtherFee", "总其他费用"), TotalLogisticsFee("TotalLogisticsFee", "总物流费"), TotalStandardCost("TotalStandardCost", "总标准成本");
+
+
+    private final String code;
+    private final String name;
+
+    TotalCostEnum(String code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * 根据code获取text
+     *
+     * @param codeNo
+     * @return
+     */
+    public static String getTextByCode(String codeNo) {
+        for (TotalCostEnum value : TotalCostEnum.values()) {
+            if (value.getCode().equals(codeNo)) {
+                return value.name();
+            }
+        }
+        return codeNo.toString();
+    }
+
+    /**
+     * 根据text获取code
+     *
+     * @param name
+     * @return
+     */
+    public static String getCodeByName(String name) {
+        for (TotalCostEnum value : TotalCostEnum.values()) {
+            if (value.name().equals(name)) {
+                return value.name();
+            }
+        }
+        return name;
+    }
+}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/AppSceneCostBomRelevancyMapper.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.AppSceneCostBomRelevancy;
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: app_scene_cost_bom_relevancy
+ * @Author: jeecg-boot
+ * @Date:   2024-09-08
+ * @Version: V1.0
+ */
+public interface AppSceneCostBomRelevancyMapper extends BaseMapper<AppSceneCostBomRelevancy> {
+
+}

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/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 com.zzsmart.qomo.kn.cost.manage.entity.AppSceneCostMaterialBom;
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
-import java.sql.Blob;
 import java.util.List;
 
 /**
- * <p>
+ * @Description: app_scene_cost_material_bom
- * 物料bom Mapper 接口
+ * @Author: jeecg-boot
- * </p>
+ * @Date: 2024-08-02
- *
+ * @Version: V1.0
- * @author
- * @since 2024-06-21
  */
-@Mapper
+public interface AppSceneCostMaterialBomMapper extends BaseMapper<AppSceneCostMaterialBom> {
-public interface CostMaterialBomMapper extends BaseMapper<CostMaterialBom> {
     /**
      * 根据动态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/AppSceneCostProductProcessMaintenanceMapper.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.AppSceneCostProductProcessMaintenance;
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: app_scene_cost_product_process_maintenance
+ * @Author: jeecg-boot
+ * @Date:   2024-09-08
+ * @Version: V1.0
+ */
+public interface AppSceneCostProductProcessMaintenanceMapper extends BaseMapper<AppSceneCostProductProcessMaintenance> {
+
+}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/AppSceneCostPurchaseEvaluateMapper.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.AppSceneCostPurchaseEvaluate;
+
+/**
+ * @Description: app_scene_cost_purchase_evaluate
+ * @Author: jeecg-boot
+ * @Date: 2024-08-02
+ * @Version: V1.0
+ */
+public interface AppSceneCostPurchaseEvaluateMapper extends BaseMapper<AppSceneCostPurchaseEvaluate> {
+
+}

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/AppSceneCostPurchaseRecordMapper.java

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

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

@@ -0,0 +1,15 @@
+package com.zzsmart.qomo.kn.cost.manage.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zzsmart.qomo.kn.cost.manage.entity.AppSceneCostStandardDetail;
+
+/**
+ * @Description: app_scene_cost_standard_detail
+ * @Author: jeecg-boot
+ * @Date:   2024-07-31
+ * @Version: V1.0
+ */
+public interface AppSceneCostStandardDetailMapper extends BaseMapper<AppSceneCostStandardDetail> {
+
+}

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

@@ -0,0 +1,15 @@
+package com.zzsmart.qomo.kn.cost.manage.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zzsmart.qomo.kn.cost.manage.entity.AppSceneCostStandardVersion;
+
+/**
+ * @Description: app_scene_cost_standard_version
+ * @Author: jeecg-boot
+ * @Date:   2024-09-08
+ * @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/CostStandardDetailMapper.java

@@ -1,39 +0,0 @@
-package com.zzsmart.qomo.kn.cost.manage.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardDetail;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zzsmart.qomo.kn.cost.manage.vo.CostStandardDetailVO;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 标准成本明细表 Mapper 接口
- * </p>
- *
- * @author  
- * @since 2024-06-20
- */
-@Mapper
-public interface CostStandardDetailMapper extends BaseMapper<CostStandardDetail> {
-    /**
-     * 分页查询
-     * @param page
-     * @param wrapper
-     * @return
-     */
-    IPage<CostStandardDetailVO> pageList(@Param("page") Page<CostStandardDetailVO> page , @Param(Constants.WRAPPER) Wrapper<CostStandardDetailVO> wrapper);
-    /**
-     * 查询列表
-     * @param wrapper
-     * @return
-     */
-    List<CostStandardDetailVO> queryListResult(@Param(Constants.WRAPPER) Wrapper<CostStandardDetailVO> wrapper);
-
-}

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/AppSceneCostBomRelevancyMapper.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.modules.demo.com.zzsmart.qomo.kn.cost.manage.mapper.AppSceneCostBomRelevancyMapper">
+
+</mapper>

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/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/AppSceneCostProductProcessMaintenanceMapper.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.AppSceneCostProductProcessMaintenanceMapper">
+
+</mapper>

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml/AppSceneCostPurchaseEvaluateMapper.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.AppSceneCostPurchaseEvaluateMapper">
+
+</mapper>

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/AppSceneCostPurchaseRecordMapper.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.AppSceneCostPurchaseRecordMapper">
+
+</mapper>

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml/AppSceneCostStandardDetailMapper.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.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/mapper/xml/CostStandardDetailMapper.xml

@@ -1,59 +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.CostStandardDetailMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="CostStandardDetailVOResultMap" type="com.zzsmart.qomo.kn.cost.manage.vo.CostStandardDetailVO">
-        <id column="id" property="id" />
-        <result column="material_number" property="materialNumber" />
-        <result column="material_name" property="materialName" />
-        <result column="parent_material_number" property="parentMaterialNumber" />
-        <result column="version_number_id" property="versionNumberId" />
-        <result column="version_number" property="versionNumber" />
-        <result column="level" property="level" />
-        <result column="figure_number" property="figureNumber" />
-        <result column="dosage" property="dosage" />
-        <result column="unit" property="unit" />
-        <result column="specification" property="specification" />
-        <result column="bom_cost" property="bomCost" />
-        <result column="packing_cost" property="packingCost" />
-        <result column="auxiliary_cost" property="auxiliaryCost" />
-        <result column="labor_cost" property="laborCost" />
-        <result column="euip_depreciation_cost" property="euipDepreciationCost" />
-        <result column="equip_consume_cost" property="equipConsumeCost" />
-        <result column="hydroelectricity_cost" property="hydroelectricityCost" />
-        <result column="other_cost" property="otherCost" />
-        <result column="trail_cost" property="trailCost" />
-        <result column="manufacture_cost" property="manufactureCost" />
-        <result column="total_labor_cost" property="totalLaborCost" />
-        <result column="total_equip_consume_cost" property="totalEquipConsumeCost" />
-        <result column="total_euip_depreciation_cost" property="totalEuipDepreciationCost" />
-        <result column="total_hydroelectricity_cost" property="totalHydroelectricityCost" />
-        <result column="total_other_cost" property="totalOtherCost" />
-        <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" />
-        <result column="sort" property="sort" />
-    </resultMap>
-    <select id="pageList" resultMap="CostStandardDetailVOResultMap">
-        select c1.*, c2.version_number, c2.version_status, c2.stage,c2.version_year
-        from
-            app_scene_cost_standard_detail  c1
-                left join app_scene_cost_standard_version  c2 on c1.version_number_id = c2.id
-            ${ew.customSqlSegment}
-        ORDER BY c1.create_time desc
-
-    </select>
-    <select id="queryListResult" resultMap="CostStandardDetailVOResultMap">
-        select c1.*, c2.version_number, c2.version_status, c2.stage,c2.version_year
-        from
-            app_scene_cost_standard_detail  c1
-                left join app_scene_cost_standard_version  c2 on c1.version_number_id = c2.id
-            ${ew.customSqlSegment}
-        ORDER BY c1.create_time desc
-
-    </select>
-
-</mapper>

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

@@ -4,56 +4,72 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.zzsmart.qomo.kn.cost.manage.entity.*;
 import com.zzsmart.qomo.kn.cost.manage.enums.FeeTypeEnum;
-import com.zzsmart.qomo.kn.cost.manage.mapper.CostMaterialBomMapper;
+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.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;
 import com.zzsmart.qomo.plugin.task.api.TaskExecutionContext;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.PostConstruct;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
 @Service
 @Slf4j
+@Transactional
 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;
     /**
      * 标准成本计算结果
      */
     @Autowired
     IAppSceneCostResultValueService iAppSceneCostResultValueService;
+    /**
+     * 标准成本服务
+     */
     public static StandardCostService standardCostService;
+    /**
+     * 成本计算服务
+     */
     @Autowired
     IAppSceneCostCountService appSceneCostCountService;
-
+    /**
+     * 标准成本明细服务（单行查询服务）
+     */
+    @Autowired
+    private IAppSceneCostStandardDetailService iAppSceneCostStandardDetailService;
 
     @PostConstruct
     public void init() {
@@ -65,6 +81,7 @@ public class StandardCostService {
         standardCostService.iHourRateService = this.iHourRateService;
         standardCostService.costMaterialProcessHoursService = this.costMaterialProcessHoursService;
         standardCostService.iAppSceneCostResultValueService = this.iAppSceneCostResultValueService;
+        standardCostService.iAppSceneCostStandardDetailService = this.iAppSceneCostStandardDetailService;
     }
 
     /**
@@ -93,14 +110,7 @@ public class StandardCostService {
             //1.查询出所有满足物料编号的物料（BOM物料）
             String sql = flowTaskInfoVO.getSqlString();
             log.info("传递过来的SQL语句：" + sql);
-            List<CostMaterialBom> 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);
-                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);
-            }
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
@@ -220,7 +230,7 @@ public class StandardCostService {
                     //单价乘以数量
                     BigDecimal totalCost = price.multiply(number);
                     //2.2计算出人工成本并存储到成本结果数据表中
-                    AppSceneCostResultValue resultValue = AppSceneCostResultValue.builder().belongTopMaterialNo(topMaterialCode).marterialNo(marterialNo).parentMarterialNo(appSceneCostResultValue.getParentMarterialNo()).taskType(taskType).taskCode(taskCode).flowInstanceId(flowInstanceId).countValue(totalCost + "").build();
+                    AppSceneCostResultValue resultValue = AppSceneCostResultValue.builder().belongTopMaterialNo(topMaterialCode).marterialNo(marterialNo).parentMarterialNo(appSceneCostResultValue.getParentMarterialNo()).taskType(taskType).costType(feeType).taskCode(taskCode).flowInstanceId(flowInstanceId).countValue(totalCost + "").priceOrRate(price).build();
                     standardCostService.iAppSceneCostResultValueService.save(resultValue);
                 }
             }
@@ -253,7 +263,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信息
@@ -265,23 +275,24 @@ 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");
-                    List<CostMaterialProcessHours> costMaterialProcessHours = processHoursMap.get(marterialNo);
+                    BigDecimal laborHours = new BigDecimal("0.0");
+                    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);
-                            BigDecimal laborHours = processHours.getLaborHours();
+                            laborHours = laborHours.add(processHours.getLaborHours());
                             //计算总人工成本
-                            totalCost = totalCost.add(laborHours.multiply(hourRate));
+                            totalCost = totalCost.add(processHours.getLaborHours().multiply(hourRate));
                         }
                     }
                     //2.2计算出人工成本并存储到成本结果数据表中
-                    AppSceneCostResultValue resultValue = AppSceneCostResultValue.builder().belongTopMaterialNo(topMaterialCode).marterialNo(marterialNo).parentMarterialNo(appSceneCostResultValue.getParentMarterialNo()).taskType(taskType).taskCode(taskCode).flowInstanceId(flowInstanceId).countValue(totalCost + "").costType(feeType).build();
+                    AppSceneCostResultValue resultValue = AppSceneCostResultValue.builder().belongTopMaterialNo(topMaterialCode).marterialNo(marterialNo).parentMarterialNo(appSceneCostResultValue.getParentMarterialNo()).taskType(taskType).taskCode(taskCode).flowInstanceId(flowInstanceId).countValue(totalCost + "").costType(feeType).priceOrRate(hourRate).hour(laborHours).build();
                     standardCostService.iAppSceneCostResultValueService.save(resultValue);
                 }
             }
@@ -320,7 +331,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信息
@@ -331,7 +342,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++) {
@@ -339,17 +350,18 @@ public class StandardCostService {
                     String marterialNo = appSceneCostResultValue.getMarterialNo();
                     if (marterialNo != null) {
                         BigDecimal totalCost = new BigDecimal("0.0");
-                        List<CostMaterialProcessHours> costMaterialProcessHours = processHoursMap.get(marterialNo);
+                        BigDecimal laborHours = new BigDecimal("0.0");
+                        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);
-                                BigDecimal laborHours = processHours.getDeviceHours();
+                                laborHours = laborHours.add(processHours.getDeviceHours());
                                 //计算机器成本
-                                totalCost = totalCost.add(laborHours.multiply(hourRate));
+                                totalCost = totalCost.add(processHours.getDeviceHours().multiply(hourRate));
                             }
                         }
                         //2.2计算机器成本并存储到成本结果数据表中
-                        AppSceneCostResultValue resultValue = AppSceneCostResultValue.builder().belongTopMaterialNo(topMaterialCode).marterialNo(marterialNo).parentMarterialNo(appSceneCostResultValue.getParentMarterialNo()).taskType(taskType).taskCode(taskCode).flowInstanceId(flowInstanceId).countValue(totalCost + "").costType(feeType).build();
+                        AppSceneCostResultValue resultValue = AppSceneCostResultValue.builder().belongTopMaterialNo(topMaterialCode).marterialNo(marterialNo).parentMarterialNo(appSceneCostResultValue.getParentMarterialNo()).taskType(taskType).taskCode(taskCode).flowInstanceId(flowInstanceId).countValue(totalCost + "").costType(feeType).priceOrRate(hourRate).hour(laborHours).build();
                         standardCostService.iAppSceneCostResultValueService.save(resultValue);
                     }
                 }
@@ -360,18 +372,19 @@ public class StandardCostService {
                     String marterialNo = appSceneCostResultValue.getMarterialNo();
                     if (marterialNo != null) {
                         BigDecimal totalCost = new BigDecimal("0.0");
-                        List<CostMaterialProcessHours> costMaterialProcessHours = processHoursMap.get(marterialNo);
+                        BigDecimal laborHours = new BigDecimal("0.0");
+                        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 辅料工时来源
-                                BigDecimal laborHours = processHours.getLaborHours();
+                                laborHours = laborHours.add(processHours.getDeviceHours());
                                 //机物料消耗
-                                totalCost = totalCost.add(laborHours.multiply(hourRate));
+                                totalCost = totalCost.add(processHours.getDeviceHours().multiply(hourRate));
                             }
                         }
                         //2.2计算机物料消耗存储到成本结果数据表中
-                        AppSceneCostResultValue resultValue = AppSceneCostResultValue.builder().belongTopMaterialNo(topMaterialCode).marterialNo(marterialNo).parentMarterialNo(appSceneCostResultValue.getParentMarterialNo()).taskType(taskType).taskCode(taskCode).flowInstanceId(flowInstanceId).countValue(totalCost + "").costType(feeType).build();
+                        AppSceneCostResultValue resultValue = AppSceneCostResultValue.builder().belongTopMaterialNo(topMaterialCode).marterialNo(marterialNo).parentMarterialNo(appSceneCostResultValue.getParentMarterialNo()).taskType(taskType).taskCode(taskCode).flowInstanceId(flowInstanceId).countValue(totalCost + "").costType(feeType).priceOrRate(hourRate).hour(laborHours).build();
                         standardCostService.iAppSceneCostResultValueService.save(resultValue);
                     }
                 }
@@ -382,18 +395,19 @@ public class StandardCostService {
                     String marterialNo = appSceneCostResultValue.getMarterialNo();
                     if (marterialNo != null) {
                         BigDecimal totalCost = new BigDecimal("0.0");
-                        List<CostMaterialProcessHours> costMaterialProcessHours = processHoursMap.get(marterialNo);
+                        BigDecimal laborHours = new BigDecimal("0.0");
+                        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 燃动力工时来源
-                                BigDecimal laborHours = processHours.getLaborHours();
+                                laborHours = laborHours.add(processHours.getDeviceHours());
-                                //机物料消耗
+                                //水电费（燃动力工时*费率）成本
-                                totalCost = totalCost.add(laborHours.multiply(hourRate));
+                                totalCost = totalCost.add(processHours.getDeviceHours().multiply(hourRate));
                             }
                         }
                         //2.2计算机物料消耗存储到成本结果数据表中
-                        AppSceneCostResultValue resultValue = AppSceneCostResultValue.builder().belongTopMaterialNo(topMaterialCode).marterialNo(marterialNo).parentMarterialNo(appSceneCostResultValue.getParentMarterialNo()).taskType(taskType).taskCode(taskCode).flowInstanceId(flowInstanceId).countValue(totalCost + "").costType(feeType).build();
+                        AppSceneCostResultValue resultValue = AppSceneCostResultValue.builder().belongTopMaterialNo(topMaterialCode).marterialNo(marterialNo).parentMarterialNo(appSceneCostResultValue.getParentMarterialNo()).taskType(taskType).taskCode(taskCode).flowInstanceId(flowInstanceId).countValue(totalCost + "").costType(feeType).priceOrRate(hourRate).hour(laborHours).build();
                         standardCostService.iAppSceneCostResultValueService.save(resultValue);
                     }
                 }
@@ -404,18 +418,19 @@ public class StandardCostService {
                     String marterialNo = appSceneCostResultValue.getMarterialNo();
                     if (marterialNo != null) {
                         BigDecimal totalCost = new BigDecimal("0.0");
-                        List<CostMaterialProcessHours> costMaterialProcessHours = processHoursMap.get(marterialNo);
+                        BigDecimal laborHours = new BigDecimal("0.0");
+                        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 其他工时来源
-                                BigDecimal laborHours = processHours.getLaborHours();
+                                laborHours = laborHours.add(processHours.getDeviceHours());
-                                //机物料消耗
+                                //其他制费成本
-                                totalCost = totalCost.add(laborHours.multiply(hourRate));
+                                totalCost = totalCost.add(processHours.getDeviceHours().multiply(hourRate));
                             }
                         }
                         //2.2计算机物料消耗存储到成本结果数据表中
-                        AppSceneCostResultValue resultValue = AppSceneCostResultValue.builder().belongTopMaterialNo(topMaterialCode).marterialNo(marterialNo).parentMarterialNo(appSceneCostResultValue.getParentMarterialNo()).taskType(taskType).taskCode(taskCode).flowInstanceId(flowInstanceId).countValue(totalCost + "").costType(feeType).build();
+                        AppSceneCostResultValue resultValue = AppSceneCostResultValue.builder().belongTopMaterialNo(topMaterialCode).marterialNo(marterialNo).parentMarterialNo(appSceneCostResultValue.getParentMarterialNo()).taskType(taskType).taskCode(taskCode).flowInstanceId(flowInstanceId).countValue(totalCost + "").costType(feeType).priceOrRate(hourRate).hour(laborHours).build();
                         standardCostService.iAppSceneCostResultValueService.save(resultValue);
                     }
                 }
@@ -449,39 +464,150 @@ public class StandardCostService {
      * 5.标准成本计算任务
      */
     public static void standardCostTask(TaskExecutionContext parameters) {
-        //获取任务流程相关信息
+        try {
-        FlowTaskInfoVO flowTaskInfoVO = analysisFlowTaskInfo(parameters);
+            //获取任务流程相关信息
-        //获取最上层的物料号
+            FlowTaskInfoVO flowTaskInfoVO = analysisFlowTaskInfo(parameters);
-        String topMaterialCode = flowTaskInfoVO.getTopMaterialCode();
+            //获取最上层的物料号
-        //获取任务类型
+            String topMaterialCode = flowTaskInfoVO.getTopMaterialCode();
-        String taskType = parameters.getTaskType();
+            //获取任务类型
-        //获取任务代码
+            String taskType = parameters.getTaskType();
-        String taskCode = flowTaskInfoVO.getTaskCode();
+            //获取任务代码
-        //获取流程id
+            String taskCode = flowTaskInfoVO.getTaskCode();
-        String flowInstanceId = flowTaskInfoVO.getFlowInstanceId();
+            //获取流程id
-        //1.查询出物料编号对应的下所有的BOM信息
+            String flowInstanceId = flowTaskInfoVO.getFlowInstanceId();
-        List<AppSceneCostResultValue> list = standardCostService.iAppSceneCostResultValueService.getResultValueByTopMaterialNo(topMaterialCode, null, flowInstanceId);
+            String costType = FeeTypeEnum.StandardCost.getCode();
-        //2.计算出所有的单个物料的本阶的标准成本(标准成本=物料成本+人工成本+制造费用)
+            //1.查询出根物料编号对应的下所有的BOM信息结果值
-        //按照物料编号进行分组
+            List<AppSceneCostResultValue> list = standardCostService.iAppSceneCostResultValueService.getAllResultValueByTopMaterialNo(topMaterialCode, flowInstanceId);
-        Map<String, List<AppSceneCostResultValue>> materialNoMap = list.stream().collect(Collectors.groupingBy(AppSceneCostResultValue::getMarterialNo));
+            //2.计算出所有的单个物料的本阶的标准成本(标准成本=物料成本+人工成本+制造费用)
-        for (String key : materialNoMap.keySet()) {
+            //按照物料编号进行分组
-            List<AppSceneCostResultValue> appSceneCostResultValues = materialNoMap.get(key);
+            Map<String, List<AppSceneCostResultValue>> materialNoMap = list.stream().collect(Collectors.groupingBy(AppSceneCostResultValue::getMarterialNo));
-            //本阶成本
+            //遍历根物料下所有的物料进行该物料本阶成本和费用类别的统计
-            BigDecimal currentCost = new BigDecimal("0.0");
+            for (String key : materialNoMap.keySet()) {
-            for (int j = 0; j < appSceneCostResultValues.size(); j++) {
+                List<AppSceneCostResultValue> appSceneCostResultValues = materialNoMap.get(key);
-                AppSceneCostResultValue appSceneCostResultValue = appSceneCostResultValues.get(j);
+                //按照费用类别进行分组
-                String countValue = appSceneCostResultValue.getCountValue();
+                Map<String, List<AppSceneCostResultValue>> costTypeMap = appSceneCostResultValues.stream().filter(s -> s.getCostType() != null).collect(Collectors.groupingBy(AppSceneCostResultValue::getCostType));
-                if (countValue != null) {
+                //【本阶标准成本】
-                    currentCost = currentCost.add(new BigDecimal(countValue));
+                BigDecimal currentCost = new BigDecimal("0.0");
+                //1.本阶物料成本
+                BigDecimal materialCost = new BigDecimal("0.0");
+                //2.本阶人工成本
+                BigDecimal laborCost = new BigDecimal("0.0");
+                //3.本阶制造费（设备费）
+                BigDecimal equipmentCost = new BigDecimal("0.0");
+                //4.本阶制造费（辅料费用）
+                BigDecimal supplyMaterialCost = new BigDecimal("0.0");
+                //5.本阶制造费（水电费、燃动费）
+                BigDecimal driveCost = new BigDecimal("0.0");
+                //6.本阶制造费（其他制造费用）
+                BigDecimal otherCost = new BigDecimal("0.0");
+                //7.本阶制造费（物流费）
+                BigDecimal logisticsCost = new BigDecimal("0.0");
+                //物料单价
+                BigDecimal materialUnitPrice = new BigDecimal("0.0");
+                //人员工时、小时费率
+                BigDecimal laborHour = new BigDecimal("0.0");
+                BigDecimal laborHourRate = new BigDecimal("0.0");
+                //设备工时、小时费率
+                BigDecimal equipmentHour = new BigDecimal("0.0");
+                BigDecimal equipmentHourRate = new BigDecimal("0.0");
+                //辅料工时、小时费率
+                BigDecimal supplyMaterialHour = new BigDecimal("0.0");
+                BigDecimal supplyMaterialHourRate = new BigDecimal("0.0");
+                //燃动工时、小时费率
+                BigDecimal driveHour = new BigDecimal("0.0");
+                BigDecimal driveHourRate = new BigDecimal("0.0");
+                //其他工时、小时费率
+                BigDecimal otherHour = new BigDecimal("0.0");
+                BigDecimal otherHourRate = new BigDecimal("0.0");
+                AppSceneCostResultValue currentMaterialCost = null;
+                //遍历所有费用类别计算本阶标准成本
+                for (int j = 0; j < appSceneCostResultValues.size(); j++) {
+                    if (j == 0) {
+                        currentMaterialCost = appSceneCostResultValues.get(0);
+                    }
+                    AppSceneCostResultValue appSceneCostResultValue = appSceneCostResultValues.get(j);
+                    String countValue = appSceneCostResultValue.getCountValue();
+                    if (countValue != null) {
+                        currentCost = currentCost.add(new BigDecimal(countValue));
+                    }
                 }
+                //计算本阶各个费用类别费用以及记录本阶物料的工时和小时费率
+                for (String feeType : costTypeMap.keySet()) {
+                    List<AppSceneCostResultValue> appSceneCostResultValues1 = costTypeMap.get(feeType);
+                    for (int m = 0; m < appSceneCostResultValues1.size(); m++) {
+                        if (FeeTypeEnum.MaterialCost.getCode().equals(feeType)) {
+                            //物料成本
+                            materialCost = materialCost.add(new BigDecimal(appSceneCostResultValues1.get(m).getCountValue()));
+                            //物料单价
+                            materialUnitPrice = appSceneCostResultValues1.get(m).getPriceOrRate();
+                        } else if (FeeTypeEnum.LaborCost.getCode().equals(feeType)) {
+                            //人工成本
+                            laborCost = laborCost.add(new BigDecimal(appSceneCostResultValues1.get(m).getCountValue()));
+                            //人工工时、小时费率
+                            laborHour = laborHour.add(appSceneCostResultValues1.get(m).getHour());
+                            laborHourRate = laborHourRate.add(appSceneCostResultValues1.get(m).getPriceOrRate());
+                        } else if (FeeTypeEnum.EquipmentFee.getCode().equals(feeType)) {
+                            //设备费用
+                            equipmentCost = equipmentCost.add(new BigDecimal(appSceneCostResultValues1.get(m).getCountValue()));
+                            //设备工时、小时费率
+                            equipmentHour = equipmentHour.add(appSceneCostResultValues1.get(m).getHour());
+                            equipmentHourRate = equipmentHourRate.add(appSceneCostResultValues1.get(m).getPriceOrRate());
+                        } else if (FeeTypeEnum.SupplyMaterialFee.getCode().equals(feeType)) {
+                            //辅料费用
+                            supplyMaterialCost = supplyMaterialCost.add(new BigDecimal(appSceneCostResultValues1.get(m).getCountValue()));
+                            //辅料工时、小时费率
+                            supplyMaterialHour = supplyMaterialHour.add(appSceneCostResultValues1.get(m).getHour());
+                            supplyMaterialHourRate = supplyMaterialHourRate.add(appSceneCostResultValues1.get(m).getPriceOrRate());
+                        } else if (FeeTypeEnum.DriverFee.getCode().equals(feeType)) {
+                            //燃动费用
+                            driveCost = driveCost.add(new BigDecimal(appSceneCostResultValues1.get(m).getCountValue()));
+                            //燃动工时、小时费率
+                            driveHour = driveHour.add(appSceneCostResultValues1.get(m).getHour());
+                            driveHourRate = driveHourRate.add(appSceneCostResultValues1.get(m).getPriceOrRate());
+                        } else if (FeeTypeEnum.LogisticsFee.getCode().equals(feeType)) {
+                            //物流费用
+                            logisticsCost = logisticsCost.add(new BigDecimal(appSceneCostResultValues1.get(m).getCountValue()));
+                        } else if (FeeTypeEnum.OtherFee.getCode().equals(feeType)) {
+                            //其他费用
+                            otherCost = otherCost.add(new BigDecimal(appSceneCostResultValues1.get(m).getCountValue()));
+                            //其他工时、小时费率
+                            otherHour = otherHour.add(appSceneCostResultValues1.get(m).getHour());
+                            otherHourRate = otherHourRate.add(appSceneCostResultValues1.get(m).getPriceOrRate());
+                        }
+                    }
+                }
+                //本阶不同费用类别成本统计
+                JSONObject currentLevelCostTypeDetail = new JSONObject();
+                currentLevelCostTypeDetail.put(FeeTypeEnum.MaterialCost.getCode(), materialCost);
+                currentLevelCostTypeDetail.put(FeeTypeEnum.LaborCost.getCode(), laborCost);
+                currentLevelCostTypeDetail.put(FeeTypeEnum.EquipmentFee.getCode(), equipmentCost);
+                currentLevelCostTypeDetail.put(FeeTypeEnum.SupplyMaterialFee.getCode(), supplyMaterialCost);
+                currentLevelCostTypeDetail.put(FeeTypeEnum.DriverFee.getCode(), driveCost);
+                currentLevelCostTypeDetail.put(FeeTypeEnum.LogisticsFee.getCode(), logisticsCost);
+                currentLevelCostTypeDetail.put(FeeTypeEnum.OtherFee.getCode(), otherCost);
+                //统计本阶不同费用类别工时、小时费率
+                currentLevelCostTypeDetail.put(HourOrRateTypeEnum.MaterialUnitPrice.getCode(), materialUnitPrice);
+                currentLevelCostTypeDetail.put(HourOrRateTypeEnum.LaborHour.getCode(), laborHour);
+                currentLevelCostTypeDetail.put(HourOrRateTypeEnum.LaborHourRate.getCode(), laborHourRate);
+                currentLevelCostTypeDetail.put(HourOrRateTypeEnum.EquipmentHour.getCode(), equipmentHour);
+                currentLevelCostTypeDetail.put(HourOrRateTypeEnum.EquipmentHourRate.getCode(), equipmentHourRate);
+                currentLevelCostTypeDetail.put(HourOrRateTypeEnum.SupplyMaterialHour.getCode(), supplyMaterialHour);
+                currentLevelCostTypeDetail.put(HourOrRateTypeEnum.SupplyMaterialHourRate.getCode(), supplyMaterialHourRate);
+                currentLevelCostTypeDetail.put(HourOrRateTypeEnum.DriverHour.getCode(), driveHour);
+                currentLevelCostTypeDetail.put(HourOrRateTypeEnum.DriverHourRate.getCode(), driveHourRate);
+                currentLevelCostTypeDetail.put(HourOrRateTypeEnum.OtherHour.getCode(), otherHour);
+                currentLevelCostTypeDetail.put(HourOrRateTypeEnum.OtherHourRate.getCode(), otherHourRate);
+                AppSceneCostResultValue resultValue = AppSceneCostResultValue.builder().belongTopMaterialNo(topMaterialCode).marterialNo(key).parentMarterialNo(currentMaterialCost.getParentMarterialNo()).taskType(taskType).taskCode(taskCode).flowInstanceId(flowInstanceId).countValue(currentCost.toString()).costDetail(JSON.toJSONString(currentLevelCostTypeDetail)).costType(costType).build();
+                standardCostService.iAppSceneCostResultValueService.save(resultValue);
             }
-            AppSceneCostResultValue resultValue = AppSceneCostResultValue.builder().belongTopMaterialNo(topMaterialCode).marterialNo(key).parentMarterialNo(appSceneCostResultValues.get(0).getParentMarterialNo()).taskType(taskType).taskCode(taskCode).flowInstanceId(flowInstanceId).countValue(currentCost.toString()).build();
+            //3.计算出所有的单个物料的累计标准成本
-            standardCostService.iAppSceneCostResultValueService.save(resultValue);
+            List<AppSceneCostResultValue> standardCostList = standardCostService.iAppSceneCostResultValueService.getResultValueByTopMaterialNo(topMaterialCode, taskType, flowInstanceId);
+            //【累计成本】的计算
+            totalCountCost(standardCostList, topMaterialCode, taskType, taskCode, flowInstanceId);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException("计算成本失败");
         }
-        //3.计算出所有的单个物料的累计标准成本
-        List<AppSceneCostResultValue> standardCostList = standardCostService.iAppSceneCostResultValueService.getResultValueByTopMaterialNo(topMaterialCode, taskType, flowInstanceId);
-        //TODO 优化累计成本的计算
-        totalCountCost(standardCostList, topMaterialCode, taskType, taskCode, flowInstanceId);
     }
 
     /**
@@ -494,14 +620,50 @@ public class StandardCostService {
      * @param flowInstanceId
      */
     private static void totalCountCost(List<AppSceneCostResultValue> standardCostList, String topMaterialCode, String taskType, String taskCode, String flowInstanceId) {
-        Map<String, List<AppSceneCostResultValue>> parentMaterialNoMap = standardCostList.stream().filter(appSceneCostResultValue -> appSceneCostResultValue.getParentMarterialNo() != null).collect(Collectors.groupingBy(AppSceneCostResultValue::getParentMarterialNo));
+        try {
-        for (int i = 0; i < standardCostList.size(); i++) {
+            List<AppSceneCostStandardDetail> costStandardDetails = new ArrayList<>();
-            AppSceneCostResultValue oldAppSceneCostResultValue = standardCostList.get(i);
+            //父类对应的子节点（除了最上层节点）
-            BigDecimal totalCost = new BigDecimal(oldAppSceneCostResultValue.getCountValue());
+            Map<String, List<AppSceneCostResultValue>> parentMaterialNoMap = standardCostList.stream().filter(appSceneCostResultValue -> appSceneCostResultValue.getParentMarterialNo() != null).collect(Collectors.groupingBy(AppSceneCostResultValue::getParentMarterialNo));
-            totalCost = loopCount(oldAppSceneCostResultValue, parentMaterialNoMap, topMaterialCode, taskType, taskCode, flowInstanceId, totalCost);
+            for (int i = 0; i < standardCostList.size(); i++) {
-            oldAppSceneCostResultValue.setTotalValue(totalCost.toString());
+                //当前节点及其对应的本阶成本
-            standardCostService.iAppSceneCostResultValueService.updateById(oldAppSceneCostResultValue);
+                AppSceneCostResultValue oldAppSceneCostResultValue = standardCostList.get(i);
-            //TODO 更新结果集到标准成本单行查询中去
+                BigDecimal totalCost = new BigDecimal(oldAppSceneCostResultValue.getCountValue());
+                //循环计算出当前节点的累计成本
+                String costDetail = oldAppSceneCostResultValue.getCostDetail();
+                //查询当前节点各个类型的成本
+                BigDecimal totalMaterialCost = new BigDecimal(0);
+                BigDecimal totalLabourCost = new BigDecimal(0);
+                BigDecimal totalEquipmentCost = new BigDecimal(0);
+                BigDecimal totalSupplyMaterialCost = new BigDecimal(0);
+                BigDecimal totalDriveCost = new BigDecimal(0);
+                BigDecimal totalLogisticsCost = new BigDecimal(0);
+                BigDecimal totalOtherCost = new BigDecimal(0);
+                JSONObject costDetailJson = JSON.parseObject(costDetail);
+                TotalResultValue hourOrRateResultValue = loopCount(oldAppSceneCostResultValue, parentMaterialNoMap, totalMaterialCost, totalLabourCost, totalEquipmentCost, totalSupplyMaterialCost, totalDriveCost, totalLogisticsCost, totalOtherCost, totalCost);
+                costDetailJson.put(TotalCostEnum.TotalMaterialCost.getCode(), hourOrRateResultValue.getTotalMaterialCost());
+                costDetailJson.put(TotalCostEnum.TotalLaborCost.getCode(), hourOrRateResultValue.getTotalLabourCost());
+                costDetailJson.put(TotalCostEnum.TotalEquipmentFee.getCode(), hourOrRateResultValue.getTotalEquipmentCost());
+                costDetailJson.put(TotalCostEnum.TotalSupplyMaterialFee.getCode(), hourOrRateResultValue.getTotalSupplyMaterialCost());
+                costDetailJson.put(TotalCostEnum.TotalDriverFee.getCode(), hourOrRateResultValue.getTotalDriveCost());
+                costDetailJson.put(TotalCostEnum.TotalLogisticsFee.getCode(), hourOrRateResultValue.getTotalLogisticsCost());
+                costDetailJson.put(TotalCostEnum.TotalOtherFee.getCode(), hourOrRateResultValue.getTotalOtherCost());
+                costDetailJson.put(TotalCostEnum.TotalStandardCost.getCode(), hourOrRateResultValue.getTotalCost());
+                oldAppSceneCostResultValue.setCostDetail(costDetailJson.toJSONString());
+                oldAppSceneCostResultValue.setTotalValue(hourOrRateResultValue.getTotalCost().toString());
+                standardCostService.iAppSceneCostResultValueService.updateById(oldAppSceneCostResultValue);
+                //构造单行成本查询记录
+                AppSceneCostStandardDetail costStandardDetail = AppSceneCostStandardDetail.builder().materialNumber(oldAppSceneCostResultValue.getMarterialNo()).materialName(oldAppSceneCostResultValue.getMarterialNo()).parentMaterialNumber(oldAppSceneCostResultValue.getParentMarterialNo())
+//                    .versionNumber()
+//                    .level()
+//                    .sort()
+//                    .figureNumber()
+                        .dosage(oldAppSceneCostResultValue.getNum() != null ? new Double(oldAppSceneCostResultValue.getNum()) : 0).unit(oldAppSceneCostResultValue.getUnit()).materialCost(costDetailJson.getBigDecimal(FeeTypeEnum.MaterialCost.getCode())).laborCost(costDetailJson.getBigDecimal(FeeTypeEnum.LaborCost.getCode())).equipmentCost(costDetailJson.getBigDecimal(FeeTypeEnum.EquipmentFee.getCode())).supplyMaterialCost(costDetailJson.getBigDecimal(FeeTypeEnum.SupplyMaterialFee.getCode())).driveCost(costDetailJson.getBigDecimal(FeeTypeEnum.DriverFee.getCode())).logisticsCost(costDetailJson.getBigDecimal(FeeTypeEnum.LogisticsFee.getCode())).otherCost(costDetailJson.getBigDecimal(FeeTypeEnum.OtherFee.getCode())).currentStandardCost(new BigDecimal(oldAppSceneCostResultValue.getCountValue())).totalMaterialCost(costDetailJson.getBigDecimal(TotalCostEnum.TotalMaterialCost.getCode())).totalLaborCost(costDetailJson.getBigDecimal(TotalCostEnum.TotalLaborCost.getCode())).totalEquipmentCost(costDetailJson.getBigDecimal(TotalCostEnum.TotalEquipmentFee.getCode())).totalSupplyMaterialCost(costDetailJson.getBigDecimal(TotalCostEnum.TotalSupplyMaterialFee.getCode())).totalDriveCost(costDetailJson.getBigDecimal(TotalCostEnum.TotalDriverFee.getCode())).totalLogisticsCost(costDetailJson.getBigDecimal(TotalCostEnum.TotalLogisticsFee.getCode())).totalOtherCost(costDetailJson.getBigDecimal(TotalCostEnum.TotalOtherFee.getCode())).totalStandardCost(costDetailJson.getBigDecimal(TotalCostEnum.TotalStandardCost.getCode())).createTime(new Date()).build();
+                costStandardDetails.add(costStandardDetail);
+            }
+            //更新结果集到标准成本单行查询中去
+            standardCostService.iAppSceneCostStandardDetailService.saveBatch(costStandardDetails);
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }
 
@@ -511,24 +673,41 @@ public class StandardCostService {
      *
      * @param appSceneCostResultValue
      * @param parentMaterialNoMap
-     * @param topMaterialCode
-     * @param taskType
-     * @param taskCode
-     * @param flowInstanceId
      */
-    private static BigDecimal loopCount(AppSceneCostResultValue appSceneCostResultValue, Map<String, List<AppSceneCostResultValue>> parentMaterialNoMap, String topMaterialCode, String taskType, String taskCode, String flowInstanceId, BigDecimal totalCost) {
+    private static TotalResultValue loopCount(AppSceneCostResultValue appSceneCostResultValue, Map<String, List<AppSceneCostResultValue>> parentMaterialNoMap, BigDecimal totalMaterialCost, BigDecimal totalLabourCost, BigDecimal totalEquipmentCost, BigDecimal totalSupplyMaterialCost, BigDecimal totalDriveCost, BigDecimal totalLogisticsCost, BigDecimal totalOtherCost, BigDecimal totalCost) {
         String marterialNo = appSceneCostResultValue.getMarterialNo();
         if (parentMaterialNoMap.containsKey(marterialNo)) {
+            //获取当前节点的子节点并遍历
             List<AppSceneCostResultValue> appSceneCostResultValues = parentMaterialNoMap.get(marterialNo);
             for (int j = 0; j < appSceneCostResultValues.size(); j++) {
                 AppSceneCostResultValue appSceneCostResultValue1 = appSceneCostResultValues.get(j);
                 String countValue = appSceneCostResultValue1.getCountValue();
+                //标准成本累计
                 if (countValue != null) {
                     totalCost = totalCost.add(new BigDecimal(countValue));
                 }
-                loopCount(appSceneCostResultValue1, parentMaterialNoMap, topMaterialCode, taskType, taskCode, flowInstanceId, totalCost);
+                //各个费用类别成本累计
+                if (appSceneCostResultValue1.getCostDetail() != null) {
+                    JSONObject costDetailJson = JSON.parseObject(appSceneCostResultValue1.getCostDetail());
+                    if (costDetailJson != null) {
+                        totalMaterialCost = totalMaterialCost.add(costDetailJson.getBigDecimal(FeeTypeEnum.MaterialCost.getCode()));
+                        totalLabourCost = totalLabourCost.add(costDetailJson.getBigDecimal(FeeTypeEnum.LaborCost.getCode()));
+                        totalEquipmentCost = totalEquipmentCost.add(costDetailJson.getBigDecimal(FeeTypeEnum.EquipmentFee.getCode()));
+                        totalSupplyMaterialCost = totalSupplyMaterialCost.add(costDetailJson.getBigDecimal(FeeTypeEnum.SupplyMaterialFee.getCode()));
+                        totalDriveCost = totalDriveCost.add(costDetailJson.getBigDecimal(FeeTypeEnum.DriverFee.getCode()));
+                        totalLogisticsCost = totalLogisticsCost.add(costDetailJson.getBigDecimal(FeeTypeEnum.LogisticsFee.getCode()));
+                        totalOtherCost = totalOtherCost.add(costDetailJson.getBigDecimal(FeeTypeEnum.OtherFee.getCode()));
+                    }
+                }
+                //判断当前子节点是否还有子节点
+                if (parentMaterialNoMap.containsKey(appSceneCostResultValue1.getMarterialNo())) {
+                    //如果还有子节点则继续递归
+                    loopCount(appSceneCostResultValue1, parentMaterialNoMap, totalMaterialCost, totalLabourCost, totalEquipmentCost, totalSupplyMaterialCost, totalDriveCost, totalLogisticsCost, totalOtherCost, totalCost);
+                }
             }
         }
-        return totalCost;
+        TotalResultValue hourOrRateResultValue = TotalResultValue.builder().totalMaterialCost(totalMaterialCost).totalLabourCost(totalLabourCost).totalEquipmentCost(totalEquipmentCost).totalSupplyMaterialCost(totalSupplyMaterialCost).totalDriveCost(totalDriveCost).totalLogisticsCost(totalLogisticsCost).totalOtherCost(totalOtherCost).totalCost(totalCost).build();
+        appSceneCostResultValue.setTotalValue(totalCost.toString());
+        return hourOrRateResultValue;
     }
 }

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/CostStandardDetailService.java

@@ -1,41 +0,0 @@
-package com.zzsmart.qomo.kn.cost.manage.service;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardDetail;
-import com.zzsmart.qomo.kn.cost.manage.vo.CostStandardDetailSearch;
-import com.zzsmart.qomo.kn.cost.manage.vo.CostStandardDetailVO;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * <p>
- * 标准成本明细表 服务类
- * </p>
- *
- * @author app_scene_cost_purchase_price
- * @since 2024-06-19
- */
-public interface CostStandardDetailService extends IService<CostStandardDetail> {
-    /**
-     * 分页查询
-     *
-     * @param page
-     * @param
-     * @return
-     */
-    IPage<CostStandardDetailVO> pageList(Page<CostStandardDetailVO> page, CostStandardDetailVO costStandard);
-
-    /**
-     * 导出列表信息为Excel文件
-     *
-     * @param request
-     * @param response
-     * @param costStandardDetailSearch
-     * @return
-     */
-    JSONObject exportExcel(HttpServletRequest request, HttpServletResponse response, CostStandardDetailSearch costStandardDetailSearch);
-}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/IAppSceneCostBomRelevancyService.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.AppSceneCostBomRelevancy;
+
+/**
+ * @Description: app_scene_cost_bom_relevancy
+ * @Author: jeecg-boot
+ * @Date:   2024-09-08
+ * @Version: V1.0
+ */
+public interface IAppSceneCostBomRelevancyService extends IService<AppSceneCostBomRelevancy> {
+
+}

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

@@ -2,6 +2,9 @@ package com.zzsmart.qomo.kn.cost.manage.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zzsmart.qomo.kn.cost.manage.entity.AppSceneCostCount;
+import com.zzsmart.qomo.kn.cost.manage.vo.MissingComponentVO;
+
+import java.util.List;
 
 /**
  * @Description: app_scene_cost_count
@@ -15,7 +18,7 @@ public interface IAppSceneCostCountService extends IService<AppSceneCostCount> {
      * @param id
      * @return
      */
-    AppSceneCostCount queryMissingComponentById(String id);
+    List<MissingComponentVO> queryMissingComponentById(String id);
 
     /**
      * 重新计算

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/IAppSceneCostProductProcessMaintenanceService.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.AppSceneCostProductProcessMaintenance;
+
+/**
+ * @Description: app_scene_cost_product_process_maintenance
+ * @Author: jeecg-boot
+ * @Date:   2024-09-08
+ * @Version: V1.0
+ */
+public interface IAppSceneCostProductProcessMaintenanceService extends IService<AppSceneCostProductProcessMaintenance> {
+
+}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/IAppSceneCostPurchaseEvaluateService.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.AppSceneCostPurchaseEvaluate;
+
+/**
+ * @Description: app_scene_cost_purchase_evaluate
+ * @Author: jeecg-boot
+ * @Date: 2024-08-02
+ * @Version: V1.0
+ */
+public interface IAppSceneCostPurchaseEvaluateService extends IService<AppSceneCostPurchaseEvaluate> {
+
+}

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>
+ * @Description: app_scene_cost_purchase_price
- * 物料采购单价 服务类
+ * @Author: jeecg-boot
- * </p>
+ * @Date:   2024-08-02
- *
+ * @Version: V1.0
- * @author  
- * @since 2024-06-19
  */
-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/IAppSceneCostPurchaseRecordService.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.AppSceneCostPurchaseRecord;
+
+/**
+ * @Description: app_scene_cost_purchase_record
+ * @Author: jeecg-boot
+ * @Date:   2024-09-08
+ * @Version: V1.0
+ */
+public interface IAppSceneCostPurchaseRecordService extends IService<AppSceneCostPurchaseRecord> {
+
+}

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

@@ -8,14 +8,24 @@ import java.util.List;
 /**
  * @Description: app_scene_cost_result_value
  * @Author: jeecg-boot
- * @Date:   2024-07-22
+ * @Date: 2024-07-22
  * @Version: V1.0
  */
 public interface IAppSceneCostResultValueService extends IService<AppSceneCostResultValue> {
     /**
      * 根据顶级物料编码查询满足条件的结果值
+     *
      * @param topMaterialCode
      * @return
      */
-    List<AppSceneCostResultValue> getResultValueByTopMaterialNo(String topMaterialCode,String taskType,String flowInstanceId);
+    List<AppSceneCostResultValue> getResultValueByTopMaterialNo(String topMaterialCode, String taskType, String flowInstanceId);
+
+    /**
+     * 查询根物料的某次成本计算流程下的所有结果值
+     *
+     * @param topMaterialCode
+     * @param flowInstanceId
+     * @return
+     */
+    List<AppSceneCostResultValue> getAllResultValueByTopMaterialNo(String topMaterialCode, String flowInstanceId);
 }

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/IAppSceneCostStandardDetailService.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.AppSceneCostStandardDetail;
+
+/**
+ * @Description: app_scene_cost_standard_detail
+ * @Author: jeecg-boot
+ * @Date:   2024-07-31
+ * @Version: V1.0
+ */
+public interface IAppSceneCostStandardDetailService extends IService<AppSceneCostStandardDetail> {
+
+}

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);
-}