root
/
smart-erp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

[fix] 

品质管理 品质单
新增品质单关联出货设备对象；
新增品质单关联出货设备service、mapper；
dev
王晓迪 4 days ago
parent
c6f9ff4c2d
commit
f2f82c0ce6
5 changed files with 662 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 247
      ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityShippingDevice.java
  2. 82
      ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityShippingDeviceMapper.java
  3. 75
      ruoyi-admin/src/main/java/com/ruoyi/quality/service/IQualityShippingDeviceService.java
  4. 118
      ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityShippingDeviceServiceImpl.java
  5. 140
      ruoyi-admin/src/main/resources/mapper/quality/QualityShippingDeviceMapper.xml

247
ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityShippingDevice.java
View File

@ -0,0 +1,247 @@
package com.ruoyi.quality.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 品质单关联出货设备对象 quality_shipping_device
*
* @author ruoyi
* @date 2024-11-18
*/
public class QualityShippingDevice extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 出货设备编号 */
private Long shippingDeviceCode;
/** 出货设备id */
@Excel(name = "出货设备id")
private String shippingDeviceId;
/** 品质单号 */
@Excel(name = "品质单号")
private String qualityOrderCode;
/** 关联销售订单号 */
@Excel(name = "关联销售订单号")
private String salesOrderCode;
/** 关联生产订单号 */
@Excel(name = "关联生产订单号")
private String makeNo;
/** 料号 */
@Excel(name = "料号")
private String materialNo;
/** 物料名称 */
@Excel(name = "物料名称")
private String materialName;
/** 物料类型 */
@Excel(name = "物料类型")
private String materialType;
/** 物料单位 */
@Excel(name = "物料单位")
private String materialUnit;
/** 品牌 */
@Excel(name = "品牌")
private String materialBrand;
/** 描述 */
@Excel(name = "描述")
private String materialDescribe;
/** 物料型号 */
@Excel(name = "物料型号")
private String materialModelCode;
/** 设备型号 */
@Excel(name = "设备型号")
private String deviceModelCode;
/** 追踪码 */
@Excel(name = "追踪码")
private String deviceRunningNumber;
/** 品质状态 */
@Excel(name = "品质状态")
private String qualityStatus;
/** 品质审核状态（0未提交，1审核通过，2审核拒绝，3已提交待审核） */
@Excel(name = "品质审核状态")
private String qualityAuditStatus;
public void setShippingDeviceCode(Long shippingDeviceCode)
{
this.shippingDeviceCode = shippingDeviceCode;
}
public Long getShippingDeviceCode()
{
return shippingDeviceCode;
}
public void setShippingDeviceId(String shippingDeviceId)
{
this.shippingDeviceId = shippingDeviceId;
}
public String getShippingDeviceId()
{
return shippingDeviceId;
}
public void setQualityOrderCode(String qualityOrderCode)
{
this.qualityOrderCode = qualityOrderCode;
}
public String getQualityOrderCode()
{
return qualityOrderCode;
}
public void setSalesOrderCode(String salesOrderCode)
{
this.salesOrderCode = salesOrderCode;
}
public String getSalesOrderCode()
{
return salesOrderCode;
}
public void setMakeNo(String makeNo)
{
this.makeNo = makeNo;
}
public String getMakeNo()
{
return makeNo;
}
public void setMaterialNo(String materialNo)
{
this.materialNo = materialNo;
}
public String getMaterialNo()
{
return materialNo;
}
public void setMaterialName(String materialName)
{
this.materialName = materialName;
}
public String getMaterialName()
{
return materialName;
}
public void setMaterialType(String materialType)
{
this.materialType = materialType;
}
public String getMaterialType()
{
return materialType;
}
public void setMaterialUnit(String materialUnit)
{
this.materialUnit = materialUnit;
}
public String getMaterialUnit()
{
return materialUnit;
}
public void setMaterialBrand(String materialBrand)
{
this.materialBrand = materialBrand;
}
public String getMaterialBrand()
{
return materialBrand;
}
public void setMaterialDescribe(String materialDescribe)
{
this.materialDescribe = materialDescribe;
}
public String getMaterialDescribe()
{
return materialDescribe;
}
public void setMaterialModelCode(String materialModelCode)
{
this.materialModelCode = materialModelCode;
}
public String getMaterialModelCode()
{
return materialModelCode;
}
public void setDeviceModelCode(String deviceModelCode)
{
this.deviceModelCode = deviceModelCode;
}
public String getDeviceModelCode()
{
return deviceModelCode;
}
public void setDeviceRunningNumber(String deviceRunningNumber)
{
this.deviceRunningNumber = deviceRunningNumber;
}
public String getDeviceRunningNumber()
{
return deviceRunningNumber;
}
public void setQualityStatus(String qualityStatus)
{
this.qualityStatus = qualityStatus;
}
public String getQualityStatus()
{
return qualityStatus;
}
public void setQualityAuditStatus(String qualityAuditStatus)
{
this.qualityAuditStatus = qualityAuditStatus;
}
public String getQualityAuditStatus()
{
return qualityAuditStatus;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("shippingDeviceCode", getShippingDeviceCode())
.append("shippingDeviceId", getShippingDeviceId())
.append("qualityOrderCode", getQualityOrderCode())
.append("salesOrderCode", getSalesOrderCode())
.append("makeNo", getMakeNo())
.append("materialNo", getMaterialNo())
.append("materialName", getMaterialName())
.append("materialType", getMaterialType())
.append("materialUnit", getMaterialUnit())
.append("materialBrand", getMaterialBrand())
.append("materialDescribe", getMaterialDescribe())
.append("materialModelCode", getMaterialModelCode())
.append("deviceModelCode", getDeviceModelCode())
.append("deviceRunningNumber", getDeviceRunningNumber())
.append("qualityStatus", getQualityStatus())
.append("qualityAuditStatus", getQualityAuditStatus())
.toString();
}
}

