修改数据库表名（以app_scene为前缀），删除不必要的代码

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

@@ -207,10 +207,14 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://121.40.189.20:3306/knne?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=true&serverTimezone=Asia/Shanghai
-          username: root
-          password: YMzc157#
+          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
+#          url: jdbc:mysql://121.40.189.20:3306/knne?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=true&serverTimezone=Asia/Shanghai
+#          username: root
+#          password: YMzc157#
+#          driver-class-name: com.mysql.cj.jdbc.Driver
 #          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: root
 #          password: root

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

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

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

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

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

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

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

@@ -44,7 +44,7 @@ public class CostMaterialBomController {
      * @param req
      * @return
      */
-    //@AutoLog(value = "cost_standard_version-分页列表查询")
+    //@AutoLog(value = "app_scene_cost_standard_version-分页列表查询")
     @ApiOperation(value="物料bom分页列表查询", notes="物料bom分页列表查询")
     @GetMapping(value = "/pageList")
     public Result<IPage<CostMaterialBom>> queryPageList(CostMaterialBom costMaterialBom,

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

@@ -0,0 +1,115 @@
+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.CostModel;
+import com.zzsmart.qomo.kn.cost.manage.service.CostModelService;
+import com.zzsmart.qomo.kn.cost.manage.vo.CostModelVO;
+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.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2024-07-11
+ */
+@RestController
+@RequestMapping("/cost-model")
+@Api(tags="cost-标准成本-模型管理")
+public class CostModelController {
+    @Autowired
+    CostModelService costModelService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param costModel
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    //@AutoLog(value = "app_scene_cost_standard_version-分页列表查询")
+    @ApiOperation(value = "标准成本模型表格信息查询", notes = "标准成本模型表格信息查询")
+    @GetMapping(value = "/pageList")
+    public Result<IPage<CostModel>> queryPageList(CostModel costModel, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+        QueryWrapper<CostModel> queryWrapper = QueryGenerator.initQueryWrapper(costModel, req.getParameterMap());
+        Page<CostModel> page = new Page<CostModel>(pageNo, pageSize);
+        IPage<CostModel> pageList = costModelService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    /**
+     * 列表查询
+     *
+     * @return
+     */
+    @ApiOperation(value = "物料bom列表查询", notes = "物料bom列表查询")
+    @GetMapping(value = "/list")
+    public Result<List<CostModel>> queryList(@RequestParam(name = "materialNumber", required = false) String materialNumber) {
+        List<CostModel> list = costModelService.queryListResult(materialNumber);
+        return Result.OK(list);
+    }
+    /**
+     * 标准成本模型编辑
+     */
+    @ApiOperation(value = "标准成本模型保存", notes = "标准成本模型保存")
+    @PostMapping(value = "/save")
+    public Result<String> save(@RequestBody CostModelVO costModelVO) {
+        Boolean aBoolean = costModelService.saveCostModelInfo(costModelVO);
+        if (aBoolean) {
+            return Result.OK("保存成功!");
+        }
+        return Result.error("保存失败!");
+    }
+    /**
+     * 标准成本模型编辑
+     */
+    @ApiOperation(value = "标准成本模型编辑", notes = "标准成本模型编辑")
+    @PostMapping(value = "/edit")
+    public Result<String> edit(@RequestBody CostModelVO costModelVO) {
+        Boolean aBoolean = costModelService.updateCostModelInfo(costModelVO);
+        if (aBoolean) {
+            return Result.OK("编辑成功!");
+        }
+        return Result.error("编辑失败!");
+    }
+
+    /**
+     * 标准成本模型删除
+     */
+    @ApiOperation(value = "标准成本模型删除", notes = "标准成本模型删除")
+    @PostMapping(value = "/delete")
+    public Result<String> delete(@RequestBody CostModelVO costModelVO) {
+        Boolean aBoolean = costModelService.deleteCostModel(costModelVO);
+        if (aBoolean) {
+            return Result.OK("删除成功!");
+        }
+        return Result.error("删除失败!");
+    }
+
+    /**
+     * 标准成本模型发布
+     */
+    @ApiOperation(value = "标准成本模型发布", notes = "标准成本模型发布")
+    @PostMapping(value = "/publish")
+    public Result<String> publish(@RequestBody CostModelVO costModelVO) {
+        Boolean aBoolean = costModelService.publishCostModel(costModelVO);
+        if (aBoolean) {
+            return Result.OK("发布成功!");
+        }
+        return Result.error("发布失败!");
+    }
+}

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

@@ -61,8 +61,8 @@ public class CostPartMissingInfoController extends JeecgController<CostPartMissi
 	 * @param req
 	 * @return
 	 */
-	//@AutoLog(value = "cost_part_missing_info-分页列表查询")
-	@ApiOperation(value="cost_part_missing_info-分页列表查询", notes="cost_part_missing_info-分页列表查询")
+	//@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,
@@ -80,9 +80,9 @@ public class CostPartMissingInfoController extends JeecgController<CostPartMissi
 	 * @param costPartMissingInfo
 	 * @return
 	 */
-	@AutoLog(value = "cost_part_missing_info-添加")
-	@ApiOperation(value="cost_part_missing_info-添加", notes="cost_part_missing_info-添加")
-//	@RequiresPermissions(":cost_part_missing_info:add")
+	@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);
@@ -95,9 +95,9 @@ public class CostPartMissingInfoController extends JeecgController<CostPartMissi
 	 * @param costPartMissingInfo
 	 * @return
 	 */
-	@AutoLog(value = "cost_part_missing_info-编辑")
-	@ApiOperation(value="cost_part_missing_info-编辑", notes="cost_part_missing_info-编辑")
-//	@RequiresPermissions(":cost_part_missing_info:edit")
+	@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);
@@ -110,9 +110,9 @@ public class CostPartMissingInfoController extends JeecgController<CostPartMissi
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "cost_part_missing_info-通过id删除")
-	@ApiOperation(value="cost_part_missing_info-通过id删除", notes="cost_part_missing_info-通过id删除")
-//	@RequiresPermissions(":cost_part_missing_info:delete")
+	@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);
@@ -125,9 +125,9 @@ public class CostPartMissingInfoController extends JeecgController<CostPartMissi
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "cost_part_missing_info-批量删除")
-	@ApiOperation(value="cost_part_missing_info-批量删除", notes="cost_part_missing_info-批量删除")
-//	@RequiresPermissions(":cost_part_missing_info:deleteBatch")
+	@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(",")));
@@ -140,8 +140,8 @@ public class CostPartMissingInfoController extends JeecgController<CostPartMissi
 	 * @param id
 	 * @return
 	 */
-	//@AutoLog(value = "cost_part_missing_info-通过id查询")
-	@ApiOperation(value="cost_part_missing_info-通过id查询", notes="cost_part_missing_info-通过id查询")
+	//@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);
@@ -157,10 +157,10 @@ public class CostPartMissingInfoController extends JeecgController<CostPartMissi
     * @param request
     * @param costPartMissingInfo
     */
-//    @RequiresPermissions(":cost_part_missing_info:exportXls")
+//    @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, "cost_part_missing_info");
+        return super.exportXls(request, costPartMissingInfo, CostPartMissingInfo.class, "app_scene_cost_part_missing_info");
     }
 
     /**
@@ -170,7 +170,7 @@ public class CostPartMissingInfoController extends JeecgController<CostPartMissi
     * @param response
     * @return
     */
-//    @RequiresPermissions(":cost_part_missing_info:importExcel")
+//    @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/CostStandardController.java

@@ -1,213 +0,0 @@
-package com.zzsmart.qomo.kn.cost.manage.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zzsmart.qomo.kn.cost.manage.entity.CostStandard;
-import com.zzsmart.qomo.kn.cost.manage.service.ICostStandardService;
-import com.zzsmart.qomo.kn.cost.manage.vo.CostStandardVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.ss.util.CellRangeAddressList;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-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 javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.Arrays;
-
- /**
- * @Description: 标准成本
- * @Author: wangqiong
- * @Date:   2024-06-13
- * @Version: V1.0
- */
-@Api(tags="cost-标准成本计算")
-@RestController
-@RequestMapping("//costStandard")
-@Slf4j
-public class CostStandardController extends JeecgController<CostStandard, ICostStandardService> {
-	@Autowired
-	private ICostStandardService costStandardService;
-	
-	/**
-	 * 分页列表查询
-	 *
-	 * @param costStandard
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	//@AutoLog(value = "cost_standard-分页列表查询")
-	@ApiOperation(value="cost_standard-分页列表查询", notes="cost_standard-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<CostStandardVO>> queryPageList(CostStandardVO costStandard,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-
-		Page<CostStandardVO> page = new Page<CostStandardVO>(pageNo, pageSize);
-		IPage<CostStandardVO> pageList = costStandardService.pageList(page, costStandard);
-		return Result.OK(pageList);
-	}
-	
-	/**
-	 *   添加
-	 *
-	 * @param costStandard
-	 * @return
-	 */
-	@AutoLog(value = "cost_standard-添加")
-	@ApiOperation(value="cost_standard-添加", notes="cost_standard-添加")
-//	@RequiresPermissions(":cost_standard:add")
-	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody CostStandard costStandard) {
-		costStandardService.save(costStandard);
-		return Result.OK("添加成功！");
-	}
-
-
-	 /**
-	 *  编辑
-	 *
-	 * @param costStandard
-	 * @return
-	 */
-	@AutoLog(value = "cost_standard-编辑")
-	@ApiOperation(value="cost_standard-编辑", notes="cost_standard-编辑")
-//	@RequiresPermissions(":cost_standard:edit")
-	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody CostStandard costStandard) {
-		costStandardService.updateById(costStandard);
-		return Result.OK("编辑成功!");
-	}
-	
-	/**
-	 *   通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "cost_standard-通过id删除")
-	@ApiOperation(value="cost_standard-通过id删除", notes="cost_standard-通过id删除")
-//	@RequiresPermissions(":cost_standard:delete")
-	@DeleteMapping(value = "/delete")
-	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		costStandardService.removeById(id);
-		return Result.OK("删除成功!");
-	}
-	
-	/**
-	 *  批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "cost_standard-批量删除")
-	@ApiOperation(value="cost_standard-批量删除", notes="cost_standard-批量删除")
-//	@RequiresPermissions(":cost_standard:deleteBatch")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.costStandardService.removeByIds(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功!");
-	}
-	
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	//@AutoLog(value = "cost_standard-通过id查询")
-	@ApiOperation(value="cost_standard-通过id查询", notes="cost_standard-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<CostStandard> queryById(@RequestParam(name="id",required=true) String id) {
-		CostStandard costStandard = costStandardService.getById(id);
-		if(costStandard==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(costStandard);
-	}
-
-    /**
-    * 导出excel
-    *
-    * @param request
-    * @param costStandard
-    */
-//    @RequiresPermissions(":cost_standard:exportXls")
-    @RequestMapping(value = "/exportXls", method = RequestMethod.GET)
-    public ModelAndView exportXls(HttpServletRequest request, CostStandard costStandard) {
-        return super.exportXls(request, costStandard, CostStandard.class, "cost_standard");
-    }
-
-    /**
-      * 通过excel导入数据并进行批量计算
-    *
-    * @param request
-    * @param response
-    * @return
-    */
-//    @RequiresPermissions(":cost_standard:importExcel")
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, CostStandard.class);
-    }
-
-	 @GetMapping("/download/excel-template")
-	 public void downloadExcel(HttpServletResponse response) throws IOException {
-		 // 创建工作簿
-		 Workbook workbook = new XSSFWorkbook();
-		 Sheet sheet = workbook.createSheet("生变成版本号导入模板");
-
-		 // 创建表头行
-		 Row headerRow = sheet.createRow(0);
-		 // 设置字体
-		 Font headerFont = workbook.createFont();
-		 headerFont.setBold(true); // 设置字体为加粗
-		// headerFont.setFontHeightInPoints((short) 14); // 设置字体大小
-
-		 CellStyle headerCellStyle = workbook.createCellStyle();
-		 headerCellStyle.setFont(headerFont);
-		 Cell firstCell = headerRow.createCell(0);
-		 firstCell.setCellStyle(headerCellStyle);
-		 firstCell.setCellValue("物料号");
-		 Cell secondCell = headerRow.createCell(1);
-		 secondCell.setCellStyle(headerCellStyle);
-		 secondCell.setCellValue("图号");
-		 Cell thirdCell = headerRow.createCell(2);
-		 thirdCell.setCellStyle(headerCellStyle);
-		 thirdCell.setCellValue("项目阶段");
-
-		 // 设置下拉列表数据
-		 DataValidationHelper validationHelper = sheet.getDataValidationHelper();
-		 DataValidationConstraint constraint = validationHelper.createExplicitListConstraint(
-				 new String[]{"初始","首批","量产"}); // 下拉列表的选项
-
-		 // 应用下拉列表到第三列（索引为2）
-		 CellRangeAddressList addressList = new CellRangeAddressList(1, 65535, 2, 2); // 从第二行开始到第101行，第三列
-		 DataValidation validation = validationHelper.createValidation(constraint, addressList);
-		 sheet.addValidationData(validation);
-
-
-
-		 // 设置响应头
-		 response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
-		 response.setHeader("Content-Disposition", "attachment; filename=example-template.xlsx");
-
-		 // 将工作簿写入输出流
-		 workbook.write(response.getOutputStream());
-		 workbook.close();
-
-		 response.flushBuffer();
-	 }
-
-}

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

@@ -36,7 +36,7 @@ import static com.zzsmart.qomo.kn.cost.manage.util.EasyExcelUtil.getIncludeField
  * 标准成本明细表 前端控制器
  * </p>
  *
- * @author cost_purchase_price
+ * @author app_scene_cost_purchase_price
  * @since 2024-06-19
  */
 @Api(tags = "cost-标准成本单行查询")

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

@@ -2,46 +2,28 @@ 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.CostMaterialBom;
-import com.zzsmart.qomo.kn.cost.manage.entity.CostStandard;
 import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardVersion;
 import com.zzsmart.qomo.kn.cost.manage.service.ICostStandardVersionService;
-import com.zzsmart.qomo.kn.cost.manage.vo.CostStandardVO;
 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
@@ -64,8 +46,8 @@ public class CostStandardVersionController extends JeecgController<CostStandardV
 	 * @param req
 	 * @return
 	 */
-	//@AutoLog(value = "cost_standard_version-分页列表查询")
-	@ApiOperation(value="cost_standard_version-分页列表查询", notes="cost_standard_version-分页列表查询")
+	//@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,
@@ -93,9 +75,9 @@ public class CostStandardVersionController extends JeecgController<CostStandardV
 	 * @param costStandardVersion
 	 * @return
 	 */
-	@AutoLog(value = "cost_standard_version-添加")
-	@ApiOperation(value="cost_standard_version-添加", notes="cost_standard_version-添加")
-//	@RequiresPermissions(":cost_standard_version:add")
+	@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);
@@ -112,9 +94,9 @@ public class CostStandardVersionController extends JeecgController<CostStandardV
 	 * @param costStandardVersion
 	 * @return
 	 */
-	@AutoLog(value = "cost_standard_version-编辑")
-	@ApiOperation(value="cost_standard_version-编辑", notes="cost_standard_version-编辑")
-//	@RequiresPermissions(":cost_standard_version:edit")
+	@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);
@@ -127,9 +109,9 @@ public class CostStandardVersionController extends JeecgController<CostStandardV
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "cost_standard_version-通过id删除")
-	@ApiOperation(value="cost_standard_version-通过id删除", notes="cost_standard_version-通过id删除")
-//	@RequiresPermissions(":cost_standard_version:delete")
+	@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);
@@ -142,9 +124,9 @@ public class CostStandardVersionController extends JeecgController<CostStandardV
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "cost_standard_version-批量删除")
-	@ApiOperation(value="cost_standard_version-批量删除", notes="cost_standard_version-批量删除")
-//	@RequiresPermissions(":cost_standard_version:deleteBatch")
+	@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(",")));
@@ -157,8 +139,8 @@ public class CostStandardVersionController extends JeecgController<CostStandardV
 	 * @param id
 	 * @return
 	 */
-	//@AutoLog(value = "cost_standard_version-通过id查询")
-	@ApiOperation(value="cost_standard_version-通过id查询", notes="cost_standard_version-通过id查询")
+	//@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);
@@ -174,10 +156,10 @@ public class CostStandardVersionController extends JeecgController<CostStandardV
     * @param request
     * @param costStandardVersion
     */
-//    @RequiresPermissions(":cost_standard_version:exportXls")
+//    @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, "cost_standard_version");
+        return super.exportXls(request, costStandardVersion, CostStandardVersion.class, "app_scene_cost_standard_version");
     }
 
     /**
@@ -187,7 +169,7 @@ public class CostStandardVersionController extends JeecgController<CostStandardV
     * @param response
     * @return
     */
-//    @RequiresPermissions(":cost_standard_version:importExcel")
+//    @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/LatestPurchasePriceController.java

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

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

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

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

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

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

@@ -1,78 +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 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: budget_price
- * @Author: jeecg-boot
- * @Date: 2024-06-11
- * @Version: V1.0
- */
-@Data
-@TableName("budget_price")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "budget_price对象", description = "budget_price")
-public class BudgetPrice 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 year;
-    /**
-     * 物料编码
-     */
-    @Excel(name = "物料编码", width = 15)
-    @ApiModelProperty(value = "物料编码")
-    private String materialNumber;
-    /**
-     * 物料名称
-     */
-    @Excel(name = "物料名称", width = 15)
-    @ApiModelProperty(value = "物料名称")
-    private String materialName;
-    /**
-     * 项目编号
-     */
-    @Excel(name = "项目编号", width = 15)
-    @ApiModelProperty(value = "项目编号")
-    private String projectNumber;
-    /**
-     * 预算价格
-     */
-    @Excel(name = "预算价格", width = 15)
-    @ApiModelProperty(value = "预算价格")
-    private BigDecimal price;
-    /**
-     * dwerk
-     */
-    @Excel(name = "dwerk", width = 15)
-    @ApiModelProperty(value = "dwerk")
-    private String dwerk;
-    /**
-     * posid
-     */
-    @Excel(name = "posid", width = 15)
-    @ApiModelProperty(value = "posid")
-    private String posid;
-}

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

@@ -1,54 +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: c7525cost
- * @Author: jeecg-boot
- * @Date:   2024-06-06
- * @Version: V1.0
- */
-@Data
-@TableName("c7525cost")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="c7525cost对象", description="c7525cost")
-public class C7525cost implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-	/**年份*/
-	@Excel(name = "年份", width = 15)
-    @ApiModelProperty(value = "年份")
-    private String year;
-	/**门控料号（物料id）*/
-	@Excel(name = "门控料号（物料id）", width = 15)
-    @ApiModelProperty(value = "门控料号（物料id）")
-    private String materialNumber;
-	/**物料规格信息*/
-	@Excel(name = "物料规格信息", width = 15)
-    @ApiModelProperty(value = "物料规格信息")
-    private String zzggxh;
-	/**价格*/
-	@Excel(name = "价格", width = 15)
-    @ApiModelProperty(value = "价格")
-    @TableField(value = "price_7525")
-    private BigDecimal price7525;
-	/**id*/
-	@TableId(type = IdType.ASSIGN_ID)
-    @ApiModelProperty(value = "id")
-    private Integer id;
-}

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

@@ -1,55 +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.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: cost_center
- * @Author: jeecg-boot
- * @Date:   2024-06-11
- * @Version: V1.0
- */
-@Data
-@TableName("cost_center")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="cost_center对象", description="cost_center")
-public class CostCenter implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-	/**公司代码*/
-	@Excel(name = "公司代码", width = 15)
-    @ApiModelProperty(value = "公司代码")
-    private String companyCode;
-	/**成本中心代码*/
-	@Excel(name = "成本中心代码", width = 15)
-    @ApiModelProperty(value = "成本中心代码")
-    private String costCenterCode;
-	/**成本中心名称*/
-	@Excel(name = "成本中心名称", width = 15)
-    @ApiModelProperty(value = "成本中心名称")
-    private String costCenterName;
-	/**成本类型*/
-	@Excel(name = "成本类型", width = 15)
-    @ApiModelProperty(value = "成本类型")
-    private String costCategory;
-	/**状态*/
-	@Excel(name = "状态", width = 15)
-    @ApiModelProperty(value = "状态")
-    private String status;
-}

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

@@ -22,7 +22,7 @@ import lombok.experimental.Accessors;
 @Getter
 @Setter
 @Accessors(chain = true)
-@TableName("cost_material_bom")
+@TableName("app_scene_cost_material_bom")
 public class CostMaterialBom implements Serializable {
 
     private static final long serialVersionUID = 1L;

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

@@ -25,7 +25,7 @@ import lombok.experimental.Accessors;
 @Getter
 @Setter
 @Accessors(chain = true)
-@TableName("cost_material_process_hours")
+@TableName("app_scene_cost_material_process_hours")
 public class CostMaterialProcessHours implements Serializable {
 
     private static final long serialVersionUID = 1L;

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

@@ -0,0 +1,135 @@
+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/CostPartMissingInfo.java

@@ -25,10 +25,10 @@ import lombok.experimental.Accessors;
  * @Version: V1.0
  */
 @Data
-@TableName("cost_part_missing_info")
+@TableName("app_scene_cost_part_missing_info")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="cost_part_missing_info对象", description="cost_part_missing_info")
+@ApiModel(value="app_scene_cost_part_missing_info对象", description="app_scene_cost_part_missing_info")
 public class CostPartMissingInfo implements Serializable {
     private static final long serialVersionUID = 1L;
 

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

@@ -22,7 +22,7 @@ import lombok.experimental.Accessors;
 @Getter
 @Setter
 @Accessors(chain = true)
-@TableName("cost_purchase_price")
+@TableName("app_scene_cost_purchase_price")
 public class CostPurchasePrice implements Serializable {
 
     private static final long serialVersionUID = 1L;

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

@@ -1,132 +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.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: 标准成本
- * @Author: wangqiong
- * @Date:   2024-06-13
- * @Version: V1.0
- */
-@Data
-@TableName("cost_standard")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="cost_standard对象", description="cost_standard")
-public class CostStandard 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 materialNumber;
-
-    /**版本号ID*/
-    @Excel(name = "版本号ID", width = 15)
-    @ApiModelProperty(value = "版本号ID")
-    private String versionNumberId;
-
-	/**bom材料费*/
-	@Excel(name = "bom材料费", width = 15)
-    @ApiModelProperty(value = "bom材料费")
-    private BigDecimal bomCost;
-	/**包装费*/
-	@Excel(name = "包装费", width = 15)
-    @ApiModelProperty(value = "包装费")
-    private BigDecimal packingCost;
-	/**辅料费*/
-	@Excel(name = "辅料费", width = 15)
-    @ApiModelProperty(value = "辅料费")
-    private BigDecimal auxiliaryCost;
-	/**人工费*/
-	@Excel(name = "人工费", width = 15)
-    @ApiModelProperty(value = "人工费")
-    private BigDecimal laborCost;
-	/**机器折旧费*/
-	@Excel(name = "机器折旧费", width = 15)
-    @ApiModelProperty(value = "机器折旧费")
-    private BigDecimal euipDepreciationCost;
-	/**机物料消耗费*/
-	@Excel(name = "机物料消耗费", width = 15)
-    @ApiModelProperty(value = "机物料消耗费")
-    private BigDecimal equipConsumeCost;
-	/**水电费*/
-	@Excel(name = "水电费", width = 15)
-    @ApiModelProperty(value = "水电费")
-    private BigDecimal hydroelectricityCost;
-	/**其他制造费*/
-	@Excel(name = "其他制造费", width = 15)
-    @ApiModelProperty(value = "其他制造费")
-    private BigDecimal otherCost;
-	/**物流费*/
-	@Excel(name = "物流费", width = 15)
-    @ApiModelProperty(value = "物流费")
-    private BigDecimal trailCost;
-	/**制造成本*/
-	@Excel(name = "制造成本", width = 15)
-    @ApiModelProperty(value = "制造成本")
-    private BigDecimal manufactureCost;
-	/**工装费*/
-	@Excel(name = "工装费", width = 15)
-    @ApiModelProperty(value = "工装费")
-    private BigDecimal toolingCost;
-	/**检具费*/
-	@Excel(name = "检具费", width = 15)
-    @ApiModelProperty(value = "检具费")
-    private BigDecimal inspectionCost;
-	/**模具费*/
-	@Excel(name = "模具费", width = 15)
-    @ApiModelProperty(value = "模具费")
-    private BigDecimal moldCost;
-	/**测试费*/
-	@Excel(name = "测试费", width = 15)
-    @ApiModelProperty(value = "测试费")
-    private BigDecimal testCost;
-	/**总成本*/
-	@Excel(name = "总成本", width = 15)
-    @ApiModelProperty(value = "总成本")
-    private BigDecimal totalCost;
-    /**创建人*/
-    @Excel(name = "创建人", width = 15)
-    @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;
-    /**修改人*/
-    @Excel(name = "修改人", width = 15)
-    @ApiModelProperty(value = "修改人")
-    private String updateBy;
-	/**修改日期*/
-	@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 updateTime;
-	/**备注*/
-	@Excel(name = "备注", width = 15)
-    @ApiModelProperty(value = "备注")
-    private String remark;
-}

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

@@ -23,7 +23,7 @@ import lombok.experimental.Accessors;
  */
 @Data
 @Accessors(chain = true)
-@TableName("cost_standard_detail")
+@TableName("app_scene_cost_standard_detail")
 @EqualsAndHashCode
 public class CostStandardDetail implements Serializable {
 

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

@@ -25,10 +25,10 @@ import lombok.experimental.Accessors;
  * @Version: V1.0
  */
 @Data
-@TableName("cost_standard_version")
+@TableName("app_scene_cost_standard_version")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="cost_standard_version对象", description="cost_standard_version")
+@ApiModel(value="app_scene_cost_standard_version对象", description="app_scene_cost_standard_version")
 public class CostStandardVersion implements Serializable {
     private static final long serialVersionUID = 1L;
 

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

@@ -23,7 +23,7 @@ import lombok.experimental.Accessors;
  * @Version: V1.0
  */
 @Data
-@TableName("cost_hour_rate")
+@TableName("app_scene_cost_hour_rate")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value="hour_rate对象", description="hour_rate")

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

@@ -1,107 +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.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: latest_purchase_price
- * @Author: jeecg-boot
- * @Date:   2024-06-11
- * @Version: V1.0
- */
-@Data
-@TableName("latest_purchase_price")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="latest_purchase_price对象", description="latest_purchase_price")
-public class LatestPurchasePrice implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-	/**门控料号（物料id）*/
-	@Excel(name = "门控料号（物料id）", width = 15)
-    @ApiModelProperty(value = "门控料号（物料id）")
-    private String materialNumber;
-	/**产品名称*/
-	@Excel(name = "产品名称", width = 15)
-    @ApiModelProperty(value = "产品名称")
-    private String name;
-	/**规格*/
-	@Excel(name = "规格", width = 15)
-    @ApiModelProperty(value = "规格")
-    private String norms;
-	/**单位*/
-	@Excel(name = "单位", width = 15)
-    @ApiModelProperty(value = "单位")
-    private String unit;
-	/**latestInvoiceNo*/
-	@Excel(name = "latestInvoiceNo", width = 15)
-    @ApiModelProperty(value = "latestInvoiceNo")
-    private String latestInvoiceNo;
-	/**估算日期*/
-	@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 latestInvoiceDate;
-	/**latestInvoiceSupplier*/
-	@Excel(name = "latestInvoiceSupplier", width = 15)
-    @ApiModelProperty(value = "latestInvoiceSupplier")
-    private String latestInvoiceSupplier;
-	/**latestInvoicePrice*/
-	@Excel(name = "latestInvoicePrice", width = 15)
-    @ApiModelProperty(value = "latestInvoicePrice")
-    private BigDecimal latestInvoicePrice;
-	/**不含税价格*/
-	@Excel(name = "不含税价格", width = 15)
-    @ApiModelProperty(value = "不含税价格")
-    private BigDecimal unitPriceWithoutTax;
-	/**interExamCost*/
-	@Excel(name = "interExamCost", width = 15)
-    @ApiModelProperty(value = "interExamCost")
-    private BigDecimal interExamCost;
-	/**工厂代号（工厂id）*/
-	@Excel(name = "工厂代号（工厂id）", width = 15)
-    @ApiModelProperty(value = "工厂代号（工厂id）")
-    private String factory;
-	/**维护人*/
-	@Excel(name = "维护人", width = 15)
-    @ApiModelProperty(value = "维护人")
-    private String guardian;
-	/**维护时间*/
-	@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 maintenanceTime;
-	/**isadd*/
-	@Excel(name = "isadd", width = 15)
-    @ApiModelProperty(value = "isadd")
-    private Integer isadd;
-	/**采购类型*/
-	@Excel(name = "采购类型", width = 15)
-    @ApiModelProperty(value = "采购类型")
-    private String purchaseType;
-	/**是否启用*/
-	@Excel(name = "是否启用", width = 15)
-    @ApiModelProperty(value = "是否启用")
-    private Integer isinvalid;
-	/**id*/
-	@TableId(type = IdType.ASSIGN_ID)
-    @ApiModelProperty(value = "id")
-    private String id;
-}

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

@@ -1,65 +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.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: produce_batch
- * @Author: jeecg-boot
- * @Date:   2024-06-11
- * @Version: V1.0
- */
-@Data
-@TableName("produce_batch")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="produce_batch对象", description="produce_batch")
-public class ProduceBatch implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-	/**门控料号（物料id）*/
-	@Excel(name = "门控料号（物料id）", width = 15)
-    @ApiModelProperty(value = "门控料号（物料id）")
-    private String materialNumber;
-	/**工厂代号（工厂id）*/
-	@Excel(name = "工厂代号（工厂id）", width = 15)
-    @ApiModelProperty(value = "工厂代号（工厂id）")
-    private String factory;
-	/**生产批量*/
-	@Excel(name = "生产批量", width = 15)
-    @ApiModelProperty(value = "生产批量")
-    private BigDecimal batch;
-	/**维护人（用户id）*/
-	@Excel(name = "维护人（用户id）", width = 15)
-    @ApiModelProperty(value = "维护人（用户id）")
-    private String guardian;
-	/**维护时间*/
-	@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 maintenanceTime;
-	/**aufnr*/
-//	@Excel(name = "aufnr", width = 15)
-    @ApiModelProperty(value = "aufnr")
-    private String aufnr;
-    /**主键*/
-    @TableId(type = IdType.ASSIGN_ID)
-    @ApiModelProperty(value = "主键")
-    private String id;
-}

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

@@ -1,47 +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.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: sap_subfactory
- * @Author: jeecg-boot
- * @Date:   2024-06-11
- * @Version: V1.0
- */
-@Data
-@TableName("sap_subfactory")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="sap_subfactory对象", description="sap_subfactory")
-public class SapSubfactory 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 companyCode;
-	/**工厂代码*/
-	@Excel(name = "工厂代码", width = 15)
-    @ApiModelProperty(value = "工厂代码")
-    private String factory;
-}

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/BudgetPriceMapper.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.BudgetPrice;
-
-/**
- * @Description: budget_price
- * @Author: jeecg-boot
- * @Date: 2024-06-11
- * @Version: V1.0
- */
-public interface BudgetPriceMapper extends BaseMapper<BudgetPrice> {
-
-}

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

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

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

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

