From 0d587c646cd3eb7fedd60ad4991dc63e86add6bb Mon Sep 17 00:00:00 2001 From: 18792927508 <1322446236@qq.com> Date: Mon, 17 Jun 2024 09:12:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=88=90=E6=9C=AC=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E6=9F=A5=E8=AF=A2=EF=BC=8C=E7=94=9F=E6=88=90=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 2 +- .../CostPartMissingInfoController.java | 179 +++++++++++++++++ .../controller/CostStandardController.java | 182 ++++++++++++++++++ .../CostStandardVersionController.java | 181 +++++++++++++++++ .../controller/ProduceBatchController.java | 2 +- .../manage/entity/CostPartMissingInfo.java | 55 ++++++ .../kn/cost/manage/entity/CostStandard.java | 132 +++++++++++++ .../manage/entity/CostStandardVersion.java | 86 +++++++++ .../mapper/CostPartMissingInfoMapper.java | 18 ++ .../manage/mapper/CostStandardMapper.java | 24 +++ .../mapper/CostStandardVersionMapper.java | 18 ++ .../mapper/xml/CostPartMissingInfoMapper.xml | 5 + .../manage/mapper/xml/CostStandardMapper.xml | 42 ++++ .../mapper/xml/CostStandardVersionMapper.xml | 5 + .../service/ICostPartMissingInfoService.java | 14 ++ .../manage/service/ICostStandardService.java | 26 +++ .../service/ICostStandardVersionService.java | 17 ++ .../impl/CostPartMissingInfoServiceImpl.java | 20 ++ .../service/impl/CostStandardServiceImpl.java | 60 ++++++ .../impl/CostStandardVersionServiceImpl.java | 87 +++++++++ .../kn/cost/manage/vo/CostStandardVO.java | 34 ++++ 21 files changed, 1187 insertions(+), 2 deletions(-) create mode 100644 qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostPartMissingInfoController.java create mode 100644 qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostStandardController.java create mode 100644 qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostStandardVersionController.java create mode 100644 qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/CostPartMissingInfo.java create mode 100644 qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/CostStandard.java create mode 100644 qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/CostStandardVersion.java create mode 100644 qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/CostPartMissingInfoMapper.java create mode 100644 qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/CostStandardMapper.java create mode 100644 qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/CostStandardVersionMapper.java create mode 100644 qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml/CostPartMissingInfoMapper.xml create mode 100644 qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml/CostStandardMapper.xml create mode 100644 qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml/CostStandardVersionMapper.xml create mode 100644 qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/ICostPartMissingInfoService.java create mode 100644 qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/ICostStandardService.java create mode 100644 qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/ICostStandardVersionService.java create mode 100644 qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/CostPartMissingInfoServiceImpl.java create mode 100644 qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/CostStandardServiceImpl.java create mode 100644 qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/CostStandardVersionServiceImpl.java create mode 100644 qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/vo/CostStandardVO.java diff --git a/qomo-kn-cost-manage-start/src/main/resources/application-dev.yml b/qomo-kn-cost-manage-start/src/main/resources/application-dev.yml index 7caa54c..474381d 100644 --- a/qomo-kn-cost-manage-start/src/main/resources/application-dev.yml +++ b/qomo-kn-cost-manage-start/src/main/resources/application-dev.yml @@ -207,7 +207,7 @@ spring: connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 datasource: master: - url: jdbc:mysql://121.40.189.20:3306/costmanage?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=true&serverTimezone=Asia/Shanghai + 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 diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostPartMissingInfoController.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostPartMissingInfoController.java new file mode 100644 index 0000000..bb6720b --- /dev/null +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostPartMissingInfoController.java @@ -0,0 +1,179 @@ +package com.zzsmart.qomo.kn.cost.manage.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.zzsmart.qomo.kn.cost.manage.entity.CostPartMissingInfo; +import com.zzsmart.qomo.kn.cost.manage.service.ICostPartMissingInfoService; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: 标准成本-部件缺失信息 + * @Author: wangqiong + * @Date: 2024-06-13 + * @Version: V1.0 + */ +@Api(tags="标准成本-部件缺失信息") +@RestController +@RequestMapping("//costPartMissingInfo") +@Slf4j +public class CostPartMissingInfoController extends JeecgController { + @Autowired + private ICostPartMissingInfoService costPartMissingInfoService; + + /** + * 分页列表查询 + * + * @param costPartMissingInfo + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "cost_part_missing_info-分页列表查询") + @ApiOperation(value="cost_part_missing_info-分页列表查询", notes="cost_part_missing_info-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(CostPartMissingInfo costPartMissingInfo, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(costPartMissingInfo, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = costPartMissingInfoService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @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") + @PostMapping(value = "/add") + public Result add(@RequestBody CostPartMissingInfo costPartMissingInfo) { + costPartMissingInfoService.save(costPartMissingInfo); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @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") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody CostPartMissingInfo costPartMissingInfo) { + costPartMissingInfoService.updateById(costPartMissingInfo); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @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") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + costPartMissingInfoService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @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") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.costPartMissingInfoService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "cost_part_missing_info-通过id查询") + @ApiOperation(value="cost_part_missing_info-通过id查询", notes="cost_part_missing_info-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + CostPartMissingInfo costPartMissingInfo = costPartMissingInfoService.getById(id); + if(costPartMissingInfo==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(costPartMissingInfo); + } + + /** + * 导出excel + * + * @param request + * @param costPartMissingInfo + */ +// @RequiresPermissions(":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"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ +// @RequiresPermissions(":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); + } + +} diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostStandardController.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostStandardController.java new file mode 100644 index 0000000..bad1ded --- /dev/null +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostStandardController.java @@ -0,0 +1,182 @@ +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.CostStandard; +import com.zzsmart.qomo.kn.cost.manage.service.ICostStandardService; +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 + * @Version: V1.0 + */ +@Api(tags="标准成本计算") +@RestController +@RequestMapping("//costStandard") +@Slf4j +public class CostStandardController extends JeecgController { + @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> queryPageList(CostStandardVO costStandard, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + + Page page = new Page(pageNo, pageSize); + IPage 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 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 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 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 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 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); + } + +} diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostStandardVersionController.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostStandardVersionController.java new file mode 100644 index 0000000..e647772 --- /dev/null +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostStandardVersionController.java @@ -0,0 +1,181 @@ +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.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 + * @Version: V1.0 + */ +@Api(tags="标准成本-版本号") +@RestController +@RequestMapping("//costStandardVersion") +@Slf4j +public class CostStandardVersionController extends JeecgController { + @Autowired + private ICostStandardVersionService costStandardVersionService; + + /** + * 分页列表查询 + * + * @param costStandardVersion + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "cost_standard_version-分页列表查询") + @ApiOperation(value="cost_standard_version-分页列表查询", notes="cost_standard_version-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(CostStandardVersion costStandardVersion, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(costStandardVersion, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = costStandardVersionService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param costStandardVersion + * @return + */ + @AutoLog(value = "cost_standard_version-添加") + @ApiOperation(value="cost_standard_version-添加", notes="cost_standard_version-添加") +// @RequiresPermissions(":cost_standard_version:add") + @PostMapping(value = "/add") + public Result add(@RequestBody CostStandardVersion costStandardVersion) { + costStandardVersionService.save(costStandardVersion); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param costStandardVersion + * @return + */ + @AutoLog(value = "cost_standard_version-编辑") + @ApiOperation(value="cost_standard_version-编辑", notes="cost_standard_version-编辑") +// @RequiresPermissions(":cost_standard_version:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody CostStandardVersion costStandardVersion) { + costStandardVersionService.updateById(costStandardVersion); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @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") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + costStandardVersionService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "cost_standard_version-批量删除") + @ApiOperation(value="cost_standard_version-批量删除", notes="cost_standard_version-批量删除") +// @RequiresPermissions(":cost_standard_version:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.costStandardVersionService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "cost_standard_version-通过id查询") + @ApiOperation(value="cost_standard_version-通过id查询", notes="cost_standard_version-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + CostStandardVersion costStandardVersion = costStandardVersionService.getById(id); + if(costStandardVersion==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(costStandardVersion); + } + + /** + * 导出excel + * + * @param request + * @param costStandardVersion + */ +// @RequiresPermissions(":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"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ +// @RequiresPermissions(":cost_standard_version:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, CostStandardVersion.class); + } + +} diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/ProduceBatchController.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/ProduceBatchController.java index 00d280b..3844db9 100644 --- a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/ProduceBatchController.java +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/ProduceBatchController.java @@ -133,9 +133,9 @@ public class ProduceBatchController extends JeecgController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.produceBatchService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); } - /** * 通过id查询 * diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/CostPartMissingInfo.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/CostPartMissingInfo.java new file mode 100644 index 0000000..9c93bdf --- /dev/null +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/CostPartMissingInfo.java @@ -0,0 +1,55 @@ +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_part_missing_info") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="cost_part_missing_info对象", description="cost_part_missing_info") +public class CostPartMissingInfo implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private Integer id; + /**标准成本表主键id*/ + @Excel(name = "标准成本表主键id", width = 15) + @ApiModelProperty(value = "标准成本表主键id") + private Integer costStandardId; + /**物料号*/ + @Excel(name = "物料号", width = 15) + @ApiModelProperty(value = "物料号") + private String materialNumber; + /**版本号*/ + @Excel(name = "版本号", width = 15) + @ApiModelProperty(value = "版本号") + private String versionNumber; + /**缺失信息*/ + @Excel(name = "缺失信息", width = 15) + @ApiModelProperty(value = "缺失信息") + private String missingInfo; +} diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/CostStandard.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/CostStandard.java new file mode 100644 index 0000000..f8b7aba --- /dev/null +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/CostStandard.java @@ -0,0 +1,132 @@ +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 Integer id; + /**物料号*/ + @Excel(name = "物料号", width = 15) + @ApiModelProperty(value = "物料号") + private String materialNumber; + + /**版本号ID*/ + @Excel(name = "版本号ID", width = 15) + @ApiModelProperty(value = "版本号ID") + private Integer 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; +} diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/CostStandardVersion.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/CostStandardVersion.java new file mode 100644 index 0000000..90eae58 --- /dev/null +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/CostStandardVersion.java @@ -0,0 +1,86 @@ +package com.zzsmart.qomo.kn.cost.manage.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableLogic; +import lombok.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_version") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="cost_standard_version对象", description="cost_standard_version") +public class CostStandardVersion implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private Integer id; + + /**图号*/ + @ApiModelProperty(value = "图号") + private String figureNumber; + /**阶段，A-初始，B-首批，C-量产*/ + @Excel(name = "阶段", width = 15) + @ApiModelProperty(value = "阶段") + private String stage; + /**物料号*/ + @Excel(name = "物料号", width = 15) + @ApiModelProperty(value = "物料号") + private String materialNumber; + /**版本号*/ + @Excel(name = "版本号", width = 15) + @ApiModelProperty(value = "版本号") + private String versionNumber; + /**版本状态*/ + @Excel(name = "版本状态", width = 15) + @ApiModelProperty(value = "版本状态") + private String versionStatus; + /**创建人*/ + @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; + /**年份*/ + @Excel(name = "年份", width = 15) + @ApiModelProperty(value = "年份") + private String versionYear; +} diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/CostPartMissingInfoMapper.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/CostPartMissingInfoMapper.java new file mode 100644 index 0000000..6bc98b6 --- /dev/null +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/CostPartMissingInfoMapper.java @@ -0,0 +1,18 @@ +package com.zzsmart.qomo.kn.cost.manage.mapper; + +import java.util.List; + +import com.zzsmart.qomo.kn.cost.manage.entity.CostPartMissingInfo; +import org.apache.ibatis.annotations.Param; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 标准成本-部件缺失信息 + * @Author: wangqiong + * @Date: 2024-06-13 + * @Version: V1.0 + */ +public interface CostPartMissingInfoMapper extends BaseMapper { + +} diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/CostStandardMapper.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/CostStandardMapper.java new file mode 100644 index 0000000..c3ab83e --- /dev/null +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/CostStandardMapper.java @@ -0,0 +1,24 @@ +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 { + + IPage pageList(@Param("page")Page page , @Param(Constants.WRAPPER) Wrapper wrapper); +} diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/CostStandardVersionMapper.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/CostStandardVersionMapper.java new file mode 100644 index 0000000..e38ce8f --- /dev/null +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/CostStandardVersionMapper.java @@ -0,0 +1,18 @@ +package com.zzsmart.qomo.kn.cost.manage.mapper; + +import java.util.List; + +import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardVersion; +import org.apache.ibatis.annotations.Param; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 标准成本-版本号 + * @Author: wangqiong + * @Date: 2024-06-13 + * @Version: V1.0 + */ +public interface CostStandardVersionMapper extends BaseMapper { + +} diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml/CostPartMissingInfoMapper.xml b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml/CostPartMissingInfoMapper.xml new file mode 100644 index 0000000..8a78591 --- /dev/null +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml/CostPartMissingInfoMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml/CostStandardMapper.xml b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml/CostStandardMapper.xml new file mode 100644 index 0000000..0baa717 --- /dev/null +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml/CostStandardMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml/CostStandardVersionMapper.xml b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml/CostStandardVersionMapper.xml new file mode 100644 index 0000000..0a5c2dd --- /dev/null +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml/CostStandardVersionMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/ICostPartMissingInfoService.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/ICostPartMissingInfoService.java new file mode 100644 index 0000000..39c2607 --- /dev/null +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/ICostPartMissingInfoService.java @@ -0,0 +1,14 @@ +package com.zzsmart.qomo.kn.cost.manage.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.zzsmart.qomo.kn.cost.manage.entity.CostPartMissingInfo; + +/** + * @Description: 标准成本-部件缺失信息 + * @Author: wangqiong + * @Date: 2024-06-13 + * @Version: V1.0 + */ +public interface ICostPartMissingInfoService extends IService { + +} diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/ICostStandardService.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/ICostStandardService.java new file mode 100644 index 0000000..efdaa50 --- /dev/null +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/ICostStandardService.java @@ -0,0 +1,26 @@ +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 { + /** + * 分页查询 + * @param page + * @param + * @return + */ + IPage pageList(Page page, CostStandardVO costStandard); +} diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/ICostStandardVersionService.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/ICostStandardVersionService.java new file mode 100644 index 0000000..4be0e2b --- /dev/null +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/ICostStandardVersionService.java @@ -0,0 +1,17 @@ +package com.zzsmart.qomo.kn.cost.manage.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardVersion; + + + +/** + * @Description: 标准成本-版本号 + * @Author: wangqiong + * @Date: 2024-06-13 + * @Version: V1.0 + */ +public interface ICostStandardVersionService extends IService { + +} diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/CostPartMissingInfoServiceImpl.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/CostPartMissingInfoServiceImpl.java new file mode 100644 index 0000000..8ae9775 --- /dev/null +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/CostPartMissingInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.zzsmart.qomo.kn.cost.manage.service.impl; + + +import com.zzsmart.qomo.kn.cost.manage.entity.CostPartMissingInfo; +import com.zzsmart.qomo.kn.cost.manage.mapper.CostPartMissingInfoMapper; +import com.zzsmart.qomo.kn.cost.manage.service.ICostPartMissingInfoService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 标准成本-部件缺失信息 + * @Author: wangqiong + * @Date: 2024-06-13 + * @Version: V1.0 + */ +@Service +public class CostPartMissingInfoServiceImpl extends ServiceImpl implements ICostPartMissingInfoService { + +} diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/CostStandardServiceImpl.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/CostStandardServiceImpl.java new file mode 100644 index 0000000..ee58c95 --- /dev/null +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/CostStandardServiceImpl.java @@ -0,0 +1,60 @@ +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 implements ICostStandardService { + @Autowired + private CostStandardMapper costStandardMapper; + + @Override + public IPage pageList(Page 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) costStandardMapper.pageList(page,queryWrapper); + } +} diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/CostStandardVersionServiceImpl.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/CostStandardVersionServiceImpl.java new file mode 100644 index 0000000..0540289 --- /dev/null +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/CostStandardVersionServiceImpl.java @@ -0,0 +1,87 @@ +package com.zzsmart.qomo.kn.cost.manage.service.impl; + + + +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.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.system.vo.LoginUser; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; + + +/** + * @Description: 标准成本-版本号 + * @Author: wangqiong + * @Date: 2024-06-13 + * @Version: V1.0 + */ +@Service +public class CostStandardVersionServiceImpl extends ServiceImpl implements ICostStandardVersionService { + @Autowired + private CostStandardMapper costStandardMapper; + @Transactional + @Override + public boolean save(CostStandardVersion costStandardVersion) { + LoginUser sysUser = null; + try { + sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + } catch (Exception ignored) { + + } + if(sysUser!=null){ + costStandardVersion.setCreateBy(sysUser.getUsername()); + } + // 保存版本号表 + boolean save = super.save(costStandardVersion); + // todo 标准成本计算,并且设置字段对应值(计算时版本状态为枚举，比如计算中，计算终止，计算出错，已完成) + CostStandard standard= standardCalculate(costStandardVersion); +// standard.setMaterialNumber(costStandardVersion.getMaterialNumber()); +// standard.setVersionNumberId(costStandardVersion.getId()); +// if(sysUser!=null){ +// standard.setCreateBy(sysUser.getUsername()); +// } +// standard.setCreateTime(new Date()); +// // 保存标准成本表 +// costStandardMapper.insert(standard); + return save; + } + + /** + * 标准成本计算 + * @param costStandardVersion 版本号 + * @return + */ + private CostStandard standardCalculate(CostStandardVersion costStandardVersion) { + CostStandard standard = new CostStandard(); + // todo 1,查工序 + // 2， 查时间 + // 3，查费率 + // 4，计算bom费用，BOM表清单物料用量*采购单价 + // 5，计算包装费 + // 6，计算辅料费 + // 7，计算人工费，人工工时*费率 + // 8，计算机器折旧费，机器工时*费率 + // 9，计算机物料消耗费，辅料工时*费率 + // 10，计算水电费，燃动力工时*费率 + // 11，计算其他制造费，其他工时*费率 + // 12，计算物流费，物流费用=（机器折旧+机物料消耗+水电费+其他制费）*10.16% + // 13，计算制造成本，前面所有费用汇总（即bom费+包装费+辅料费+人工费+机器折旧费+机物料消耗费+水电费+其他制造费+物流费） + // 14，计算工装费 + // 15，计算检具费 + // 16，计算模具费 + // 17，计算测试费 + // 18，计算总成本 + + return standard; + } +} diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/vo/CostStandardVO.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/vo/CostStandardVO.java new file mode 100644 index 0000000..9ef6d09 --- /dev/null +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/vo/CostStandardVO.java @@ -0,0 +1,34 @@ +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; +} -- 2.54.0