82
ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityShippingDeviceMapper.java
View File

@ -0,0 +1,82 @@
package com.ruoyi.quality.mapper;
import java.util.List;
import com.ruoyi.quality.domain.QualityShippingDevice;
/**
* 品质单关联出货设备Mapper接口
*
* @author ruoyi
* @date 2024-11-18
*/
public interface QualityShippingDeviceMapper
{
/**
* 查询品质单关联出货设备
*
* @param shippingDeviceCode 品质单关联出货设备ID
* @return 品质单关联出货设备
*/
public QualityShippingDevice selectQualityShippingDeviceById(Long shippingDeviceCode);
/**
* 查询品质单关联出货设备
*/
public QualityShippingDevice selectQualityShippingDeviceByDeviceId(String shippingDeviceId);
/**
* 查询品质单关联出货设备列表
*
* @param qualityShippingDevice 品质单关联出货设备
* @return 品质单关联出货设备集合
*/
public List<QualityShippingDevice> selectQualityShippingDeviceList(QualityShippingDevice qualityShippingDevice);
/**
* 新增品质单关联出货设备
*
* @param qualityShippingDevice 品质单关联出货设备
* @return 结果
*/
public int insertQualityShippingDevice(QualityShippingDevice qualityShippingDevice);
/**
* 修改品质单关联出货设备
*
* @param qualityShippingDevice 品质单关联出货设备
* @return 结果
*/
public int updateQualityShippingDevice(QualityShippingDevice qualityShippingDevice);
/**
* 删除品质单关联出货设备
*
* @param shippingDeviceCode 品质单关联出货设备ID
* @return 结果
*/
public int deleteQualityShippingDeviceById(Long shippingDeviceCode);
/**
* 批量删除品质单关联出货设备
*
* @param shippingDeviceCodes 需要删除的数据ID
* @return 结果
*/
public int deleteQualityShippingDeviceByIds(String[] shippingDeviceCodes);
/**
* 作废品质单关联出货设备
*
* @param shippingDeviceCode 品质单关联出货设备ID
* @return 结果
*/
public int cancelQualityShippingDeviceById(Long shippingDeviceCode);
/**
* 恢复品质单关联出货设备
*
* @param shippingDeviceCode 品质单关联出货设备ID
* @return 结果
*/
public int restoreQualityShippingDeviceById(Long shippingDeviceCode);
}

75
ruoyi-admin/src/main/java/com/ruoyi/quality/service/IQualityShippingDeviceService.java
View File

@ -0,0 +1,75 @@
package com.ruoyi.quality.service;
import java.util.List;
import com.ruoyi.quality.domain.QualityShippingDevice;
/**
* 品质单关联出货设备Service接口
*
* @author ruoyi
* @date 2024-11-18
*/
public interface IQualityShippingDeviceService
{
/**
* 查询品质单关联出货设备
*
* @param shippingDeviceCode 品质单关联出货设备ID
* @return 品质单关联出货设备
*/
public QualityShippingDevice selectQualityShippingDeviceById(Long shippingDeviceCode);
/**
* 查询品质单关联出货设备列表
*
* @param qualityShippingDevice 品质单关联出货设备
* @return 品质单关联出货设备集合
*/
public List<QualityShippingDevice> selectQualityShippingDeviceList(QualityShippingDevice qualityShippingDevice);
/**
* 新增品质单关联出货设备
*
* @param qualityShippingDevice 品质单关联出货设备
* @return 结果
*/
public int insertQualityShippingDevice(QualityShippingDevice qualityShippingDevice);
/**
* 修改品质单关联出货设备
*
* @param qualityShippingDevice 品质单关联出货设备
* @return 结果
*/
public int updateQualityShippingDevice(QualityShippingDevice qualityShippingDevice);
/**
* 批量删除品质单关联出货设备
*
* @param ids 需要删除的数据ID
* @return 结果
*/
public int deleteQualityShippingDeviceByIds(String ids);
/**
* 删除品质单关联出货设备信息
*
* @param shippingDeviceCode 品质单关联出货设备ID
* @return 结果
*/
public int deleteQualityShippingDeviceById(Long shippingDeviceCode);
/**
* 作废品质单关联出货设备
* @param shippingDeviceCode 品质单关联出货设备ID
* @return
*/
int cancelQualityShippingDeviceById(Long shippingDeviceCode);
/**
* 恢复品质单关联出货设备
* @param shippingDeviceCode 品质单关联出货设备ID
* @return
*/
int restoreQualityShippingDeviceById(Long shippingDeviceCode);
}

118
ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityShippingDeviceServiceImpl.java
View File

@ -0,0 +1,118 @@
package com.ruoyi.quality.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.quality.mapper.QualityShippingDeviceMapper;
import com.ruoyi.quality.domain.QualityShippingDevice;
import com.ruoyi.quality.service.IQualityShippingDeviceService;
import com.ruoyi.common.core.text.Convert;
/**
* 品质单关联出货设备Service业务层处理
*
* @author ruoyi
* @date 2024-11-18
*/
@Service
public class QualityShippingDeviceServiceImpl implements IQualityShippingDeviceService
{
@Autowired
private QualityShippingDeviceMapper qualityShippingDeviceMapper;
/**
* 查询品质单关联出货设备
*
* @param shippingDeviceCode 品质单关联出货设备ID
* @return 品质单关联出货设备
*/
@Override
public QualityShippingDevice selectQualityShippingDeviceById(Long shippingDeviceCode)
{
return qualityShippingDeviceMapper.selectQualityShippingDeviceById(shippingDeviceCode);
}
/**
* 查询品质单关联出货设备列表
*
* @param qualityShippingDevice 品质单关联出货设备
* @return 品质单关联出货设备
*/
@Override
public List<QualityShippingDevice> selectQualityShippingDeviceList(QualityShippingDevice qualityShippingDevice)
{
return qualityShippingDeviceMapper.selectQualityShippingDeviceList(qualityShippingDevice);
}
/**
* 新增品质单关联出货设备
*
* @param qualityShippingDevice 品质单关联出货设备
* @return 结果
*/
@Override
public int insertQualityShippingDevice(QualityShippingDevice qualityShippingDevice)
{
return qualityShippingDeviceMapper.insertQualityShippingDevice(qualityShippingDevice);
}
/**
* 修改品质单关联出货设备
*
* @param qualityShippingDevice 品质单关联出货设备
* @return 结果
*/
@Override
public int updateQualityShippingDevice(QualityShippingDevice qualityShippingDevice)
{
return qualityShippingDeviceMapper.updateQualityShippingDevice(qualityShippingDevice);
}
/**
* 删除品质单关联出货设备对象
*
* @param ids 需要删除的数据ID
* @return 结果
*/
@Override
public int deleteQualityShippingDeviceByIds(String ids)
{
return qualityShippingDeviceMapper.deleteQualityShippingDeviceByIds(Convert.toStrArray(ids));
}
/**
* 删除品质单关联出货设备信息
*
* @param shippingDeviceCode 品质单关联出货设备ID
* @return 结果
*/
@Override
public int deleteQualityShippingDeviceById(Long shippingDeviceCode)
{
return qualityShippingDeviceMapper.deleteQualityShippingDeviceById(shippingDeviceCode);
}
/**
* 作废品质单关联出货设备
*
* @param shippingDeviceCode 品质单关联出货设备ID
* @return 结果
*/
@Override
public int cancelQualityShippingDeviceById(Long shippingDeviceCode)
{
return qualityShippingDeviceMapper.cancelQualityShippingDeviceById(shippingDeviceCode);
}
/**
* 恢复品质单关联出货设备信息
*
* @param shippingDeviceCode 品质单关联出货设备ID
* @return 结果
*/
@Override
public int restoreQualityShippingDeviceById(Long shippingDeviceCode)
{
return qualityShippingDeviceMapper.restoreQualityShippingDeviceById(shippingDeviceCode);
}
}

