3.5.4
定时任务： 1、定时同步原材料入库、原材料出库、成品入库和成品出库过滤出单位信息为空的数据（主要是测试数据） 2、增加物料自动出库的定时任务 3、增加生成生产计划明细完成的工时信息情况master
parent
35bd9fa6cc
commit
a1fd2a6573
@ -0,0 +1,105 @@
|
||||
package com.hw.mes.controller;
|
||||
|
||||
import java.util.List;
|
||||
import java.io.IOException;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.PutMapping;
|
||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import com.hw.common.log.annotation.Log;
|
||||
import com.hw.common.log.enums.BusinessType;
|
||||
import com.hw.common.security.annotation.RequiresPermissions;
|
||||
import com.hw.mes.domain.MesProduceStatisticsDetail;
|
||||
import com.hw.mes.service.IMesProduceStatisticsDetailService;
|
||||
import com.hw.common.core.web.controller.BaseController;
|
||||
import com.hw.common.core.web.domain.AjaxResult;
|
||||
import com.hw.common.core.utils.poi.ExcelUtil;
|
||||
import com.hw.common.core.web.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 生产完成明细Controller
|
||||
*
|
||||
* @author xins
|
||||
* @date 2024-11-26
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/produceStatisticsDetail")
|
||||
public class MesProduceStatisticsDetailController extends BaseController
|
||||
{
|
||||
@Autowired
|
||||
private IMesProduceStatisticsDetailService mesProduceStatisticsDetailService;
|
||||
|
||||
/**
|
||||
* 查询生产完成明细列表
|
||||
*/
|
||||
@RequiresPermissions("mes:produceStatisticsDetail:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(MesProduceStatisticsDetail mesProduceStatisticsDetail)
|
||||
{
|
||||
startPage();
|
||||
List<MesProduceStatisticsDetail> list = mesProduceStatisticsDetailService.selectMesProduceStatisticsDetailJoinList(mesProduceStatisticsDetail);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出生产完成明细列表
|
||||
*/
|
||||
@RequiresPermissions("mes:produceStatisticsDetail:export")
|
||||
@Log(title = "生产完成明细", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, MesProduceStatisticsDetail mesProduceStatisticsDetail)
|
||||
{
|
||||
List<MesProduceStatisticsDetail> list = mesProduceStatisticsDetailService.selectMesProduceStatisticsDetailList(mesProduceStatisticsDetail);
|
||||
ExcelUtil<MesProduceStatisticsDetail> util = new ExcelUtil<MesProduceStatisticsDetail>(MesProduceStatisticsDetail.class);
|
||||
util.exportExcel(response, list, "生产完成明细数据");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取生产完成明细详细信息
|
||||
*/
|
||||
@RequiresPermissions("mes:produceStatisticsDetail:query")
|
||||
@GetMapping(value = "/{statisticsDetailId}")
|
||||
public AjaxResult getInfo(@PathVariable("statisticsDetailId") Long statisticsDetailId)
|
||||
{
|
||||
return success(mesProduceStatisticsDetailService.selectMesProduceStatisticsDetailByStatisticsDetailId(statisticsDetailId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增生产完成明细
|
||||
*/
|
||||
@RequiresPermissions("mes:produceStatisticsDetail:add")
|
||||
@Log(title = "生产完成明细", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody MesProduceStatisticsDetail mesProduceStatisticsDetail)
|
||||
{
|
||||
return toAjax(mesProduceStatisticsDetailService.insertMesProduceStatisticsDetail(mesProduceStatisticsDetail));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改生产完成明细
|
||||
*/
|
||||
@RequiresPermissions("mes:produceStatisticsDetail:edit")
|
||||
@Log(title = "生产完成明细", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody MesProduceStatisticsDetail mesProduceStatisticsDetail)
|
||||
{
|
||||
return toAjax(mesProduceStatisticsDetailService.updateMesProduceStatisticsDetail(mesProduceStatisticsDetail));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除生产完成明细
|
||||
*/
|
||||
@RequiresPermissions("mes:produceStatisticsDetail:remove")
|
||||
@Log(title = "生产完成明细", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{statisticsDetailIds}")
|
||||
public AjaxResult remove(@PathVariable Long[] statisticsDetailIds)
|
||||
{
|
||||
return toAjax(mesProduceStatisticsDetailService.deleteMesProduceStatisticsDetailByStatisticsDetailIds(statisticsDetailIds));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,69 @@
|
||||
package com.hw.mes.service;
|
||||
|
||||
import java.util.List;
|
||||
import com.hw.mes.domain.MesProduceStatisticsDetail;
|
||||
|
||||
/**
|
||||
* 生产完成明细Service接口
|
||||
*
|
||||
* @author xins
|
||||
* @date 2024-11-26
|
||||
*/
|
||||
public interface IMesProduceStatisticsDetailService
|
||||
{
|
||||
/**
|
||||
* 查询生产完成明细
|
||||
*
|
||||
* @param statisticsDetailId 生产完成明细主键
|
||||
* @return 生产完成明细
|
||||
*/
|
||||
public MesProduceStatisticsDetail selectMesProduceStatisticsDetailByStatisticsDetailId(Long statisticsDetailId);
|
||||
|
||||
/**
|
||||
* 查询生产完成明细列表
|
||||
*
|
||||
* @param mesProduceStatisticsDetail 生产完成明细
|
||||
* @return 生产完成明细集合
|
||||
*/
|
||||
public List<MesProduceStatisticsDetail> selectMesProduceStatisticsDetailList(MesProduceStatisticsDetail mesProduceStatisticsDetail);
|
||||
|
||||
/**
|
||||
* 查询生产完成明细列表,join material,process
|
||||
*
|
||||
* @param mesProduceStatisticsDetail 生产完成明细
|
||||
* @return 生产完成明细
|
||||
*/
|
||||
public List<MesProduceStatisticsDetail> selectMesProduceStatisticsDetailJoinList(MesProduceStatisticsDetail mesProduceStatisticsDetail);
|
||||
|
||||
/**
|
||||
* 新增生产完成明细
|
||||
*
|
||||
* @param mesProduceStatisticsDetail 生产完成明细
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertMesProduceStatisticsDetail(MesProduceStatisticsDetail mesProduceStatisticsDetail);
|
||||
|
||||
/**
|
||||
* 修改生产完成明细
|
||||
*
|
||||
* @param mesProduceStatisticsDetail 生产完成明细
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateMesProduceStatisticsDetail(MesProduceStatisticsDetail mesProduceStatisticsDetail);
|
||||
|
||||
/**
|
||||
* 批量删除生产完成明细
|
||||
*
|
||||
* @param statisticsDetailIds 需要删除的生产完成明细主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteMesProduceStatisticsDetailByStatisticsDetailIds(Long[] statisticsDetailIds);
|
||||
|
||||
/**
|
||||
* 删除生产完成明细信息
|
||||
*
|
||||
* @param statisticsDetailId 生产完成明细主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteMesProduceStatisticsDetailByStatisticsDetailId(Long statisticsDetailId);
|
||||
}
|
||||
@ -0,0 +1,107 @@
|
||||
package com.hw.mes.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
import com.hw.common.core.utils.DateUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.hw.mes.mapper.MesProduceStatisticsDetailMapper;
|
||||
import com.hw.mes.domain.MesProduceStatisticsDetail;
|
||||
import com.hw.mes.service.IMesProduceStatisticsDetailService;
|
||||
|
||||
/**
|
||||
* 生产完成明细Service业务层处理
|
||||
*
|
||||
* @author xins
|
||||
* @date 2024-11-26
|
||||
*/
|
||||
@Service
|
||||
public class MesProduceStatisticsDetailServiceImpl implements IMesProduceStatisticsDetailService
|
||||
{
|
||||
@Autowired
|
||||
private MesProduceStatisticsDetailMapper mesProduceStatisticsDetailMapper;
|
||||
|
||||
/**
|
||||
* 查询生产完成明细
|
||||
*
|
||||
* @param statisticsDetailId 生产完成明细主键
|
||||
* @return 生产完成明细
|
||||
*/
|
||||
@Override
|
||||
public MesProduceStatisticsDetail selectMesProduceStatisticsDetailByStatisticsDetailId(Long statisticsDetailId)
|
||||
{
|
||||
return mesProduceStatisticsDetailMapper.selectMesProduceStatisticsDetailByStatisticsDetailId(statisticsDetailId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询生产完成明细列表
|
||||
*
|
||||
* @param mesProduceStatisticsDetail 生产完成明细
|
||||
* @return 生产完成明细
|
||||
*/
|
||||
@Override
|
||||
public List<MesProduceStatisticsDetail> selectMesProduceStatisticsDetailList(MesProduceStatisticsDetail mesProduceStatisticsDetail)
|
||||
{
|
||||
return mesProduceStatisticsDetailMapper.selectMesProduceStatisticsDetailList(mesProduceStatisticsDetail);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询生产完成明细列表,join material,process
|
||||
*
|
||||
* @param mesProduceStatisticsDetail 生产完成明细
|
||||
* @return 生产完成明细
|
||||
*/
|
||||
@Override
|
||||
public List<MesProduceStatisticsDetail> selectMesProduceStatisticsDetailJoinList(MesProduceStatisticsDetail mesProduceStatisticsDetail)
|
||||
{
|
||||
return mesProduceStatisticsDetailMapper.selectMesProduceStatisticsDetailJoinList(mesProduceStatisticsDetail);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增生产完成明细
|
||||
*
|
||||
* @param mesProduceStatisticsDetail 生产完成明细
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int insertMesProduceStatisticsDetail(MesProduceStatisticsDetail mesProduceStatisticsDetail)
|
||||
{
|
||||
mesProduceStatisticsDetail.setCreateTime(DateUtils.getNowDate());
|
||||
return mesProduceStatisticsDetailMapper.insertMesProduceStatisticsDetail(mesProduceStatisticsDetail);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改生产完成明细
|
||||
*
|
||||
* @param mesProduceStatisticsDetail 生产完成明细
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int updateMesProduceStatisticsDetail(MesProduceStatisticsDetail mesProduceStatisticsDetail)
|
||||
{
|
||||
return mesProduceStatisticsDetailMapper.updateMesProduceStatisticsDetail(mesProduceStatisticsDetail);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除生产完成明细
|
||||
*
|
||||
* @param statisticsDetailIds 需要删除的生产完成明细主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteMesProduceStatisticsDetailByStatisticsDetailIds(Long[] statisticsDetailIds)
|
||||
{
|
||||
return mesProduceStatisticsDetailMapper.deleteMesProduceStatisticsDetailByStatisticsDetailIds(statisticsDetailIds);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除生产完成明细信息
|
||||
*
|
||||
* @param statisticsDetailId 生产完成明细主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteMesProduceStatisticsDetailByStatisticsDetailId(Long statisticsDetailId)
|
||||
{
|
||||
return mesProduceStatisticsDetailMapper.deleteMesProduceStatisticsDetailByStatisticsDetailId(statisticsDetailId);
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue