2.4.2
WMS:库位增加层的搜索条件，权限修改 MES:打印托盘码功能；打印原材料条码功能（根据原材料条码模板），每个原材料条码只能打印一次，可以重新生成原材料条码master
parent
9450afa74c
commit
f001200d1d
@ -1 +1 @@
|
||||
com.hw.mes.api.factory.RemoteMesFallbackFactory
|
||||
com.hw.printer.api.factory.RemotePrinterFallbackFactory
|
||||
|
||||
@ -0,0 +1,67 @@
|
||||
package com.hw.mes.domain;
|
||||
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
import com.hw.common.core.annotation.Excel;
|
||||
import com.hw.common.core.web.domain.BaseEntity;
|
||||
|
||||
/**
|
||||
* 废弃条码信息对象 mes_base_abandon_barcode
|
||||
*
|
||||
* @author xins
|
||||
* @date 2024-06-21
|
||||
*/
|
||||
public class MesBaseAbandonBarcode extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 主键标识 */
|
||||
private Long anandonBarcodeId;
|
||||
|
||||
/** 物料条码ID */
|
||||
@Excel(name = "物料条码ID")
|
||||
private Long barcodeId;
|
||||
|
||||
/** 废弃条码信息 */
|
||||
@Excel(name = "废弃条码信息")
|
||||
private String abandonBarcode;
|
||||
|
||||
public void setAnandonBarcodeId(Long anandonBarcodeId)
|
||||
{
|
||||
this.anandonBarcodeId = anandonBarcodeId;
|
||||
}
|
||||
|
||||
public Long getAnandonBarcodeId()
|
||||
{
|
||||
return anandonBarcodeId;
|
||||
}
|
||||
public void setBarcodeId(Long barcodeId)
|
||||
{
|
||||
this.barcodeId = barcodeId;
|
||||
}
|
||||
|
||||
public Long getBarcodeId()
|
||||
{
|
||||
return barcodeId;
|
||||
}
|
||||
public void setAbandonBarcode(String abandonBarcode)
|
||||
{
|
||||
this.abandonBarcode = abandonBarcode;
|
||||
}
|
||||
|
||||
public String getAbandonBarcode()
|
||||
{
|
||||
return abandonBarcode;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("anandonBarcodeId", getAnandonBarcodeId())
|
||||
.append("barcodeId", getBarcodeId())
|
||||
.append("abandonBarcode", getAbandonBarcode())
|
||||
.append("updateBy", getUpdateBy())
|
||||
.append("updateTime", getUpdateTime())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
package com.hw.mes.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import com.hw.mes.domain.MesBaseAbandonBarcode;
|
||||
|
||||
/**
|
||||
* 废弃条码信息Mapper接口
|
||||
*
|
||||
* @author xins
|
||||
* @date 2024-06-21
|
||||
*/
|
||||
public interface MesBaseAbandonBarcodeMapper
|
||||
{
|
||||
/**
|
||||
* 查询废弃条码信息
|
||||
*
|
||||
* @param anandonBarcodeId 废弃条码信息主键
|
||||
* @return 废弃条码信息
|
||||
*/
|
||||
public MesBaseAbandonBarcode selectMesBaseAbandonBarcodeByAnandonBarcodeId(Long anandonBarcodeId);
|
||||
|
||||
/**
|
||||
* 查询废弃条码信息列表
|
||||
*
|
||||
* @param mesBaseAbandonBarcode 废弃条码信息
|
||||
* @return 废弃条码信息集合
|
||||
*/
|
||||
public List<MesBaseAbandonBarcode> selectMesBaseAbandonBarcodeList(MesBaseAbandonBarcode mesBaseAbandonBarcode);
|
||||
|
||||
/**
|
||||
* 新增废弃条码信息
|
||||
*
|
||||
* @param mesBaseAbandonBarcode 废弃条码信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertMesBaseAbandonBarcode(MesBaseAbandonBarcode mesBaseAbandonBarcode);
|
||||
|
||||
/**
|
||||
* 修改废弃条码信息
|
||||
*
|
||||
* @param mesBaseAbandonBarcode 废弃条码信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateMesBaseAbandonBarcode(MesBaseAbandonBarcode mesBaseAbandonBarcode);
|
||||
|
||||
/**
|
||||
* 删除废弃条码信息
|
||||
*
|
||||
* @param anandonBarcodeId 废弃条码信息主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteMesBaseAbandonBarcodeByAnandonBarcodeId(Long anandonBarcodeId);
|
||||
|
||||
/**
|
||||
* 批量删除废弃条码信息
|
||||
*
|
||||
* @param anandonBarcodeIds 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteMesBaseAbandonBarcodeByAnandonBarcodeIds(Long[] anandonBarcodeIds);
|
||||
}
|
||||
@ -0,0 +1,69 @@
|
||||
<?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.hw.mes.mapper.MesBaseAbandonBarcodeMapper">
|
||||
|
||||
<resultMap type="MesBaseAbandonBarcode" id="MesBaseAbandonBarcodeResult">
|
||||
<result property="anandonBarcodeId" column="anandon_barcode_id" />
|
||||
<result property="barcodeId" column="barcode_id" />
|
||||
<result property="abandonBarcode" column="abandon_barcode" />
|
||||
<result property="updateBy" column="update_by" />
|
||||
<result property="updateTime" column="update_time" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectMesBaseAbandonBarcodeVo">
|
||||
select anandon_barcode_id, barcode_id, abandon_barcode, update_by, update_time from mes_base_abandon_barcode
|
||||
</sql>
|
||||
|
||||
<select id="selectMesBaseAbandonBarcodeList" parameterType="MesBaseAbandonBarcode" resultMap="MesBaseAbandonBarcodeResult">
|
||||
<include refid="selectMesBaseAbandonBarcodeVo"/>
|
||||
<where>
|
||||
<if test="barcodeId != null "> and barcode_id = #{barcodeId}</if>
|
||||
<if test="abandonBarcode != null and abandonBarcode != ''"> and abandon_barcode = #{abandonBarcode}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectMesBaseAbandonBarcodeByAnandonBarcodeId" parameterType="Long" resultMap="MesBaseAbandonBarcodeResult">
|
||||
<include refid="selectMesBaseAbandonBarcodeVo"/>
|
||||
where anandon_barcode_id = #{anandonBarcodeId}
|
||||
</select>
|
||||
|
||||
<insert id="insertMesBaseAbandonBarcode" parameterType="MesBaseAbandonBarcode" useGeneratedKeys="true" keyProperty="anandonBarcodeId">
|
||||
insert into mes_base_abandon_barcode
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="barcodeId != null">barcode_id,</if>
|
||||
<if test="abandonBarcode != null and abandonBarcode != ''">abandon_barcode,</if>
|
||||
<if test="updateBy != null">update_by,</if>
|
||||
<if test="updateTime != null">update_time,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="barcodeId != null">#{barcodeId},</if>
|
||||
<if test="abandonBarcode != null and abandonBarcode != ''">#{abandonBarcode},</if>
|
||||
<if test="updateBy != null">#{updateBy},</if>
|
||||
<if test="updateTime != null">#{updateTime},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateMesBaseAbandonBarcode" parameterType="MesBaseAbandonBarcode">
|
||||
update mes_base_abandon_barcode
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="barcodeId != null">barcode_id = #{barcodeId},</if>
|
||||
<if test="abandonBarcode != null and abandonBarcode != ''">abandon_barcode = #{abandonBarcode},</if>
|
||||
<if test="updateBy != null">update_by = #{updateBy},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
</trim>
|
||||
where anandon_barcode_id = #{anandonBarcodeId}
|
||||
</update>
|
||||
|
||||
<delete id="deleteMesBaseAbandonBarcodeByAnandonBarcodeId" parameterType="Long">
|
||||
delete from mes_base_abandon_barcode where anandon_barcode_id = #{anandonBarcodeId}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteMesBaseAbandonBarcodeByAnandonBarcodeIds" parameterType="String">
|
||||
delete from mes_base_abandon_barcode where anandon_barcode_id in
|
||||
<foreach item="anandonBarcodeId" collection="array" open="(" separator="," close=")">
|
||||
#{anandonBarcodeId}
|
||||
</foreach>
|
||||
</delete>
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue