3.1.4:
-车间4楼装配：生成成品码和配对码逻辑完善
-车间5楼拆分：
可根据多个成品码生成原材料条码（适用于4楼到5楼生产的拆分后的柜体）；
外部采购的根据合并的虚拟物料进行申请领取柜体。
-PDA5楼组装出库：支持多个成品条码合并一个原材料条码的组装出库，不能重复组装出库，但每个四楼的成品都需要生成一条明细
-车间5楼装配：申请领料，外部采购柜体合并的根据虚拟bom进行领料
master
parent
3174142b61
commit
68bf18d502
@ -0,0 +1,88 @@
|
|||||||
|
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_bind_barcode
|
||||||
|
*
|
||||||
|
* @author Open Platform
|
||||||
|
* @date 2024-09-25
|
||||||
|
*/
|
||||||
|
public class MesBaseBindBarcode extends BaseEntity
|
||||||
|
{
|
||||||
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
|
/** 主键 */
|
||||||
|
private Long bindBarcodeId;
|
||||||
|
|
||||||
|
/** 条码ID */
|
||||||
|
@Excel(name = "条码ID")
|
||||||
|
private Long barcodeId;
|
||||||
|
|
||||||
|
private String barcodeInfo;
|
||||||
|
|
||||||
|
private Long saleOrderId;
|
||||||
|
|
||||||
|
/** 绑定的条码内容 */
|
||||||
|
@Excel(name = "绑定的条码内容")
|
||||||
|
private String bindBarcode;
|
||||||
|
|
||||||
|
public void setBindBarcodeId(Long bindBarcodeId)
|
||||||
|
{
|
||||||
|
this.bindBarcodeId = bindBarcodeId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Long getBindBarcodeId()
|
||||||
|
{
|
||||||
|
return bindBarcodeId;
|
||||||
|
}
|
||||||
|
public void setBarcodeId(Long barcodeId)
|
||||||
|
{
|
||||||
|
this.barcodeId = barcodeId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Long getBarcodeId()
|
||||||
|
{
|
||||||
|
return barcodeId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getBarcodeInfo() {
|
||||||
|
return barcodeInfo;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setBarcodeInfo(String barcodeInfo) {
|
||||||
|
this.barcodeInfo = barcodeInfo;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Long getSaleOrderId() {
|
||||||
|
return saleOrderId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setSaleOrderId(Long saleOrderId) {
|
||||||
|
this.saleOrderId = saleOrderId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setBindBarcode(String bindBarcode)
|
||||||
|
{
|
||||||
|
this.bindBarcode = bindBarcode;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getBindBarcode()
|
||||||
|
{
|
||||||
|
return bindBarcode;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||||
|
.append("bindBarcodeId", getBindBarcodeId())
|
||||||
|
.append("barcodeId", getBarcodeId())
|
||||||
|
.append("bindBarcode", getBindBarcode())
|
||||||
|
.append("createBy", getCreateBy())
|
||||||
|
.append("createTime", getCreateTime())
|
||||||
|
.toString();
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,78 @@
|
|||||||
|
package com.hw.mes.mapper;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import com.hw.mes.domain.MesBaseBindBarcode;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 绑定条码Mapper接口
|
||||||
|
*
|
||||||
|
* @author xins
|
||||||
|
* @date 2024-09-25
|
||||||
|
*/
|
||||||
|
public interface MesBaseBindBarcodeMapper
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* 查询绑定条码
|
||||||
|
*
|
||||||
|
* @param bindBarcodeId 绑定条码主键
|
||||||
|
* @return 绑定条码
|
||||||
|
*/
|
||||||
|
public MesBaseBindBarcode selectMesBaseBindBarcodeByBindBarcodeId(Long bindBarcodeId);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询绑定条码列表
|
||||||
|
*
|
||||||
|
* @param mesBaseBindBarcode 绑定条码
|
||||||
|
* @return 绑定条码集合
|
||||||
|
*/
|
||||||
|
public List<MesBaseBindBarcode> selectMesBaseBindBarcodeList(MesBaseBindBarcode mesBaseBindBarcode);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 新增绑定条码
|
||||||
|
*
|
||||||
|
* @param mesBaseBindBarcode 绑定条码
|
||||||
|
* @return 结果
|
||||||
|
*/
|
||||||
|
public int insertMesBaseBindBarcode(MesBaseBindBarcode mesBaseBindBarcode);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 修改绑定条码
|
||||||
|
*
|
||||||
|
* @param mesBaseBindBarcode 绑定条码
|
||||||
|
* @return 结果
|
||||||
|
*/
|
||||||
|
public int updateMesBaseBindBarcode(MesBaseBindBarcode mesBaseBindBarcode);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 删除绑定条码
|
||||||
|
*
|
||||||
|
* @param bindBarcodeId 绑定条码主键
|
||||||
|
* @return 结果
|
||||||
|
*/
|
||||||
|
public int deleteMesBaseBindBarcodeByBindBarcodeId(Long bindBarcodeId);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 批量删除绑定条码
|
||||||
|
*
|
||||||
|
* @param bindBarcodeIds 需要删除的数据主键集合
|
||||||
|
* @return 结果
|
||||||
|
*/
|
||||||
|
public int deleteMesBaseBindBarcodeByBindBarcodeIds(Long[] bindBarcodeIds);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 批量新增绑定条码
|
||||||
|
*
|
||||||
|
* @param mesBaseBindBarcodeList 绑定条码列表
|
||||||
|
* @return 结果
|
||||||
|
*/
|
||||||
|
public int batchMesBaseBindBarcode(List<MesBaseBindBarcode> mesBaseBindBarcodeList);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询绑定条码
|
||||||
|
*
|
||||||
|
* @param bindBarcode 绑定条码信息
|
||||||
|
* @return 绑定条码
|
||||||
|
*/
|
||||||
|
public MesBaseBindBarcode selectMesBaseBindBarcodeByBindBarcode(String bindBarcode);
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,89 @@
|
|||||||
|
<?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.MesBaseBindBarcodeMapper">
|
||||||
|
|
||||||
|
<resultMap type="MesBaseBindBarcode" id="MesBaseBindBarcodeResult">
|
||||||
|
<result property="bindBarcodeId" column="bind_barcode_id" />
|
||||||
|
<result property="barcodeId" column="barcode_id" />
|
||||||
|
<result property="barcodeInfo" column="barcode_info" />
|
||||||
|
<result property="saleOrderId" column="sale_order_id" />
|
||||||
|
<result property="bindBarcode" column="bind_barcode" />
|
||||||
|
<result property="createBy" column="create_by" />
|
||||||
|
<result property="createTime" column="create_time" />
|
||||||
|
</resultMap>
|
||||||
|
|
||||||
|
<sql id="selectMesBaseBindBarcodeVo">
|
||||||
|
select bind_barcode_id, barcode_id,barcode_info, sale_order_id,bind_barcode, create_by, create_time from mes_base_bind_barcode
|
||||||
|
</sql>
|
||||||
|
|
||||||
|
<select id="selectMesBaseBindBarcodeList" parameterType="MesBaseBindBarcode" resultMap="MesBaseBindBarcodeResult">
|
||||||
|
<include refid="selectMesBaseBindBarcodeVo"/>
|
||||||
|
<where>
|
||||||
|
<if test="barcodeId != null "> and barcode_id = #{barcodeId}</if>
|
||||||
|
<if test="bindBarcode != null and bindBarcode != ''"> and bind_barcode = #{bindBarcode}</if>
|
||||||
|
</where>
|
||||||
|
</select>
|
||||||
|
|
||||||
|
<select id="selectMesBaseBindBarcodeByBindBarcodeId" parameterType="Long" resultMap="MesBaseBindBarcodeResult">
|
||||||
|
<include refid="selectMesBaseBindBarcodeVo"/>
|
||||||
|
where bind_barcode_id = #{bindBarcodeId}
|
||||||
|
</select>
|
||||||
|
|
||||||
|
<insert id="insertMesBaseBindBarcode" parameterType="MesBaseBindBarcode" useGeneratedKeys="true" keyProperty="bindBarcodeId">
|
||||||
|
insert into mes_base_bind_barcode
|
||||||
|
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||||
|
<if test="barcodeId != null">barcode_id,</if>
|
||||||
|
<if test="barcodeInfo != null">barcode_info,</if>
|
||||||
|
<if test="saleOrderId != null">sale_order_id,</if>
|
||||||
|
<if test="bindBarcode != null and bindBarcode != ''">bind_barcode,</if>
|
||||||
|
<if test="createBy != null">create_by,</if>
|
||||||
|
<if test="createTime != null">create_time,</if>
|
||||||
|
</trim>
|
||||||
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||||
|
<if test="barcodeId != null">#{barcodeId},</if>
|
||||||
|
<if test="barcodeInfo != null">#{barcodeInfo},</if>
|
||||||
|
<if test="saleOrderId != null">#{saleOrderId},</if>
|
||||||
|
<if test="bindBarcode != null and bindBarcode != ''">#{bindBarcode},</if>
|
||||||
|
<if test="createBy != null">#{createBy},</if>
|
||||||
|
<if test="createTime != null">#{createTime},</if>
|
||||||
|
</trim>
|
||||||
|
</insert>
|
||||||
|
|
||||||
|
<update id="updateMesBaseBindBarcode" parameterType="MesBaseBindBarcode">
|
||||||
|
update mes_base_bind_barcode
|
||||||
|
<trim prefix="SET" suffixOverrides=",">
|
||||||
|
<if test="barcodeId != null">barcode_id = #{barcodeId},</if>
|
||||||
|
<if test="bindBarcode != null and bindBarcode != ''">bind_barcode = #{bindBarcode},</if>
|
||||||
|
<if test="createBy != null">create_by = #{createBy},</if>
|
||||||
|
<if test="createTime != null">create_time = #{createTime},</if>
|
||||||
|
</trim>
|
||||||
|
where bind_barcode_id = #{bindBarcodeId}
|
||||||
|
</update>
|
||||||
|
|
||||||
|
<delete id="deleteMesBaseBindBarcodeByBindBarcodeId" parameterType="Long">
|
||||||
|
delete from mes_base_bind_barcode where bind_barcode_id = #{bindBarcodeId}
|
||||||
|
</delete>
|
||||||
|
|
||||||
|
<delete id="deleteMesBaseBindBarcodeByBindBarcodeIds" parameterType="String">
|
||||||
|
delete from mes_base_bind_barcode where bind_barcode_id in
|
||||||
|
<foreach item="bindBarcodeId" collection="array" open="(" separator="," close=")">
|
||||||
|
#{bindBarcodeId}
|
||||||
|
</foreach>
|
||||||
|
</delete>
|
||||||
|
|
||||||
|
|
||||||
|
<insert id="batchMesBaseBindBarcode">
|
||||||
|
insert into mes_base_bind_barcode( bind_barcode_id, barcode_id, barcode_info, sale_order_id,bind_barcode, create_by, create_time) values
|
||||||
|
<foreach item="item" index="index" collection="list" separator=",">
|
||||||
|
( #{item.bindBarcodeId}, #{item.barcodeId},#{item.barcodeInfo}, #{item.saleOrderId}, #{item.bindBarcode}, #{item.createBy}, #{item.createTime})
|
||||||
|
</foreach>
|
||||||
|
</insert>
|
||||||
|
|
||||||
|
|
||||||
|
<select id="selectMesBaseBindBarcodeByBindBarcode" parameterType="String" resultMap="MesBaseBindBarcodeResult">
|
||||||
|
<include refid="selectMesBaseBindBarcodeVo"/>
|
||||||
|
where bind_barcode = #{bindBarcode} limit 1
|
||||||
|
</select>
|
||||||
|
</mapper>
|
||||||
Loading…
Reference in New Issue