Merge branch 'wq' of kn-cost/cost-backend into dev
This commit was merged in pull request #3.
This commit is contained in:
Gitea
+180
@@ -0,0 +1,180 @@
|
||||
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.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="生产批量设置")
|
||||
@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);
|
||||
}
|
||||
|
||||
}
|
||||
+61
@@ -0,0 +1,61 @@
|
||||
package com.zzsmart.qomo.kn.cost.manage.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.util.Date;
|
||||
import java.math.BigDecimal;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.baomidou.mybatisplus.annotation.TableLogic;
|
||||
import lombok.Data;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import org.jeecg.common.aspect.annotation.Dict;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.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;
|
||||
}
|
||||
+18
@@ -0,0 +1,18 @@
|
||||
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> {
|
||||
|
||||
}
|
||||
+5
@@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.zzsmart.qomo.kn.cost.manage.mapper.ProduceBatchMapper">
|
||||
|
||||
</mapper>
|
||||
+14
@@ -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.ProduceBatch;
|
||||
|
||||
/**
|
||||
* @Description: produce_batch
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2024-06-11
|
||||
* @Version: V1.0
|
||||
*/
|
||||
public interface IProduceBatchService extends IService<ProduceBatch> {
|
||||
|
||||
}
|
||||
+20
@@ -0,0 +1,20 @@
|
||||
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 {
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user