change - 工资结算加系数、工序信息
yinq
1 year ago
parent
b154069c9d
commit
644cddc469
@ -0,0 +1,100 @@
|
||||
package com.os.mes.base.controller;
|
||||
|
||||
import java.util.List;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
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.os.common.annotation.Log;
|
||||
import com.os.common.core.controller.BaseController;
|
||||
import com.os.common.core.domain.AjaxResult;
|
||||
import com.os.common.enums.BusinessType;
|
||||
import com.os.mes.base.domain.BaseProcessInfo;
|
||||
import com.os.mes.base.service.IBaseProcessInfoService;
|
||||
import com.os.common.utils.poi.ExcelUtil;
|
||||
import com.os.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 工序信息Controller
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2024-05-23
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/mes/base/processInfo")
|
||||
public class BaseProcessInfoController extends BaseController {
|
||||
@Autowired
|
||||
private IBaseProcessInfoService baseProcessInfoService;
|
||||
|
||||
/**
|
||||
* 查询工序信息列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('mes/base:processInfo:list')")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(BaseProcessInfo baseProcessInfo) {
|
||||
startPage();
|
||||
List<BaseProcessInfo> list = baseProcessInfoService.selectBaseProcessInfoList(baseProcessInfo);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出工序信息列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('mes/base:processInfo:export')")
|
||||
@Log(title = "工序信息", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, BaseProcessInfo baseProcessInfo) {
|
||||
List<BaseProcessInfo> list = baseProcessInfoService.selectBaseProcessInfoList(baseProcessInfo);
|
||||
ExcelUtil<BaseProcessInfo> util = new ExcelUtil<BaseProcessInfo>(BaseProcessInfo.class);
|
||||
util.exportExcel(response, list, "工序信息数据");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取工序信息详细信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('mes/base:processInfo:query')")
|
||||
@GetMapping(value = "/{objId}")
|
||||
public AjaxResult getInfo(@PathVariable("objId") Long objId) {
|
||||
return success(baseProcessInfoService.selectBaseProcessInfoByObjId(objId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增工序信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('mes/base:processInfo:add')")
|
||||
@Log(title = "工序信息", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody BaseProcessInfo baseProcessInfo) {
|
||||
baseProcessInfo.setCreateBy(getUsername());
|
||||
return toAjax(baseProcessInfoService.insertBaseProcessInfo(baseProcessInfo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改工序信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('mes/base:processInfo:edit')")
|
||||
@Log(title = "工序信息", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody BaseProcessInfo baseProcessInfo) {
|
||||
baseProcessInfo.setUpdateBy(getUsername());
|
||||
return toAjax(baseProcessInfoService.updateBaseProcessInfo(baseProcessInfo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除工序信息
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('mes/base:processInfo:remove')")
|
||||
@Log(title = "工序信息", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{objIds}")
|
||||
public AjaxResult remove(@PathVariable Long[] objIds) {
|
||||
return toAjax(baseProcessInfoService.deleteBaseProcessInfoByObjIds(objIds));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
package com.os.mes.base.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import com.os.mes.base.domain.BaseProcessInfo;
|
||||
|
||||
/**
|
||||
* 工序信息Mapper接口
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2024-05-23
|
||||
*/
|
||||
public interface BaseProcessInfoMapper
|
||||
{
|
||||
/**
|
||||
* 查询工序信息
|
||||
*
|
||||
* @param objId 工序信息主键
|
||||
* @return 工序信息
|
||||
*/
|
||||
public BaseProcessInfo selectBaseProcessInfoByObjId(Long objId);
|
||||
|
||||
/**
|
||||
* 查询工序信息列表
|
||||
*
|
||||
* @param baseProcessInfo 工序信息
|
||||
* @return 工序信息集合
|
||||
*/
|
||||
public List<BaseProcessInfo> selectBaseProcessInfoList(BaseProcessInfo baseProcessInfo);
|
||||
|
||||
/**
|
||||
* 新增工序信息
|
||||
*
|
||||
* @param baseProcessInfo 工序信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertBaseProcessInfo(BaseProcessInfo baseProcessInfo);
|
||||
|
||||
/**
|
||||
* 修改工序信息
|
||||
*
|
||||
* @param baseProcessInfo 工序信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateBaseProcessInfo(BaseProcessInfo baseProcessInfo);
|
||||
|
||||
/**
|
||||
* 删除工序信息
|
||||
*
|
||||
* @param objId 工序信息主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteBaseProcessInfoByObjId(Long objId);
|
||||
|
||||
/**
|
||||
* 批量删除工序信息
|
||||
*
|
||||
* @param objIds 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteBaseProcessInfoByObjIds(Long[] objIds);
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
package com.os.mes.base.service;
|
||||
|
||||
import java.util.List;
|
||||
import com.os.mes.base.domain.BaseProcessInfo;
|
||||
|
||||
/**
|
||||
* 工序信息Service接口
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2024-05-23
|
||||
*/
|
||||
public interface IBaseProcessInfoService
|
||||
{
|
||||
/**
|
||||
* 查询工序信息
|
||||
*
|
||||
* @param objId 工序信息主键
|
||||
* @return 工序信息
|
||||
*/
|
||||
public BaseProcessInfo selectBaseProcessInfoByObjId(Long objId);
|
||||
|
||||
/**
|
||||
* 查询工序信息列表
|
||||
*
|
||||
* @param baseProcessInfo 工序信息
|
||||
* @return 工序信息集合
|
||||
*/
|
||||
public List<BaseProcessInfo> selectBaseProcessInfoList(BaseProcessInfo baseProcessInfo);
|
||||
|
||||
/**
|
||||
* 新增工序信息
|
||||
*
|
||||
* @param baseProcessInfo 工序信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertBaseProcessInfo(BaseProcessInfo baseProcessInfo);
|
||||
|
||||
/**
|
||||
* 修改工序信息
|
||||
*
|
||||
* @param baseProcessInfo 工序信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateBaseProcessInfo(BaseProcessInfo baseProcessInfo);
|
||||
|
||||
/**
|
||||
* 批量删除工序信息
|
||||
*
|
||||
* @param objIds 需要删除的工序信息主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteBaseProcessInfoByObjIds(Long[] objIds);
|
||||
|
||||
/**
|
||||
* 删除工序信息信息
|
||||
*
|
||||
* @param objId 工序信息主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteBaseProcessInfoByObjId(Long objId);
|
||||
}
|
||||
@ -0,0 +1,121 @@
|
||||
package com.os.mes.base.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import com.os.common.utils.DateUtils;
|
||||
import com.os.common.utils.StringUtils;
|
||||
import com.os.mes.base.domain.BaseProductLine;
|
||||
import com.os.mes.base.mapper.BaseProductLineMapper;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.os.mes.base.mapper.BaseProcessInfoMapper;
|
||||
import com.os.mes.base.domain.BaseProcessInfo;
|
||||
import com.os.mes.base.service.IBaseProcessInfoService;
|
||||
|
||||
/**
|
||||
* 工序信息Service业务层处理
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2024-05-23
|
||||
*/
|
||||
@Service
|
||||
public class BaseProcessInfoServiceImpl implements IBaseProcessInfoService {
|
||||
@Autowired
|
||||
private BaseProcessInfoMapper baseProcessInfoMapper;
|
||||
|
||||
@Autowired
|
||||
private BaseProductLineMapper baseProductLineMapper;
|
||||
|
||||
/**
|
||||
* 查询工序信息
|
||||
*
|
||||
* @param objId 工序信息主键
|
||||
* @return 工序信息
|
||||
*/
|
||||
@Override
|
||||
public BaseProcessInfo selectBaseProcessInfoByObjId(Long objId) {
|
||||
return baseProcessInfoMapper.selectBaseProcessInfoByObjId(objId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询工序信息列表
|
||||
*
|
||||
* @param baseProcessInfo 工序信息
|
||||
* @return 工序信息
|
||||
*/
|
||||
@Override
|
||||
public List<BaseProcessInfo> selectBaseProcessInfoList(BaseProcessInfo baseProcessInfo) {
|
||||
List<BaseProcessInfo> processList = baseProcessInfoMapper.selectBaseProcessInfoList(baseProcessInfo);
|
||||
BaseProductLine productLine = new BaseProductLine();
|
||||
productLine.setProductLineType("2");
|
||||
List<BaseProductLine> stationList = baseProductLineMapper.selectBaseProductLineList(productLine);
|
||||
for (BaseProcessInfo processInfo : processList) {
|
||||
String stationCodes = processInfo.getStationCodes();
|
||||
if (StringUtils.isEmpty(stationCodes)) {
|
||||
continue;
|
||||
}
|
||||
String[] stationCodeList = stationCodes.split(",");
|
||||
for (String stationCode : stationCodeList) {
|
||||
List<BaseProductLine> baseProductLines = stationList.stream().filter(e -> Objects.equals(e.getProductLineCode(), stationCode)).collect(Collectors.toList());
|
||||
if (baseProductLines.size() > 0) {
|
||||
String productLineName = baseProductLines.get(0).getProductLineName();
|
||||
if (StringUtils.isEmpty(processInfo.getStationNames())) {
|
||||
processInfo.setStationNames(productLineName);
|
||||
} else {
|
||||
processInfo.setStationNames(processInfo.getStationNames() + "," + productLineName);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return processList;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增工序信息
|
||||
*
|
||||
* @param baseProcessInfo 工序信息
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int insertBaseProcessInfo(BaseProcessInfo baseProcessInfo) {
|
||||
baseProcessInfo.setCreateTime(DateUtils.getNowDate());
|
||||
return baseProcessInfoMapper.insertBaseProcessInfo(baseProcessInfo);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改工序信息
|
||||
*
|
||||
* @param baseProcessInfo 工序信息
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int updateBaseProcessInfo(BaseProcessInfo baseProcessInfo) {
|
||||
baseProcessInfo.setUpdateTime(DateUtils.getNowDate());
|
||||
return baseProcessInfoMapper.updateBaseProcessInfo(baseProcessInfo);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除工序信息
|
||||
*
|
||||
* @param objIds 需要删除的工序信息主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteBaseProcessInfoByObjIds(Long[] objIds) {
|
||||
return baseProcessInfoMapper.deleteBaseProcessInfoByObjIds(objIds);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除工序信息信息
|
||||
*
|
||||
* @param objId 工序信息主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteBaseProcessInfoByObjId(Long objId) {
|
||||
return baseProcessInfoMapper.deleteBaseProcessInfoByObjId(objId);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,134 @@
|
||||
<?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.os.mes.base.mapper.BaseProcessInfoMapper">
|
||||
|
||||
<resultMap type="BaseProcessInfo" id="BaseProcessInfoResult">
|
||||
<result property="objId" column="obj_id"/>
|
||||
<result property="processCode" column="process_code"/>
|
||||
<result property="processName" column="process_name"/>
|
||||
<result property="processType" column="process_type"/>
|
||||
<result property="productLineCode" column="product_line_code"/>
|
||||
<result property="stationCodes" column="station_codes"/>
|
||||
<result property="capacityDay" column="capacity_day"/>
|
||||
<result property="capacityMonth" column="capacity_month"/>
|
||||
<result property="isFlag" column="is_flag"/>
|
||||
<result property="createBy" column="create_by"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
<result property="updateBy" column="update_by"/>
|
||||
<result property="updateTime" column="update_time"/>
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectBaseProcessInfoVo">
|
||||
select bpi.obj_id,
|
||||
bpi.process_code,
|
||||
bpi.process_name,
|
||||
bpi.process_type,
|
||||
bpi.product_line_code,
|
||||
bpi.station_codes,
|
||||
bpi.capacity_day,
|
||||
bpi.capacity_month,
|
||||
bpi.is_flag,
|
||||
bpi.create_by,
|
||||
bpi.create_time,
|
||||
bpi.update_by,
|
||||
bpi.update_time
|
||||
from base_process_info bpi
|
||||
</sql>
|
||||
<!--SELECT ST.process_code,
|
||||
ST.station_code,
|
||||
PL.product_line_name AS station_name
|
||||
FROM (
|
||||
SELECT process_code,
|
||||
value station_code
|
||||
FROM base_process_info
|
||||
CROSS APPLY STRING_SPLIT(station_codes, ',')
|
||||
) ST
|
||||
LEFT JOIN base_product_line PL ON PL.PRODUCT_LINE_CODE = ST.station_code-->
|
||||
<select id="selectBaseProcessInfoList" parameterType="BaseProcessInfo" resultMap="BaseProcessInfoResult">
|
||||
<include refid="selectBaseProcessInfoVo"/>
|
||||
<where>
|
||||
<if test="processCode != null and processCode != ''">and bpi.process_code = #{processCode}</if>
|
||||
<if test="processName != null and processName != ''">and bpi.process_name like concat('%', #{processName},
|
||||
'%')
|
||||
</if>
|
||||
<if test="processType != null and processType != ''">and bpi.process_type = #{processType}</if>
|
||||
<if test="productLineCode != null and productLineCode != ''">and bpi.product_line_code = #{productLineCode}
|
||||
</if>
|
||||
<if test="stationCodes != null and stationCodes != ''">and bpi.station_codes = #{stationCodes}</if>
|
||||
<if test="capacityDay != null ">and bpi.capacity_day = #{capacityDay}</if>
|
||||
<if test="capacityMonth != null ">and bpi.capacity_month = #{capacityMonth}</if>
|
||||
<if test="isFlag != null and isFlag != ''">and bpi.is_flag = #{isFlag}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectBaseProcessInfoByObjId" parameterType="Long" resultMap="BaseProcessInfoResult">
|
||||
<include refid="selectBaseProcessInfoVo"/>
|
||||
where bpi.obj_id = #{objId}
|
||||
</select>
|
||||
|
||||
<insert id="insertBaseProcessInfo" parameterType="BaseProcessInfo" useGeneratedKeys="true" keyProperty="objId">
|
||||
insert into base_process_info
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="processCode != null">process_code,</if>
|
||||
<if test="processName != null">process_name,</if>
|
||||
<if test="processType != null">process_type,</if>
|
||||
<if test="productLineCode != null">product_line_code,</if>
|
||||
<if test="stationCodes != null">station_codes,</if>
|
||||
<if test="capacityDay != null">capacity_day,</if>
|
||||
<if test="capacityMonth != null">capacity_month,</if>
|
||||
<if test="isFlag != null">is_flag,</if>
|
||||
<if test="createBy != null">create_by,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
<if test="updateBy != null">update_by,</if>
|
||||
<if test="updateTime != null">update_time,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="processCode != null">#{processCode},</if>
|
||||
<if test="processName != null">#{processName},</if>
|
||||
<if test="processType != null">#{processType},</if>
|
||||
<if test="productLineCode != null">#{productLineCode},</if>
|
||||
<if test="stationCodes != null">#{stationCodes},</if>
|
||||
<if test="capacityDay != null">#{capacityDay},</if>
|
||||
<if test="capacityMonth != null">#{capacityMonth},</if>
|
||||
<if test="isFlag != null">#{isFlag},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
<if test="updateBy != null">#{updateBy},</if>
|
||||
<if test="updateTime != null">#{updateTime},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateBaseProcessInfo" parameterType="BaseProcessInfo">
|
||||
update base_process_info
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="processCode != null">process_code = #{processCode},</if>
|
||||
<if test="processName != null">process_name = #{processName},</if>
|
||||
<if test="processType != null">process_type = #{processType},</if>
|
||||
<if test="productLineCode != null">product_line_code = #{productLineCode},</if>
|
||||
<if test="stationCodes != null">station_codes = #{stationCodes},</if>
|
||||
<if test="capacityDay != null">capacity_day = #{capacityDay},</if>
|
||||
<if test="capacityMonth != null">capacity_month = #{capacityMonth},</if>
|
||||
<if test="isFlag != null">is_flag = #{isFlag},</if>
|
||||
<if test="createBy != null">create_by = #{createBy},</if>
|
||||
<if test="createTime != null">create_time = #{createTime},</if>
|
||||
<if test="updateBy != null">update_by = #{updateBy},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
</trim>
|
||||
where obj_id = #{objId}
|
||||
</update>
|
||||
|
||||
<delete id="deleteBaseProcessInfoByObjId" parameterType="Long">
|
||||
delete
|
||||
from base_process_info
|
||||
where obj_id = #{objId}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteBaseProcessInfoByObjIds" parameterType="String">
|
||||
delete from base_process_info where obj_id in
|
||||
<foreach item="objId" collection="array" open="(" separator="," close=")">
|
||||
#{objId}
|
||||
</foreach>
|
||||
</delete>
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue