Merge remote-tracking branch 'origin/master'

This commit is contained in:
Stang 2024-11-11 17:40:19 +08:00
commit 58b0206406
6 changed files with 578 additions and 0 deletions

View File

@ -0,0 +1,104 @@
package com.ktg.mes.md.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.ktg.common.annotation.Log;
import com.ktg.common.core.controller.BaseController;
import com.ktg.common.core.domain.AjaxResult;
import com.ktg.common.enums.BusinessType;
import com.ktg.mes.md.domain.WmsInventoryConfigure;
import com.ktg.mes.md.service.IWmsInventoryConfigureService;
import com.ktg.common.utils.poi.ExcelUtil;
import com.ktg.common.core.page.TableDataInfo;
/**
* 盘点计划配置Controller
*
* @author yinjinlu
* @date 2024-11-11
*/
@RestController
@RequestMapping("/md/CONFIGURE")
public class WmsInventoryConfigureController extends BaseController
{
@Autowired
private IWmsInventoryConfigureService wmsInventoryConfigureService;
/**
* 查询盘点计划配置列表
*/
@PreAuthorize("@ss.hasPermi('md:CONFIGURE:list')")
@GetMapping("/list")
public TableDataInfo list(WmsInventoryConfigure wmsInventoryConfigure)
{
startPage();
List<WmsInventoryConfigure> list = wmsInventoryConfigureService.selectWmsInventoryConfigureList(wmsInventoryConfigure);
return getDataTable(list);
}
/**
* 导出盘点计划配置列表
*/
@PreAuthorize("@ss.hasPermi('md:CONFIGURE:export')")
@Log(title = "盘点计划配置", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, WmsInventoryConfigure wmsInventoryConfigure)
{
List<WmsInventoryConfigure> list = wmsInventoryConfigureService.selectWmsInventoryConfigureList(wmsInventoryConfigure);
ExcelUtil<WmsInventoryConfigure> util = new ExcelUtil<WmsInventoryConfigure>(WmsInventoryConfigure.class);
util.exportExcel(response, list, "盘点计划配置数据");
}
/**
* 获取盘点计划配置详细信息
*/
@PreAuthorize("@ss.hasPermi('md:CONFIGURE:query')")
@GetMapping(value = "/{wmsInventoryConfigureId}")
public AjaxResult getInfo(@PathVariable("wmsInventoryConfigureId") Long wmsInventoryConfigureId)
{
return AjaxResult.success(wmsInventoryConfigureService.selectWmsInventoryConfigureByWmsInventoryConfigureId(wmsInventoryConfigureId));
}
/**
* 新增盘点计划配置
*/
@PreAuthorize("@ss.hasPermi('md:CONFIGURE:add')")
@Log(title = "盘点计划配置", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody WmsInventoryConfigure wmsInventoryConfigure)
{
return toAjax(wmsInventoryConfigureService.insertWmsInventoryConfigure(wmsInventoryConfigure));
}
/**
* 修改盘点计划配置
*/
@PreAuthorize("@ss.hasPermi('md:CONFIGURE:edit')")
@Log(title = "盘点计划配置", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody WmsInventoryConfigure wmsInventoryConfigure)
{
return toAjax(wmsInventoryConfigureService.updateWmsInventoryConfigure(wmsInventoryConfigure));
}
/**
* 删除盘点计划配置
*/
@PreAuthorize("@ss.hasPermi('md:CONFIGURE:remove')")
@Log(title = "盘点计划配置", businessType = BusinessType.DELETE)
@DeleteMapping("/{wmsInventoryConfigureIds}")
public AjaxResult remove(@PathVariable Long[] wmsInventoryConfigureIds)
{
return toAjax(wmsInventoryConfigureService.deleteWmsInventoryConfigureByWmsInventoryConfigureIds(wmsInventoryConfigureIds));
}
}

View File

@ -0,0 +1,149 @@
package com.ktg.mes.md.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ktg.common.annotation.Excel;
import com.ktg.common.core.domain.BaseEntity;
/**
* 盘点计划配置对象 WMS_INVENTORY_CONFIGURE
*
* @author yinjinlu
* @date 2024-11-11
*/
public class WmsInventoryConfigure extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键 */
private Long wmsInventoryConfigureId;
/** 配置名称 */
@Excel(name = "配置名称")
private String configureName;
/** 盘点类型 */
@Excel(name = "盘点类型")
private String dataType;
/** 盘点形式 */
@Excel(name = "盘点形式")
private String inventoryType;
/** 盘点仓库 */
@Excel(name = "盘点仓库")
private Long mWarehouseId;
/** 预留字段1 */
private String attr1;
/** 预留字段2 */
private String attr2;
/** 预留字段3 */
private String attr3;
/** 预留字段4 */
private String attr4;
public void setWmsInventoryConfigureId(Long wmsInventoryConfigureId)
{
this.wmsInventoryConfigureId = wmsInventoryConfigureId;
}
public Long getWmsInventoryConfigureId()
{
return wmsInventoryConfigureId;
}
public void setConfigureName(String configureName)
{
this.configureName = configureName;
}
public String getConfigureName()
{
return configureName;
}
public void setDataType(String dataType)
{
this.dataType = dataType;
}
public String getDataType()
{
return dataType;
}
public void setInventoryType(String inventoryType)
{
this.inventoryType = inventoryType;
}
public String getInventoryType()
{
return inventoryType;
}
public void setmWarehouseId(Long mWarehouseId)
{
this.mWarehouseId = mWarehouseId;
}
public Long getmWarehouseId()
{
return mWarehouseId;
}
public void setAttr1(String attr1)
{
this.attr1 = attr1;
}
public String getAttr1()
{
return attr1;
}
public void setAttr2(String attr2)
{
this.attr2 = attr2;
}
public String getAttr2()
{
return attr2;
}
public void setAttr3(String attr3)
{
this.attr3 = attr3;
}
public String getAttr3()
{
return attr3;
}
public void setAttr4(String attr4)
{
this.attr4 = attr4;
}
public String getAttr4()
{
return attr4;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("wmsInventoryConfigureId", getWmsInventoryConfigureId())
.append("configureName", getConfigureName())
.append("dataType", getDataType())
.append("inventoryType", getInventoryType())
.append("mWarehouseId", getmWarehouseId())
.append("attr1", getAttr1())
.append("attr2", getAttr2())
.append("attr3", getAttr3())
.append("attr4", getAttr4())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.toString();
}
}

View File

@ -0,0 +1,61 @@
package com.ktg.mes.md.mapper;
import java.util.List;
import com.ktg.mes.md.domain.WmsInventoryConfigure;
/**
* 盘点计划配置Mapper接口
*
* @author yinjinlu
* @date 2024-11-11
*/
public interface WmsInventoryConfigureMapper
{
/**
* 查询盘点计划配置
*
* @param wmsInventoryConfigureId 盘点计划配置主键
* @return 盘点计划配置
*/
public WmsInventoryConfigure selectWmsInventoryConfigureByWmsInventoryConfigureId(Long wmsInventoryConfigureId);
/**
* 查询盘点计划配置列表
*
* @param wmsInventoryConfigure 盘点计划配置
* @return 盘点计划配置集合
*/
public List<WmsInventoryConfigure> selectWmsInventoryConfigureList(WmsInventoryConfigure wmsInventoryConfigure);
/**
* 新增盘点计划配置
*
* @param wmsInventoryConfigure 盘点计划配置
* @return 结果
*/
public int insertWmsInventoryConfigure(WmsInventoryConfigure wmsInventoryConfigure);
/**
* 修改盘点计划配置
*
* @param wmsInventoryConfigure 盘点计划配置
* @return 结果
*/
public int updateWmsInventoryConfigure(WmsInventoryConfigure wmsInventoryConfigure);
/**
* 删除盘点计划配置
*
* @param wmsInventoryConfigureId 盘点计划配置主键
* @return 结果
*/
public int deleteWmsInventoryConfigureByWmsInventoryConfigureId(Long wmsInventoryConfigureId);
/**
* 批量删除盘点计划配置
*
* @param wmsInventoryConfigureIds 需要删除的数据主键集合
* @return 结果
*/
public int deleteWmsInventoryConfigureByWmsInventoryConfigureIds(Long[] wmsInventoryConfigureIds);
}

View File

@ -0,0 +1,61 @@
package com.ktg.mes.md.service;
import java.util.List;
import com.ktg.mes.md.domain.WmsInventoryConfigure;
/**
* 盘点计划配置Service接口
*
* @author yinjinlu
* @date 2024-11-11
*/
public interface IWmsInventoryConfigureService
{
/**
* 查询盘点计划配置
*
* @param wmsInventoryConfigureId 盘点计划配置主键
* @return 盘点计划配置
*/
public WmsInventoryConfigure selectWmsInventoryConfigureByWmsInventoryConfigureId(Long wmsInventoryConfigureId);
/**
* 查询盘点计划配置列表
*
* @param wmsInventoryConfigure 盘点计划配置
* @return 盘点计划配置集合
*/
public List<WmsInventoryConfigure> selectWmsInventoryConfigureList(WmsInventoryConfigure wmsInventoryConfigure);
/**
* 新增盘点计划配置
*
* @param wmsInventoryConfigure 盘点计划配置
* @return 结果
*/
public int insertWmsInventoryConfigure(WmsInventoryConfigure wmsInventoryConfigure);
/**
* 修改盘点计划配置
*
* @param wmsInventoryConfigure 盘点计划配置
* @return 结果
*/
public int updateWmsInventoryConfigure(WmsInventoryConfigure wmsInventoryConfigure);
/**
* 批量删除盘点计划配置
*
* @param wmsInventoryConfigureIds 需要删除的盘点计划配置主键集合
* @return 结果
*/
public int deleteWmsInventoryConfigureByWmsInventoryConfigureIds(Long[] wmsInventoryConfigureIds);
/**
* 删除盘点计划配置信息
*
* @param wmsInventoryConfigureId 盘点计划配置主键
* @return 结果
*/
public int deleteWmsInventoryConfigureByWmsInventoryConfigureId(Long wmsInventoryConfigureId);
}