140
ruoyi-admin/src/main/resources/mapper/quality/QualityShippingDeviceMapper.xml
View File

@ -0,0 +1,140 @@
<?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.ruoyi.quality.mapper.QualityShippingDeviceMapper">
<resultMap type="QualityShippingDevice" id="QualityShippingDeviceResult">
<result property="shippingDeviceCode" column="shipping_device_code" />
<result property="shippingDeviceId" column="shipping_device_id" />
<result property="qualityOrderCode" column="quality_order_code" />
<result property="salesOrderCode" column="sales_order_code" />
<result property="makeNo" column="make_no" />
<result property="materialNo" column="material_no" />
<result property="materialName" column="material_name" />
<result property="materialType" column="material_type" />
<result property="materialUnit" column="material_unit" />
<result property="materialBrand" column="material_brand" />
<result property="materialDescribe" column="material_describe" />
<result property="materialModelCode" column="material_model_code" />
<result property="deviceModelCode" column="device_model_code" />
<result property="deviceRunningNumber" column="device_running_number" />
<result property="qualityStatus" column="quality_status" />
<result property="qualityAuditStatus" column="quality_audit_status" />
</resultMap>
<sql id="selectQualityShippingDeviceVo">
select shipping_device_code, shipping_device_id, quality_order_code, sales_order_code, make_no, material_no, material_name, material_type, material_unit, material_brand, material_describe, material_model_code, device_model_code, device_running_number, quality_status, quality_audit_status from quality_shipping_device
</sql>
<select id="selectQualityShippingDeviceList" parameterType="QualityShippingDevice" resultMap="QualityShippingDeviceResult">
<include refid="selectQualityShippingDeviceVo"/>
<where>
<if test="shippingDeviceId != null and shippingDeviceId != ''"> and shipping_device_id = #{shippingDeviceId}</if>
<if test="qualityOrderCode != null and qualityOrderCode != ''"> and quality_order_code = #{qualityOrderCode}</if>
<if test="salesOrderCode != null and salesOrderCode != ''"> and sales_order_code = #{salesOrderCode}</if>
<if test="makeNo != null and makeNo != ''"> and make_no = #{makeNo}</if>
<if test="materialNo != null and materialNo != ''"> and material_no = #{materialNo}</if>
<if test="materialName != null and materialName != ''"> and material_name like concat('%', #{materialName}, '%')</if>
<if test="materialType != null and materialType != ''"> and material_type = #{materialType}</if>
<if test="materialUnit != null and materialUnit != ''"> and material_unit = #{materialUnit}</if>
<if test="materialBrand != null and materialBrand != ''"> and material_brand = #{materialBrand}</if>
<if test="materialDescribe != null and materialDescribe != ''"> and material_describe = #{materialDescribe}</if>
<if test="materialModelCode != null and materialModelCode != ''"> and material_model_code = #{materialModelCode}</if>
<if test="deviceModelCode != null and deviceModelCode != ''"> and device_model_code = #{deviceModelCode}</if>
<if test="deviceRunningNumber != null and deviceRunningNumber != ''"> and device_running_number = #{deviceRunningNumber}</if>
<if test="qualityStatus != null and qualityStatus != ''"> and quality_status = #{qualityStatus}</if>
<if test="qualityAuditStatus != null and qualityAuditStatus != ''"> and quality_audit_status = #{qualityAuditStatus}</if>
</where>
</select>
<select id="selectQualityShippingDeviceById" parameterType="Long" resultMap="QualityShippingDeviceResult">
<include refid="selectQualityShippingDeviceVo"/>
where shipping_device_code = #{shippingDeviceCode}
</select>
<select id="selectQualityShippingDeviceByDeviceId" parameterType="String" resultMap="QualityShippingDeviceResult">
<include refid="selectQualityShippingDeviceVo"/>
where shipping_device_id = #{shippingDeviceId}
</select>
<insert id="insertQualityShippingDevice" parameterType="QualityShippingDevice" useGeneratedKeys="true" keyProperty="shippingDeviceCode">
insert into quality_shipping_device
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="shippingDeviceId != null">shipping_device_id,</if>
<if test="qualityOrderCode != null">quality_order_code,</if>
<if test="salesOrderCode != null">sales_order_code,</if>
<if test="makeNo != null">make_no,</if>
<if test="materialNo != null">material_no,</if>
<if test="materialName != null">material_name,</if>
<if test="materialType != null">material_type,</if>
<if test="materialUnit != null">material_unit,</if>
<if test="materialBrand != null">material_brand,</if>
<if test="materialDescribe != null">material_describe,</if>
<if test="materialModelCode != null">material_model_code,</if>
<if test="deviceModelCode != null">device_model_code,</if>
<if test="deviceRunningNumber != null">device_running_number,</if>
<if test="qualityStatus != null">quality_status,</if>
<if test="qualityAuditStatus != null">quality_audit_status,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="shippingDeviceId != null">#{shippingDeviceId},</if>
<if test="qualityOrderCode != null">#{qualityOrderCode},</if>
<if test="salesOrderCode != null">#{salesOrderCode},</if>
<if test="makeNo != null">#{makeNo},</if>
<if test="materialNo != null">#{materialNo},</if>
<if test="materialName != null">#{materialName},</if>
<if test="materialType != null">#{materialType},</if>
<if test="materialUnit != null">#{materialUnit},</if>
<if test="materialBrand != null">#{materialBrand},</if>
<if test="materialDescribe != null">#{materialDescribe},</if>
<if test="materialModelCode != null">#{materialModelCode},</if>
<if test="deviceModelCode != null">#{deviceModelCode},</if>
<if test="deviceRunningNumber != null">#{deviceRunningNumber},</if>
<if test="qualityStatus != null">#{qualityStatus},</if>
<if test="qualityAuditStatus != null">#{qualityAuditStatus},</if>
</trim>
</insert>
<update id="updateQualityShippingDevice" parameterType="QualityShippingDevice">
update quality_shipping_device
<trim prefix="SET" suffixOverrides=",">
<if test="shippingDeviceId != null">shipping_device_id = #{shippingDeviceId},</if>
<if test="qualityOrderCode != null">quality_order_code = #{qualityOrderCode},</if>
<if test="salesOrderCode != null">sales_order_code = #{salesOrderCode},</if>
<if test="makeNo != null">make_no = #{makeNo},</if>
<if test="materialNo != null">material_no = #{materialNo},</if>
<if test="materialName != null">material_name = #{materialName},</if>
<if test="materialType != null">material_type = #{materialType},</if>
<if test="materialUnit != null">material_unit = #{materialUnit},</if>
<if test="materialBrand != null">material_brand = #{materialBrand},</if>
<if test="materialDescribe != null">material_describe = #{materialDescribe},</if>
<if test="materialModelCode != null">material_model_code = #{materialModelCode},</if>
<if test="deviceModelCode != null">device_model_code = #{deviceModelCode},</if>
<if test="deviceRunningNumber != null">device_running_number = #{deviceRunningNumber},</if>
<if test="qualityStatus != null">quality_status = #{qualityStatus},</if>
<if test="qualityAuditStatus != null">quality_audit_status = #{qualityAuditStatus},</if>
</trim>
where shipping_device_code = #{shippingDeviceCode}
</update>
<delete id="deleteQualityShippingDeviceById" parameterType="Long">
delete from quality_shipping_device where shipping_device_code = #{shippingDeviceCode}
</delete>
<delete id="deleteQualityShippingDeviceByIds" parameterType="String">
delete from quality_shipping_device where shipping_device_code in
<foreach item="shippingDeviceCode" collection="array" open="(" separator="," close=")">
#{shippingDeviceCode}
</foreach>
</delete>
<update id="cancelQualityShippingDeviceById" parameterType="Long">
update quality_shipping_device set del_flag = '1' where shipping_device_code = #{shippingDeviceCode}
</update>
<update id="restoreQualityShippingDeviceById" parameterType="Long">
update quality_shipping_device set del_flag = '0' where shipping_device_code = #{shippingDeviceCode}
</update>
</mapper>
Write Preview
Loading…
Cancel
Save