@@ -0,0 +1,18 @@
+package com.zzsmart.qomo.kn.cost.manage.mapper;
+
+import com.zzsmart.qomo.kn.cost.manage.entity.CostModel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author  
+ * @since 2024-07-11
+ */
+@Mapper
+public interface CostModelMapper extends BaseMapper<CostModel> {
+
+}

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

@@ -1,24 +0,0 @@
-package com.zzsmart.qomo.kn.cost.manage.mapper;
-
-import java.util.List;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-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.CostStandard;
-import com.zzsmart.qomo.kn.cost.manage.vo.CostStandardVO;
-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 CostStandardMapper extends BaseMapper<CostStandard> {
-
-    IPage<CostStandardVO> pageList(@Param("page")Page<CostStandardVO> page , @Param(Constants.WRAPPER) Wrapper<CostStandardVO> wrapper);
-}

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

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

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

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

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

@@ -1,5 +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.BudgetPriceMapper">
-
-</mapper>

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

@@ -1,5 +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.C7525costMapper">
-
-</mapper>

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

@@ -1,5 +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.CostCenterMapper">
-
-</mapper>

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

@@ -0,0 +1,26 @@
+<?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.CostModelMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.zzsmart.qomo.kn.cost.manage.entity.CostModel">
+        <id column="id" property="id" />
+        <result column="model_name" property="modelName" />
+        <result column="drawing_no" property="drawingNo" />
+        <result column="material_no" property="materialNo" />
+        <result column="material_type" property="materialType" />
+        <result column="model_version" property="modelVersion" />
+        <result column="status" property="status" />
+        <result column="create_time" property="createTime" />
+        <result column="create_by" property="createBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="cost_model_detail" property="costModelDetail" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, model_name, drawing_no, material_no, material_type, model_version, status, create_time, create_by, update_time, update_by, cost_model_detail
+    </sql>
+
+</mapper>

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

@@ -40,8 +40,8 @@
     <select id="pageList" resultMap="CostStandardDetailVOResultMap">
         select c1.*, c2.version_number, c2.version_status, c2.stage,c2.version_year
         from
-            cost_standard_detail  c1
-                left join cost_standard_version  c2 on c1.version_number_id = c2.id
+            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
 
@@ -49,8 +49,8 @@
     <select id="queryListResult" resultMap="CostStandardDetailVOResultMap">
         select c1.*, c2.version_number, c2.version_status, c2.stage,c2.version_year
         from
-            cost_standard_detail  c1
-                left join cost_standard_version  c2 on c1.version_number_id = c2.id
+            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
 

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

@@ -1,42 +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.CostStandardMapper">
-    <resultMap id="CostStandardVOResultMap" type="com.zzsmart.qomo.kn.cost.manage.vo.CostStandardVO" >
-        <result column="id" property="id" />
-        <result column="material_number" property="materialNumber" />
-        <result column="version_number" property="versionNumber" />
-        <result column="version_number_id" property="versionNumberId" />
-        <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="tooling_cost" property="toolingCost" />
-        <result column="Inspection_cost" property="inspectionCost" />
-        <result column="mold_cost" property="moldCost" />
-        <result column="test_cost" property="testCost" />
-        <result column="total_cost" property="totalCost" />
-        <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="version_status" property="versionStatus" />
-        <result column="stage" property="stage" />
-        <result column="version_year" property="versionYear" />
-    </resultMap>
-    <select id="pageList" resultMap="CostStandardVOResultMap">
- select c1.*, c2.version_number, c2.version_status, c2.stage,c2.version_year
-        from
-     cost_standard  c1
-         left join 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/mapper/xml/LatestPurchasePriceMapper.xml

@@ -1,5 +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.LatestPurchasePriceMapper">
-
-</mapper>

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

@@ -1,5 +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.ProduceBatchMapper">
-
-</mapper>

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

@@ -1,5 +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.SapSubfactoryMapper">
-
-</mapper>

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

@@ -0,0 +1,49 @@
+package com.zzsmart.qomo.kn.cost.manage.service;
+
+import com.zzsmart.qomo.kn.cost.manage.entity.CostModel;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zzsmart.qomo.kn.cost.manage.vo.CostModelVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author
+ * @since 2024-07-11
+ */
+public interface CostModelService extends IService<CostModel> {
+    /**
+     * 查询标准成本模型列表
+     * @param materialNumber
+     * @return
+     */
+    List<CostModel> queryListResult(String materialNumber);
+
+    /**
+     * 标准成本模型编辑
+     * @param costModelVO
+     */
+    Boolean updateCostModelInfo(CostModelVO costModelVO);
+
+    /**
+     * 标准成本模型删除
+     * @param costModelVO
+     */
+    Boolean deleteCostModel(CostModelVO costModelVO);
+
+    /**
+     * 标准成本模型发布
+     * @param costModelVO
+     */
+    Boolean publishCostModel(CostModelVO costModelVO);
+
+    /**
+     * 标准成本模型保存
+     * @param costModelVO
+     * @return
+     */
+    Boolean saveCostModelInfo(CostModelVO costModelVO);
+}

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

@@ -16,7 +16,7 @@ import javax.servlet.http.HttpServletResponse;
  * 标准成本明细表 服务类
  * </p>
  *