View File

@ -0,0 +1,96 @@
package com.ktg.mes.md.service.impl;
import java.util.List;
import com.ktg.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ktg.mes.md.mapper.WmsInventoryConfigureMapper;
import com.ktg.mes.md.domain.WmsInventoryConfigure;
import com.ktg.mes.md.service.IWmsInventoryConfigureService;
/**
* 盘点计划配置Service业务层处理
*
* @author yinjinlu
* @date 2024-11-11
*/
@Service
public class WmsInventoryConfigureServiceImpl implements IWmsInventoryConfigureService
{
@Autowired
private WmsInventoryConfigureMapper wmsInventoryConfigureMapper;
/**
* 查询盘点计划配置
*
* @param wmsInventoryConfigureId 盘点计划配置主键
* @return 盘点计划配置
*/
@Override
public WmsInventoryConfigure selectWmsInventoryConfigureByWmsInventoryConfigureId(Long wmsInventoryConfigureId)
{
return wmsInventoryConfigureMapper.selectWmsInventoryConfigureByWmsInventoryConfigureId(wmsInventoryConfigureId);
}
/**
* 查询盘点计划配置列表
*
* @param wmsInventoryConfigure 盘点计划配置
* @return 盘点计划配置
*/
@Override
public List<WmsInventoryConfigure> selectWmsInventoryConfigureList(WmsInventoryConfigure wmsInventoryConfigure)
{
return wmsInventoryConfigureMapper.selectWmsInventoryConfigureList(wmsInventoryConfigure);
}
/**
* 新增盘点计划配置
*
* @param wmsInventoryConfigure 盘点计划配置
* @return 结果
*/
@Override
public int insertWmsInventoryConfigure(WmsInventoryConfigure wmsInventoryConfigure)
{
wmsInventoryConfigure.setCreateTime(DateUtils.getNowDate());
return wmsInventoryConfigureMapper.insertWmsInventoryConfigure(wmsInventoryConfigure);
}
/**
* 修改盘点计划配置
*
* @param wmsInventoryConfigure 盘点计划配置
* @return 结果
*/
@Override
public int updateWmsInventoryConfigure(WmsInventoryConfigure wmsInventoryConfigure)
{
wmsInventoryConfigure.setUpdateTime(DateUtils.getNowDate());
return wmsInventoryConfigureMapper.updateWmsInventoryConfigure(wmsInventoryConfigure);
}
/**
* 批量删除盘点计划配置
*
* @param wmsInventoryConfigureIds 需要删除的盘点计划配置主键
* @return 结果
*/
@Override
public int deleteWmsInventoryConfigureByWmsInventoryConfigureIds(Long[] wmsInventoryConfigureIds)
{
return wmsInventoryConfigureMapper.deleteWmsInventoryConfigureByWmsInventoryConfigureIds(wmsInventoryConfigureIds);
}
/**
* 删除盘点计划配置信息
*
* @param wmsInventoryConfigureId 盘点计划配置主键
* @return 结果
*/
@Override
public int deleteWmsInventoryConfigureByWmsInventoryConfigureId(Long wmsInventoryConfigureId)
{
return wmsInventoryConfigureMapper.deleteWmsInventoryConfigureByWmsInventoryConfigureId(wmsInventoryConfigureId);
}
}

View File

@ -0,0 +1,107 @@
<?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.ktg.mes.md.mapper.WmsInventoryConfigureMapper">
<resultMap type="WmsInventoryConfigure" id="WmsInventoryConfigureResult">
<result property="wmsInventoryConfigureId" column="WMS_INVENTORY_CONFIGURE_ID" />
<result property="configureName" column="CONFIGURE_NAME" />
<result property="dataType" column="DATA_TYPE" />
<result property="inventoryType" column="INVENTORY_TYPE" />
<result property="mWarehouseId" column="M_WAREHOUSE_ID" />
<result property="attr1" column="ATTR1" />
<result property="attr2" column="ATTR2" />
<result property="attr3" column="ATTR3" />
<result property="attr4" column="ATTR4" />
<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="selectWmsInventoryConfigureVo">
select WMS_INVENTORY_CONFIGURE_ID, CONFIGURE_NAME, DATA_TYPE, INVENTORY_TYPE, M_WAREHOUSE_ID, ATTR1, ATTR2, ATTR3, ATTR4, CREATE_BY, CREATE_TIME, UPDATE_BY, UPDATE_TIME from WMS_INVENTORY_CONFIGURE
</sql>
<select id="selectWmsInventoryConfigureList" parameterType="WmsInventoryConfigure" resultMap="WmsInventoryConfigureResult">
<include refid="selectWmsInventoryConfigureVo"/>
<where>
<if test="configureName != null and configureName != ''"> and CONFIGURE_NAME like concat('%', #{configureName}, '%')</if>
<if test="dataType != null and dataType != ''"> and DATA_TYPE = #{dataType}</if>
<if test="inventoryType != null and inventoryType != ''"> and INVENTORY_TYPE = #{inventoryType}</if>
<if test="mWarehouseId != null "> and M_WAREHOUSE_ID = #{mWarehouseId}</if>
<if test="createBy != null and createBy != ''"> and CREATE_BY = #{createBy}</if>
<if test="createTime != null "> and CREATE_TIME = #{createTime}</if>
<if test="updateBy != null and updateBy != ''"> and UPDATE_BY = #{updateBy}</if>
<if test="updateTime != null "> and UPDATE_TIME = #{updateTime}</if>
</where>
</select>
<select id="selectWmsInventoryConfigureByWmsInventoryConfigureId" parameterType="Long" resultMap="WmsInventoryConfigureResult">
<include refid="selectWmsInventoryConfigureVo"/>
where WMS_INVENTORY_CONFIGURE_ID = #{wmsInventoryConfigureId}
</select>
<insert id="insertWmsInventoryConfigure" parameterType="WmsInventoryConfigure" useGeneratedKeys="true" keyProperty="wmsInventoryConfigureId">
insert into WMS_INVENTORY_CONFIGURE
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="configureName != null and configureName != ''">CONFIGURE_NAME,</if>
<if test="dataType != null and dataType != ''">DATA_TYPE,</if>
<if test="inventoryType != null and inventoryType != ''">INVENTORY_TYPE,</if>
<if test="mWarehouseId != null">M_WAREHOUSE_ID,</if>
<if test="attr1 != null">ATTR1,</if>
<if test="attr2 != null">ATTR2,</if>
<if test="attr3 != null">ATTR3,</if>
<if test="attr4 != null">ATTR4,</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="configureName != null and configureName != ''">#{configureName},</if>
<if test="dataType != null and dataType != ''">#{dataType},</if>
<if test="inventoryType != null and inventoryType != ''">#{inventoryType},</if>
<if test="mWarehouseId != null">#{mWarehouseId},</if>
<if test="attr1 != null">#{attr1},</if>
<if test="attr2 != null">#{attr2},</if>
<if test="attr3 != null">#{attr3},</if>
<if test="attr4 != null">#{attr4},</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="updateWmsInventoryConfigure" parameterType="WmsInventoryConfigure">
update WMS_INVENTORY_CONFIGURE
<trim prefix="SET" suffixOverrides=",">
<if test="configureName != null and configureName != ''">CONFIGURE_NAME = #{configureName},</if>
<if test="dataType != null and dataType != ''">DATA_TYPE = #{dataType},</if>
<if test="inventoryType != null and inventoryType != ''">INVENTORY_TYPE = #{inventoryType},</if>
<if test="mWarehouseId != null">M_WAREHOUSE_ID = #{mWarehouseId},</if>
<if test="attr1 != null">ATTR1 = #{attr1},</if>
<if test="attr2 != null">ATTR2 = #{attr2},</if>
<if test="attr3 != null">ATTR3 = #{attr3},</if>
<if test="attr4 != null">ATTR4 = #{attr4},</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 WMS_INVENTORY_CONFIGURE_ID = #{wmsInventoryConfigureId}
</update>
<delete id="deleteWmsInventoryConfigureByWmsInventoryConfigureId" parameterType="Long">
delete from WMS_INVENTORY_CONFIGURE where WMS_INVENTORY_CONFIGURE_ID = #{wmsInventoryConfigureId}
</delete>
<delete id="deleteWmsInventoryConfigureByWmsInventoryConfigureIds" parameterType="String">
delete from WMS_INVENTORY_CONFIGURE where WMS_INVENTORY_CONFIGURE_ID in
<foreach item="wmsInventoryConfigureId" collection="array" open="(" separator="," close=")">
#{wmsInventoryConfigureId}
</foreach>
</delete>
</mapper>