- * @author cost_purchase_price
+ * @author app_scene_cost_purchase_price
  * @since 2024-06-19
  */
 public interface CostStandardDetailService extends IService<CostStandardDetail> {

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

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

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

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

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

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

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

@@ -1,26 +0,0 @@
-package com.zzsmart.qomo.kn.cost.manage.service;
-
-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.baomidou.mybatisplus.extension.service.IService;
-import com.zzsmart.qomo.kn.cost.manage.entity.CostStandard;
-import com.zzsmart.qomo.kn.cost.manage.vo.CostStandardVO;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * @Description: 标准成本
- * @Author: wangqiong
- * @Date:   2024-06-13
- * @Version: V1.0
- */
-public interface ICostStandardService extends IService<CostStandard> {
-    /**
-     * 分页查询
-     * @param page
-     * @param
-     * @return
-     */
-    IPage<CostStandardVO> pageList(Page<CostStandardVO> page, CostStandardVO costStandard);
-}

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

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

qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/IProduceBatchService.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.ProduceBatch;
-
-/**
- * @Description: produce_batch
- * @Author: jeecg-boot
- * @Date:   2024-06-11
- * @Version: V1.0
- */
-public interface IProduceBatchService extends IService<ProduceBatch> {
-
-}

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

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

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

@@ -1,18 +0,0 @@
-package com.zzsmart.qomo.kn.cost.manage.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zzsmart.qomo.kn.cost.manage.entity.BudgetPrice;
-import com.zzsmart.qomo.kn.cost.manage.mapper.BudgetPriceMapper;
-import com.zzsmart.qomo.kn.cost.manage.service.IBudgetPriceService;
-import org.springframework.stereotype.Service;
-
-/**
- * @Description: budget_price
- * @Author: jeecg-boot
- * @Date: 2024-06-11
- * @Version: V1.0
- */
-@Service
-public class BudgetPriceServiceImpl extends ServiceImpl<BudgetPriceMapper, BudgetPrice> implements IBudgetPriceService {
-
-}

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

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

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

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

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

@@ -0,0 +1,120 @@
+package com.zzsmart.qomo.kn.cost.manage.service.impl;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zzsmart.qomo.kn.cost.manage.entity.CostModel;
+import com.zzsmart.qomo.kn.cost.manage.mapper.CostModelMapper;
+import com.zzsmart.qomo.kn.cost.manage.service.CostModelService;
+import com.zzsmart.qomo.kn.cost.manage.vo.CostModelVO;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2024-07-11
+ */
+@Service
+public class CostModelServiceImpl extends ServiceImpl<CostModelMapper, CostModel> implements CostModelService {
+    @Autowired
+    CostModelMapper costModelMapper;
+
+    /**
+     * 查询标准成本模型列表
+     *
+     * @param materialNumber
+     * @return
+     */
+    @Override
+    public List<CostModel> queryListResult(String materialNumber) {
+        QueryWrapper queryWrapper = new QueryWrapper();
+        if (StrUtil.isNotEmpty(materialNumber)) {
+            // 物料号
+            queryWrapper.like("material_no", materialNumber);
+        }
+        List list = costModelMapper.selectList(queryWrapper);
+        return list;
+    }
+
+    /**
+     * 标准成本模型编辑
+     *
+     * @param costModelVO
+     */
+    @Override
+    public Boolean updateCostModelInfo(CostModelVO costModelVO) {
+        if (costModelVO != null && costModelVO.getId() != null) {
+            CostModel costModel = new CostModel();
+            BeanUtils.copyProperties(costModelVO, costModel);
+            costModel.setId(costModelVO.getId());
+            costModel.setCostModelDetail(costModelVO.getCostModelDetail());
+            int i = costModelMapper.updateById(costModel);
+            if (i > 0) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 标准成本模型删除
+     *
+     * @param costModelVO
+     */
+    @Override
+    public Boolean deleteCostModel(CostModelVO costModelVO) {
+        if (costModelVO != null && costModelVO.getId() != null) {
+            int i = costModelMapper.deleteById(costModelVO.getId());
+            if (i > 0) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 标准成本模型发布
+     *
+     * @param costModelVO
+     */
+    @Override
+    public Boolean publishCostModel(CostModelVO costModelVO) {
+        if (costModelVO != null && costModelVO.getId() != null) {
+            CostModel costModel = new CostModel();
+            costModel.setStatus(costModelVO.getStatus());
+            costModel.setId(costModelVO.getId());
+            int i = costModelMapper.updateById(costModel);
+            if (i > 0) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 标准成本模型保存
+     *
+     * @param costModelVO
+     * @return
+     */
+    @Override
+    public Boolean saveCostModelInfo(CostModelVO costModelVO) {
+        if (costModelVO != null) {
+            CostModel costModel = new CostModel();
+            BeanUtils.copyProperties(costModelVO, costModel);
+            costModel.setCostModelDetail(costModelVO.getCostModelDetail());
+            int i = costModelMapper.insert(costModel);
+            if (i > 0) {
+                return true;
+            }
+        }
+        return false;
+    }
+}

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

@@ -28,7 +28,7 @@ import static com.zzsmart.qomo.kn.cost.manage.util.EasyExcelUtil.getIncludeField
  * 标准成本明细表 服务实现类
  * </p>
  *
- * @author cost_purchase_price
+ * @author app_scene_cost_purchase_price
  * @since 2024-06-19
  */
 @Service

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

@@ -1,60 +0,0 @@
-package com.zzsmart.qomo.kn.cost.manage.service.impl;
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zzsmart.qomo.kn.cost.manage.entity.CostStandard;
-import com.zzsmart.qomo.kn.cost.manage.mapper.CostStandardMapper;
-import com.zzsmart.qomo.kn.cost.manage.service.ICostStandardService;
-import com.zzsmart.qomo.kn.cost.manage.vo.CostStandardVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: 标准成本
- * @Author: wangqiong
- * @Date:   2024-06-13
- * @Version: V1.0
- */
-@Service
-public class CostStandardServiceImpl extends ServiceImpl<CostStandardMapper, CostStandard> implements ICostStandardService {
-    @Autowired
-    private CostStandardMapper costStandardMapper;
-
-    @Override
-    public IPage<CostStandardVO> pageList(Page<CostStandardVO> page, CostStandardVO costStandard) {
-        // 查询条件组装
-        QueryWrapper queryWrapper = new QueryWrapper();
-
-        if(costStandard != null){
-            if(StrUtil.isNotEmpty(costStandard.getVersionYear()) ){
-                // 年份
-                queryWrapper.eq("c2.version_year",costStandard.getVersionYear());
-            }
-            if(StrUtil.isNotEmpty(costStandard.getStage()) ){
-                // 阶段
-                queryWrapper.eq("c2.stage",costStandard.getStage());
-            }
-            if(StrUtil.isNotEmpty(costStandard.getMaterialNumber()) ){
-                // 物料号
-                queryWrapper.like("c1.material_number",costStandard.getMaterialNumber());
-            }
-            if(StrUtil.isNotEmpty(costStandard.getVersionNumber()) ){
-                // 版本号
-                queryWrapper.like("c2.version_number",costStandard.getVersionNumber());
-            }
-            if(StrUtil.isNotEmpty(costStandard.getVersionStatus()) ){
-                // 版本状态
-                queryWrapper.eq("c2.version_status",costStandard.getVersionStatus());
-            }
-        }
-        return (IPage<CostStandardVO>) costStandardMapper.pageList(page,queryWrapper);
-    }
-}

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

@@ -5,17 +5,13 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.zzsmart.qomo.kn.cost.manage.constants.Constants;
-import com.zzsmart.qomo.kn.cost.manage.entity.CostStandard;
 import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardVersion;
 import com.zzsmart.qomo.kn.cost.manage.enums.StandardStageEnum;
-import com.zzsmart.qomo.kn.cost.manage.mapper.CostStandardMapper;
 import com.zzsmart.qomo.kn.cost.manage.mapper.CostStandardVersionMapper;
 import com.zzsmart.qomo.kn.cost.manage.service.ICostStandardVersionService;
 
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.exception.JeecgBootException;
-import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.entity.ImportParams;
@@ -68,7 +64,6 @@ public class CostStandardVersionServiceImpl extends ServiceImpl<CostStandardVers
         // 保存版本号表
         boolean save = super.save(costStandardVersion);
         // todo 标准成本计算
-        CostStandard standard = standardCalculate(costStandardVersion);
 //        standard.setMaterialNumber(costStandardVersion.getMaterialNumber());
 //        standard.setVersionNumberId(costStandardVersion.getId());
 //        if(sysUser!=null){
@@ -87,17 +82,16 @@ public class CostStandardVersionServiceImpl extends ServiceImpl<CostStandardVers
      * @param costStandardVersion 版本号
      * @return
      */
-    private CostStandard standardCalculate(CostStandardVersion costStandardVersion) {
+   // private CostStandard standardCalculate(CostStandardVersion costStandardVersion) {
         // 计算逻辑，生成版本号输入的物料号是根节点物料号，
         // 1，根据根节点物料号查找物料表kn_new_sap_mara
 
-        // 2,去bom表找出对应下的所有层级物料cost_material_bom
+        // 2,去bom表找出对应下的所有层级物料app_scene_cost_material_bom
 
-        // 3，根据物料去工时工序表找出对应工序，工序表中包含所计算的工时，cost_material_process_hours
-        // 4，查小时费率表，找到对应工时费率cost_hour_rate
-        // 5，查采购单价表，找到对应采购单价cost_purchase_price
-        // 5，计算每层级的物料标准成本，存到标准成本明细表cost_standard_detail
-        CostStandard standard = new CostStandard();
+        // 3，根据物料去工时工序表找出对应工序，工序表中包含所计算的工时，app_scene_cost_material_process_hours
+        // 4，查小时费率表，找到对应工时费率app_scene_cost_hour_rate
+        // 5，查采购单价表，找到对应采购单价app_scene_cost_purchase_price
+        // 5，计算每层级的物料标准成本，存到标准成本明细表app_scene_cost_standard_detail
 
         // 4，计算bom费用，BOM表清单物料用量*采购单价
         // 5，计算包装费
@@ -111,8 +105,8 @@ public class CostStandardVersionServiceImpl extends ServiceImpl<CostStandardVers
         // 13，计算制造成本，前面所有费用汇总（即人工费+机器折旧费+机物料消耗费+水电费+其他制造费+物流费）
         // 18，计算总成本
 
-        return standard;
-    }
+//        return standard;
+//    }
 
 
 

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

@@ -1,20 +0,0 @@
-package com.zzsmart.qomo.kn.cost.manage.service.impl;
-
-
-import com.zzsmart.qomo.kn.cost.manage.entity.LatestPurchasePrice;
-import com.zzsmart.qomo.kn.cost.manage.mapper.LatestPurchasePriceMapper;
-import com.zzsmart.qomo.kn.cost.manage.service.ILatestPurchasePriceService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: latest_purchase_price
- * @Author: jeecg-boot
- * @Date:   2024-06-11
- * @Version: V1.0
- */
-@Service
-public class LatestPurchasePriceServiceImpl extends ServiceImpl<LatestPurchasePriceMapper, LatestPurchasePrice> implements ILatestPurchasePriceService {
-
-}

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

@@ -1,20 +0,0 @@
-package com.zzsmart.qomo.kn.cost.manage.service.impl;
-
-
-import com.zzsmart.qomo.kn.cost.manage.entity.ProduceBatch;
-import com.zzsmart.qomo.kn.cost.manage.mapper.ProduceBatchMapper;
-import com.zzsmart.qomo.kn.cost.manage.service.IProduceBatchService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: produce_batch
- * @Author: jeecg-boot
- * @Date:   2024-06-11
- * @Version: V1.0
- */
-@Service
-public class ProduceBatchServiceImpl extends ServiceImpl<ProduceBatchMapper, ProduceBatch> implements IProduceBatchService {
-
-}

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

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

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

@@ -0,0 +1,11 @@
+package com.zzsmart.qomo.kn.cost.manage.vo;
+
+import com.zzsmart.qomo.kn.cost.manage.entity.CostModel;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "标准成本模型", description = "标准成本模型")
+public class CostModelVO extends CostModel {
+
+}

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

@@ -14,7 +14,7 @@ import java.io.Serializable;
  * 标准成本明细表
  * </p>
  *
- * @author cost_purchase_price
+ * @author app_scene_cost_purchase_price
  * @since 2024-06-19
  */
 @Data

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

@@ -1,34 +0,0 @@
-package com.zzsmart.qomo.kn.cost.manage.vo;
-
-
-import com.zzsmart.qomo.kn.cost.manage.entity.CostStandard;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-import java.io.Serializable;
-
-
-/**
- * @Classname CostStandardVO
- * @Description 标准成本列表出参
- * @Version 1.0.0
- * @Date 2024/6/13 15:51
- * @Created wangqiong
- */
-@Data
-public class CostStandardVO extends CostStandard implements Serializable {
-    private static final long serialVersionUID = 1L;
-    /**年份*/
-    @ApiModelProperty(value = "年份")
-    private String versionYear;
-    /**版本状态*/
-    @ApiModelProperty(value = "版本状态")
-    private String versionStatus;
-    /**阶段，A-初始，B-首批，C-量产*/
-    @ApiModelProperty(value = "阶段")
-    private String stage;
-    /**版本号*/
-    @ApiModelProperty(value = "版本号")
-    private String versionNumber;
-}

qomo-kn-cost-manage/src/test/java/com/zzsmart/qomo/kn/cost/manage/ApplicationTests.java

@@ -42,7 +42,7 @@ public class ApplicationTests {
                             .pathInfo(Collections.singletonMap(OutputFile.mapperXml,System.getProperty("user.dir")+"/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml"));
                 })
                 .strategyConfig(builder -> {
-                    builder.addInclude("cost_material_bom")// todo 设置需要生成的表名
+                    builder.addInclude("app_scene_cost_model")// todo 设置需要生成的表名
                             //.addTablePrefix("sys_")//设置表前缀过滤
                             .entityBuilder()
                             .enableLombok()