Merge remote-tracking branch 'origin/master'
# Conflicts: # ABAP_AS_WITH_POOL.jcoDestination # op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java # op-modules/op-mes/src/main/java/com/op/mes/service/IWCSInterfaceService.java # op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.javahighway
commit
fec239c59c
@ -1,114 +0,0 @@
|
||||
|
||||
**** Error file opened at 20230724 105509 China Standard Time Rel. 3.0.17 (2017-07-17) [721.913]
|
||||
Error: >Mon Jul 24 10:55:09,173< RfcException:
|
||||
message: Connect to SAP gateway failed
|
||||
Connection parameters: TYPE=A DEST=ABAP_AS_WITH_POOL ASHOST=192.168.0.53 SYSNR=00 PCS=1
|
||||
|
||||
LOCATION CPIC (TCP/IP) on local host with Unicode
|
||||
ERROR partner '192.168.0.53:3300' not reached
|
||||
TIME Mon Jul 24 10:55:09 2023
|
||||
RELEASE 721
|
||||
COMPONENT NI (network interface)
|
||||
VERSION 40
|
||||
RC -10
|
||||
MODULE nixxi.cpp
|
||||
LINE 3289
|
||||
DETAIL NiPConnect2: 192.168.0.53:3300
|
||||
SYSTEM CALL connect
|
||||
ERRNO 10060
|
||||
ERRNO TEXT WSAETIMEDOUT: Connection timed out
|
||||
COUNTER 2
|
||||
|
||||
return code: RFC_FAILURE (1)
|
||||
error group: 102
|
||||
key: RFC_ERROR_COMMUNICATION
|
||||
|
||||
Error: >Mon Jul 24 10:55:30,220< RfcException:
|
||||
message: Connect to SAP gateway failed
|
||||
Connection parameters: TYPE=A DEST=ABAP_AS_WITH_POOL ASHOST=192.168.0.53 SYSNR=00 PCS=1
|
||||
|
||||
LOCATION CPIC (TCP/IP) on local host with Unicode
|
||||
ERROR partner '192.168.0.53:3300' not reached
|
||||
TIME Mon Jul 24 10:55:30 2023
|
||||
RELEASE 721
|
||||
COMPONENT NI (network interface)
|
||||
VERSION 40
|
||||
RC -10
|
||||
MODULE nixxi.cpp
|
||||
LINE 3289
|
||||
DETAIL NiPConnect2: 192.168.0.53:3300
|
||||
SYSTEM CALL connect
|
||||
ERRNO 10060
|
||||
ERRNO TEXT WSAETIMEDOUT: Connection timed out
|
||||
COUNTER 4
|
||||
|
||||
return code: RFC_FAILURE (1)
|
||||
error group: 102
|
||||
key: RFC_ERROR_COMMUNICATION
|
||||
|
||||
|
||||
**** Error file opened at 20230725 103104 China Standard Time Rel. 3.0.17 (2017-07-17) [721.913]
|
||||
Error: >Tue Jul 25 10:31:04,628< RfcException:
|
||||
message: Connect to SAP gateway failed
|
||||
Connection parameters: TYPE=A DEST=ABAP_AS_WITH_POOL ASHOST=192.168.0.53 SYSNR=00 PCS=1
|
||||
|
||||
LOCATION CPIC (TCP/IP) on local host with Unicode
|
||||
ERROR partner '192.168.0.53:3300' not reached
|
||||
TIME Tue Jul 25 10:31:04 2023
|
||||
RELEASE 721
|
||||
COMPONENT NI (network interface)
|
||||
VERSION 40
|
||||
RC -10
|
||||
MODULE nixxi.cpp
|
||||
LINE 3289
|
||||
DETAIL NiPConnect2: 192.168.0.53:3300
|
||||
SYSTEM CALL connect
|
||||
ERRNO 10060
|
||||
ERRNO TEXT WSAETIMEDOUT: Connection timed out
|
||||
COUNTER 2
|
||||
|
||||
return code: RFC_FAILURE (1)
|
||||
error group: 102
|
||||
key: RFC_ERROR_COMMUNICATION
|
||||
|
||||
Error: >Tue Jul 25 10:31:25,675< RfcException:
|
||||
message: Connect to SAP gateway failed
|
||||
Connection parameters: TYPE=A DEST=ABAP_AS_WITH_POOL ASHOST=192.168.0.53 SYSNR=00 PCS=1
|
||||
|
||||
LOCATION CPIC (TCP/IP) on local host with Unicode
|
||||
ERROR partner '192.168.0.53:3300' not reached
|
||||
TIME Tue Jul 25 10:31:25 2023
|
||||
RELEASE 721
|
||||
COMPONENT NI (network interface)
|
||||
VERSION 40
|
||||
RC -10
|
||||
MODULE nixxi.cpp
|
||||
LINE 3289
|
||||
DETAIL NiPConnect2: 192.168.0.53:3300
|
||||
SYSTEM CALL connect
|
||||
ERRNO 10060
|
||||
ERRNO TEXT WSAETIMEDOUT: Connection timed out
|
||||
COUNTER 4
|
||||
|
||||
return code: RFC_FAILURE (1)
|
||||
error group: 102
|
||||
key: RFC_ERROR_COMMUNICATION
|
||||
|
||||
|
||||
**** Error file opened at 20230816 113444 China Standard Time Rel. 3.0.17 (2017-07-17) [721.913]
|
||||
Error: >Wed Aug 16 11:34:44,064< >RfcGetException rc (7) message: Invalid value in OPTION field of value table for IN itab operator. operator.
|
||||
<RfcGetException
|
||||
|
||||
|
||||
|
||||
**** Error file opened at 20230816 174253 China Standard Time Rel. 3.0.17 (2017-07-17) [721.913]
|
||||
Error: >Wed Aug 16 17:42:53,538< >RfcGetException rc (7) message: Invalid value in OPTION field of value table for IN itab operator. operator.
|
||||
<RfcGetException
|
||||
|
||||
|
||||
|
||||
**** Error file opened at 20230816 174447 China Standard Time Rel. 3.0.17 (2017-07-17) [721.913]
|
||||
Error: >Wed Aug 16 17:44:47,079< >RfcGetException rc (7) message: Invalid value in OPTION field of value table for IN itab operator. operator.
|
||||
<RfcGetException
|
||||
|
||||
|
||||
@ -0,0 +1,90 @@
|
||||
package com.op.system.api.domain;
|
||||
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 文件信息
|
||||
*
|
||||
* @author OP
|
||||
*/
|
||||
public class SysSapLog {
|
||||
private String id;
|
||||
private String messsge;
|
||||
private Date createTime;
|
||||
private String reqcode;
|
||||
private String method;
|
||||
private String remark;
|
||||
private String status;
|
||||
|
||||
public String getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(String id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getMesssge() {
|
||||
return messsge;
|
||||
}
|
||||
|
||||
public void setMesssge(String messsge) {
|
||||
this.messsge = messsge;
|
||||
}
|
||||
|
||||
public Date getCreateTime() {
|
||||
return createTime;
|
||||
}
|
||||
|
||||
public void setCreateTime(Date createTime) {
|
||||
this.createTime = createTime;
|
||||
}
|
||||
|
||||
public String getReqcode() {
|
||||
return reqcode;
|
||||
}
|
||||
|
||||
public void setReqcode(String reqcode) {
|
||||
this.reqcode = reqcode;
|
||||
}
|
||||
|
||||
public String getMethod() {
|
||||
return method;
|
||||
}
|
||||
|
||||
public void setMethod(String method) {
|
||||
this.method = method;
|
||||
}
|
||||
|
||||
public String getRemark() {
|
||||
return remark;
|
||||
}
|
||||
|
||||
public void setRemark(String remark) {
|
||||
this.remark = remark;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("id", getId())
|
||||
.append("messsge", getMesssge())
|
||||
.append("createTime", getCreateTime())
|
||||
.append("reqcode", getReqcode())
|
||||
.append("method", getMethod())
|
||||
.append("remark", getRemark())
|
||||
.append("status", getStatus())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,182 @@
|
||||
package com.op.device.domain;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
import com.op.common.core.annotation.Excel;
|
||||
import com.op.common.core.web.domain.BaseEntity;
|
||||
|
||||
/**
|
||||
* 工单设备备件关联对象 equ_order_equ_spare
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-11-02
|
||||
*/
|
||||
public class EquOrderEquSpare extends BaseEntity {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 主键 */
|
||||
private String id;
|
||||
|
||||
/** 编码 */
|
||||
@Excel(name = "编码")
|
||||
private String code;
|
||||
|
||||
/** 主工单信息 */
|
||||
@Excel(name = "主工单信息")
|
||||
private String orderCode;
|
||||
|
||||
/** 关联上级code */
|
||||
@Excel(name = "关联上级code")
|
||||
private String parentCode;
|
||||
|
||||
/** 备件code */
|
||||
@Excel(name = "备件code")
|
||||
private String materialCode;
|
||||
|
||||
/** 备件名称 */
|
||||
@Excel(name = "备件名称")
|
||||
private String materialDesc;
|
||||
|
||||
/** 备件类型 */
|
||||
@Excel(name = "备件类型")
|
||||
private String spareType;
|
||||
|
||||
/** 申领数量 */
|
||||
@Excel(name = "申领数量")
|
||||
private BigDecimal applyNum;
|
||||
|
||||
/** 工厂 */
|
||||
@Excel(name = "工厂")
|
||||
private String factoryCode;
|
||||
|
||||
/** 备用字段1 */
|
||||
@Excel(name = "备用字段1")
|
||||
private String attr1;
|
||||
|
||||
/** 备用字段2 */
|
||||
@Excel(name = "备用字段2")
|
||||
private String attr2;
|
||||
|
||||
/** 备用字段3 */
|
||||
@Excel(name = "备用字段3")
|
||||
private String attr3;
|
||||
|
||||
/** 删除标识 */
|
||||
private String delFlag;
|
||||
|
||||
public void setId(String id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getId() {
|
||||
return id;
|
||||
}
|
||||
public void setCode(String code) {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public String getCode() {
|
||||
return code;
|
||||
}
|
||||
public void setOrderCode(String orderCode) {
|
||||
this.orderCode = orderCode;
|
||||
}
|
||||
|
||||
public String getOrderCode() {
|
||||
return orderCode;
|
||||
}
|
||||
public void setParentCode(String parentCode) {
|
||||
this.parentCode = parentCode;
|
||||
}
|
||||
|
||||
public String getParentCode() {
|
||||
return parentCode;
|
||||
}
|
||||
public void setMaterialCode(String materialCode) {
|
||||
this.materialCode = materialCode;
|
||||
}
|
||||
|
||||
public String getMaterialCode() {
|
||||
return materialCode;
|
||||
}
|
||||
public void setMaterialDesc(String materialDesc) {
|
||||
this.materialDesc = materialDesc;
|
||||
}
|
||||
|
||||
public String getMaterialDesc() {
|
||||
return materialDesc;
|
||||
}
|
||||
public void setSpareType(String spareType) {
|
||||
this.spareType = spareType;
|
||||
}
|
||||
|
||||
public String getSpareType() {
|
||||
return spareType;
|
||||
}
|
||||
public void setApplyNum(BigDecimal applyNum) {
|
||||
this.applyNum = applyNum;
|
||||
}
|
||||
|
||||
public BigDecimal getApplyNum() {
|
||||
return applyNum;
|
||||
}
|
||||
public void setFactoryCode(String factoryCode) {
|
||||
this.factoryCode = factoryCode;
|
||||
}
|
||||
|
||||
public String getFactoryCode() {
|
||||
return factoryCode;
|
||||
}
|
||||
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 setDelFlag(String delFlag) {
|
||||
this.delFlag = delFlag;
|
||||
}
|
||||
|
||||
public String getDelFlag() {
|
||||
return delFlag;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("id", getId())
|
||||
.append("code", getCode())
|
||||
.append("orderCode", getOrderCode())
|
||||
.append("parentCode", getParentCode())
|
||||
.append("materialCode", getMaterialCode())
|
||||
.append("materialDesc", getMaterialDesc())
|
||||
.append("spareType", getSpareType())
|
||||
.append("applyNum", getApplyNum())
|
||||
.append("factoryCode", getFactoryCode())
|
||||
.append("attr1", getAttr1())
|
||||
.append("attr2", getAttr2())
|
||||
.append("attr3", getAttr3())
|
||||
.append("delFlag", getDelFlag())
|
||||
.append("createBy", getCreateBy())
|
||||
.append("createTime", getCreateTime())
|
||||
.append("updateBy", getUpdateBy())
|
||||
.append("updateTime", getUpdateTime())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
package com.op.device.mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.op.device.domain.EquOrderEquSpare;
|
||||
|
||||
/**
|
||||
* 工单设备备件关联Mapper接口
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-11-02
|
||||
*/
|
||||
public interface EquOrderEquSpareMapper {
|
||||
/**
|
||||
* 查询工单设备备件关联
|
||||
*
|
||||
* @param id 工单设备备件关联主键
|
||||
* @return 工单设备备件关联
|
||||
*/
|
||||
public EquOrderEquSpare selectEquOrderEquSpareById(String id);
|
||||
|
||||
/**
|
||||
* 查询工单设备备件关联列表
|
||||
*
|
||||
* @param equOrderEquSpare 工单设备备件关联
|
||||
* @return 工单设备备件关联集合
|
||||
*/
|
||||
public List<EquOrderEquSpare> selectEquOrderEquSpareList(EquOrderEquSpare equOrderEquSpare);
|
||||
|
||||
/**
|
||||
* 新增工单设备备件关联
|
||||
*
|
||||
* @param equOrderEquSpare 工单设备备件关联
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertEquOrderEquSpare(EquOrderEquSpare equOrderEquSpare);
|
||||
|
||||
/**
|
||||
* 修改工单设备备件关联
|
||||
*
|
||||
* @param equOrderEquSpare 工单设备备件关联
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateEquOrderEquSpare(EquOrderEquSpare equOrderEquSpare);
|
||||
|
||||
/**
|
||||
* 删除工单设备备件关联
|
||||
*
|
||||
* @param id 工单设备备件关联主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteEquOrderEquSpareById(String id);
|
||||
|
||||
/**
|
||||
* 批量删除工单设备备件关联
|
||||
*
|
||||
* @param ids 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteEquOrderEquSpareByIds(String[] ids);
|
||||
}
|
||||
@ -0,0 +1,128 @@
|
||||
<?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.op.device.mapper.EquOrderEquSpareMapper">
|
||||
|
||||
<resultMap type="EquOrderEquSpare" id="EquOrderEquSpareResult">
|
||||
<result property="id" column="id" />
|
||||
<result property="code" column="code" />
|
||||
<result property="orderCode" column="order_code" />
|
||||
<result property="parentCode" column="parent_code" />
|
||||
<result property="materialCode" column="material_code" />
|
||||
<result property="materialDesc" column="material_desc" />
|
||||
<result property="spareType" column="spare_type" />
|
||||
<result property="applyNum" column="apply_num" />
|
||||
<result property="factoryCode" column="factory_code" />
|
||||
<result property="attr1" column="attr1" />
|
||||
<result property="attr2" column="attr2" />
|
||||
<result property="attr3" column="attr3" />
|
||||
<result property="delFlag" column="del_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="selectEquOrderEquSpareVo">
|
||||
select id, code, order_code, parent_code, material_code, material_desc, spare_type, apply_num, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time from equ_order_equ_spare
|
||||
</sql>
|
||||
|
||||
<select id="selectEquOrderEquSpareList" parameterType="EquOrderEquSpare" resultMap="EquOrderEquSpareResult">
|
||||
<include refid="selectEquOrderEquSpareVo"/>
|
||||
<where>
|
||||
<if test="code != null and code != ''"> and code = #{code}</if>
|
||||
<if test="orderCode != null and orderCode != ''"> and order_code = #{orderCode}</if>
|
||||
<if test="parentCode != null and parentCode != ''"> and parent_code = #{parentCode}</if>
|
||||
<if test="materialCode != null and materialCode != ''"> and material_code = #{materialCode}</if>
|
||||
<if test="materialDesc != null and materialDesc != ''"> and material_desc = #{materialDesc}</if>
|
||||
<if test="spareType != null and spareType != ''"> and spare_type = #{spareType}</if>
|
||||
<if test="applyNum != null "> and apply_num = #{applyNum}</if>
|
||||
<if test="factoryCode != null and factoryCode != ''"> and factory_code = #{factoryCode}</if>
|
||||
<if test="attr1 != null and attr1 != ''"> and attr1 = #{attr1}</if>
|
||||
<if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if>
|
||||
<if test="attr3 != null and attr3 != ''"> and attr3 = #{attr3}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectEquOrderEquSpareById" parameterType="String" resultMap="EquOrderEquSpareResult">
|
||||
<include refid="selectEquOrderEquSpareVo"/>
|
||||
where id = #{id}
|
||||
</select>
|
||||
|
||||
<insert id="insertEquOrderEquSpare" parameterType="EquOrderEquSpare">
|
||||
insert into equ_order_equ_spare
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null">id,</if>
|
||||
<if test="code != null">code,</if>
|
||||
<if test="orderCode != null">order_code,</if>
|
||||
<if test="parentCode != null">parent_code,</if>
|
||||
<if test="materialCode != null">material_code,</if>
|
||||
<if test="materialDesc != null">material_desc,</if>
|
||||
<if test="spareType != null">spare_type,</if>
|
||||
<if test="applyNum != null">apply_num,</if>
|
||||
<if test="factoryCode != null and factoryCode != ''">factory_code,</if>
|
||||
<if test="attr1 != null">attr1,</if>
|
||||
<if test="attr2 != null">attr2,</if>
|
||||
<if test="attr3 != null">attr3,</if>
|
||||
<if test="delFlag != null and delFlag != ''">del_flag,</if>
|
||||
<if test="createBy != null and createBy != ''">create_by,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
<if test="updateBy != null and updateBy != ''">update_by,</if>
|
||||
<if test="updateTime != null">update_time,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null">#{id},</if>
|
||||
<if test="code != null">#{code},</if>
|
||||
<if test="orderCode != null">#{orderCode},</if>
|
||||
<if test="parentCode != null">#{parentCode},</if>
|
||||
<if test="materialCode != null">#{materialCode},</if>
|
||||
<if test="materialDesc != null">#{materialDesc},</if>
|
||||
<if test="spareType != null">#{spareType},</if>
|
||||
<if test="applyNum != null">#{applyNum},</if>
|
||||
<if test="factoryCode != null and factoryCode != ''">#{factoryCode},</if>
|
||||
<if test="attr1 != null">#{attr1},</if>
|
||||
<if test="attr2 != null">#{attr2},</if>
|
||||
<if test="attr3 != null">#{attr3},</if>
|
||||
<if test="delFlag != null and delFlag != ''">#{delFlag},</if>
|
||||
<if test="createBy != null and createBy != ''">#{createBy},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
<if test="updateBy != null and updateBy != ''">#{updateBy},</if>
|
||||
<if test="updateTime != null">#{updateTime},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateEquOrderEquSpare" parameterType="EquOrderEquSpare">
|
||||
update equ_order_equ_spare
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="code != null">code = #{code},</if>
|
||||
<if test="orderCode != null">order_code = #{orderCode},</if>
|
||||
<if test="parentCode != null">parent_code = #{parentCode},</if>
|
||||
<if test="materialCode != null">material_code = #{materialCode},</if>
|
||||
<if test="materialDesc != null">material_desc = #{materialDesc},</if>
|
||||
<if test="spareType != null">spare_type = #{spareType},</if>
|
||||
<if test="applyNum != null">apply_num = #{applyNum},</if>
|
||||
<if test="factoryCode != null and factoryCode != ''">factory_code = #{factoryCode},</if>
|
||||
<if test="attr1 != null">attr1 = #{attr1},</if>
|
||||
<if test="attr2 != null">attr2 = #{attr2},</if>
|
||||
<if test="attr3 != null">attr3 = #{attr3},</if>
|
||||
<if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
|
||||
<if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
|
||||
<if test="createTime != null">create_time = #{createTime},</if>
|
||||
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
||||
<delete id="deleteEquOrderEquSpareById" parameterType="String">
|
||||
delete from equ_order_equ_spare where id = #{id}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteEquOrderEquSpareByIds" parameterType="String">
|
||||
delete from equ_order_equ_spare where id in
|
||||
<foreach item="id" collection="array" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
</delete>
|
||||
</mapper>
|
||||
@ -0,0 +1,186 @@
|
||||
package com.op.quality.controller;
|
||||
|
||||
import com.op.common.core.utils.DateUtils;
|
||||
import com.op.common.core.utils.poi.ExcelUtil;
|
||||
import com.op.common.core.web.controller.BaseController;
|
||||
import com.op.common.core.web.domain.AjaxResult;
|
||||
import com.op.common.core.web.page.TableDataInfo;
|
||||
import com.op.common.log.annotation.Log;
|
||||
import com.op.common.log.enums.BusinessType;
|
||||
import com.op.common.security.annotation.RequiresPermissions;
|
||||
import com.op.common.security.utils.SecurityUtils;
|
||||
import com.op.quality.domain.QcBomComponent;
|
||||
import com.op.quality.domain.QcCheckTaskDetail;
|
||||
import com.op.quality.domain.QcCheckReportIncome;
|
||||
import com.op.quality.domain.QcSupplier;
|
||||
import com.op.quality.service.IQcCheckReportIncomeService;
|
||||
import com.op.system.api.domain.SysUser;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.time.LocalDate;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 来料检验Controller
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-10-19
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/qcIncomeReport")
|
||||
public class QcCheckReportIncomeController extends BaseController {
|
||||
@Autowired
|
||||
private IQcCheckReportIncomeService qcCheckReportIncomeService;
|
||||
|
||||
/**
|
||||
* 查询来料检验列表
|
||||
*/
|
||||
@RequiresPermissions("quality:qcIncomeReport:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(QcCheckReportIncome qcCheckReportIncome) {
|
||||
|
||||
//默认时间范围T 00:00:00~T+1 00:00:00
|
||||
/*if(StringUtils.isEmpty(qcCheckReportIncome.getIncomeTimeStart())){
|
||||
qcCheckReportIncome.setIncomeTimeStart(DateUtils.getDate()+" 00:00:00");//start
|
||||
LocalDate date = LocalDate.now();
|
||||
LocalDate dateEnd = date.plusDays(1);
|
||||
DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
|
||||
String dateEndStr = dtf.format(dateEnd)+" 00:00:00";
|
||||
qcCheckReportIncome.setIncomeTimeEnd(dateEndStr);//end
|
||||
}*/
|
||||
|
||||
// if(StringUtils.isEmpty(qcCheckReportIncome.getCheckTimeStart())){
|
||||
// qcCheckReportIncome.setCheckTimeStart(qcCheckReportIncome.getIncomeTimeStart());//start
|
||||
// qcCheckReportIncome.setCheckTimeEnd(qcCheckReportIncome.getIncomeTimeStart());//end
|
||||
// }
|
||||
|
||||
startPage();
|
||||
List<QcCheckReportIncome> list = qcCheckReportIncomeService.selectQcCheckReportIncomeList(qcCheckReportIncome);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出来料检验列表
|
||||
*/
|
||||
@RequiresPermissions("quality:qcIncomeReport:export")
|
||||
@Log(title = "来料检验", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, QcCheckReportIncome qcCheckReportIncome) {
|
||||
|
||||
//默认时间范围T 00:00:00~T+1 00:00:00
|
||||
if(StringUtils.isEmpty(qcCheckReportIncome.getIncomeTimeStart())){
|
||||
qcCheckReportIncome.setIncomeTimeStart(DateUtils.getDate()+" 00:00:00");//start
|
||||
LocalDate date = LocalDate.now();
|
||||
LocalDate dateEnd = date.plusDays(1);
|
||||
DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
|
||||
String dateEndStr = dtf.format(dateEnd)+" 00:00:00";
|
||||
qcCheckReportIncome.setIncomeTimeEnd(dateEndStr);//end
|
||||
}
|
||||
|
||||
// if(StringUtils.isEmpty(qcCheckReportIncome.getCheckTimeStart())){
|
||||
// qcCheckReportIncome.setCheckTimeStart(qcCheckReportIncome.getIncomeTimeStart());//start
|
||||
// qcCheckReportIncome.setCheckTimeEnd(qcCheckReportIncome.getIncomeTimeStart());//end
|
||||
// }
|
||||
|
||||
List<QcCheckReportIncome> list = qcCheckReportIncomeService.selectQcCheckReportIncomeList(qcCheckReportIncome);
|
||||
ExcelUtil<QcCheckReportIncome> util = new ExcelUtil<QcCheckReportIncome>(QcCheckReportIncome.class);
|
||||
util.exportExcel(response, list, "来料检验数据");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取来料检验详细信息
|
||||
*/
|
||||
@RequiresPermissions("quality:qcIncomeReport:query")
|
||||
@GetMapping(value = "/{recordId}")
|
||||
public AjaxResult getInfo(@PathVariable("recordId") String recordId) {
|
||||
return success(qcCheckReportIncomeService.selectQcCheckReportIncomeByRecordId(recordId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增来料检验
|
||||
*/
|
||||
@RequiresPermissions("quality:qcIncomeReport:add")
|
||||
@Log(title = "来料检验", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody QcCheckReportIncome qcCheckReportIncome) {
|
||||
int r = qcCheckReportIncomeService.insertQcCheckReportIncome(qcCheckReportIncome);
|
||||
if(r>0){
|
||||
return toAjax(r);
|
||||
}
|
||||
return error("添加失败：请检查物料的关联检测项");
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改来料检验
|
||||
*/
|
||||
@RequiresPermissions("quality:qcIncomeReport:edit")
|
||||
@Log(title = "来料检验", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody QcCheckReportIncome qcCheckReportIncome) {
|
||||
return toAjax(qcCheckReportIncomeService.updateQcCheckReportIncome(qcCheckReportIncome));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除来料检验
|
||||
*/
|
||||
@RequiresPermissions("quality:qcIncomeReport:remove")
|
||||
@Log(title = "来料检验", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{recordIds}")
|
||||
public AjaxResult remove(@PathVariable String[] recordIds) {
|
||||
return toAjax(qcCheckReportIncomeService.deleteQcCheckReportIncomeByRecordIds(recordIds));
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询BOM物料管理列表
|
||||
*/
|
||||
@GetMapping("/getQcListBom")
|
||||
public TableDataInfo getQcListBom(QcBomComponent bomComponent) {
|
||||
startPage();
|
||||
List<QcBomComponent> list = qcCheckReportIncomeService.getQcListBom(bomComponent);
|
||||
return getDataTable(list);
|
||||
}
|
||||
/**
|
||||
* 查询供应商列表
|
||||
*/
|
||||
@GetMapping("/getQcListSupplier")
|
||||
public TableDataInfo getQcListSupplier(QcSupplier qcSupplier) {
|
||||
startPage();
|
||||
List<QcSupplier> list = qcCheckReportIncomeService.getQcListSupplier(qcSupplier);
|
||||
return getDataTable(list);
|
||||
}
|
||||
/**
|
||||
* 查询人员列表
|
||||
*/
|
||||
@GetMapping("/getQcListUser")
|
||||
public TableDataInfo getQcListUser(SysUser sysUser) {
|
||||
startPage();
|
||||
List<SysUser> list = qcCheckReportIncomeService.getQcListUser(sysUser);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 状态修改
|
||||
*/
|
||||
@PutMapping("/changeIncomeStatus")
|
||||
public AjaxResult changeIncomeStatus(@RequestBody QcCheckReportIncome qcCheckReportIncome) {
|
||||
qcCheckReportIncome.setUpdateBy(SecurityUtils.getUsername());
|
||||
qcCheckReportIncome.setUpdateTime(DateUtils.getNowDate());
|
||||
return toAjax(qcCheckReportIncomeService.updateIncomeStatus(qcCheckReportIncome));
|
||||
}
|
||||
|
||||
/**
|
||||
* 检验项目弹窗列表
|
||||
* @param
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("/getCkeckProjectList")
|
||||
public TableDataInfo getCkeckProjectList(QcCheckTaskDetail qcCheckTaskDetail) {
|
||||
startPage();
|
||||
List<QcCheckTaskDetail> list = qcCheckReportIncomeService.getCkeckProjectList(qcCheckTaskDetail);
|
||||
return getDataTable(list);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,376 @@
|
||||
package com.op.quality.domain;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.op.common.core.annotation.Excel;
|
||||
import com.op.common.core.web.domain.BaseEntity;
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 来料检验对象 qc_check_task_income
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-10-19
|
||||
*/
|
||||
public class QcCheckReportIncome extends BaseEntity {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** id */
|
||||
private String recordId;
|
||||
|
||||
/** 检验任务编号 */
|
||||
@Excel(name = "检验任务编号")
|
||||
private String checkNo;
|
||||
|
||||
/** 来料批次号 */
|
||||
@Excel(name = "来料批次号")
|
||||
private String incomeBatchNo;
|
||||
|
||||
/** 订单号 */
|
||||
@Excel(name = "订单号")
|
||||
private String orderNo;
|
||||
|
||||
/** 物料号 */
|
||||
@Excel(name = "物料号")
|
||||
private String materialCode;
|
||||
|
||||
/** 物料名称 */
|
||||
@Excel(name = "物料名称")
|
||||
private String materialName;
|
||||
|
||||
/** 收货数量 */
|
||||
@Excel(name = "收货数量")
|
||||
private BigDecimal quality;
|
||||
|
||||
/** 单位 */
|
||||
@Excel(name = "单位")
|
||||
private String unit;
|
||||
|
||||
/** 供应商编码 */
|
||||
@Excel(name = "供应商编码")
|
||||
private String supplierCode;
|
||||
|
||||
/** 供应商名称 */
|
||||
@Excel(name = "供应商名称")
|
||||
private String supplierName;
|
||||
|
||||
/** 来料时间 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Excel(name = "来料时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date incomeTime;
|
||||
|
||||
/** 检测地点 */
|
||||
@Excel(name = "检测地点")
|
||||
private String checkLoc;
|
||||
|
||||
/** 检测状态 */
|
||||
@Excel(name = "检测状态")
|
||||
private String checkStatus;
|
||||
|
||||
/** 检测人工号 */
|
||||
@Excel(name = "检测人工号")
|
||||
private String checkManCode;
|
||||
|
||||
/** 检测人姓名 */
|
||||
@Excel(name = "检测人姓名")
|
||||
private String checkManName;
|
||||
|
||||
/** 检验时间 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Excel(name = "检验时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date checkTime;
|
||||
|
||||
/** 检验结果Y合格 */
|
||||
@Excel(name = "检验结果Y合格")
|
||||
private String checkResult;
|
||||
|
||||
/** 是否启用1启用0停用 */
|
||||
@Excel(name = "是否启用1启用0停用")
|
||||
private String status;
|
||||
|
||||
/** 预留字段1 */
|
||||
//@Excel(name = "预留字段1")
|
||||
private String attr1;
|
||||
|
||||
/** 预留字段2 */
|
||||
//@Excel(name = "预留字段2")
|
||||
private String attr2;
|
||||
|
||||
/** 预留字段3 */
|
||||
//@Excel(name = "预留字段3")
|
||||
private String attr3;
|
||||
|
||||
/** 预留字段4 */
|
||||
//@Excel(name = "预留字段4")
|
||||
private String attr4;
|
||||
|
||||
/** 工厂编码 */
|
||||
@Excel(name = "工厂编码")
|
||||
private String factoryCode;
|
||||
|
||||
/** 删除标识1删除0正常 */
|
||||
private String delFlag;
|
||||
|
||||
private String incomeTimeStart;
|
||||
private String incomeTimeEnd;
|
||||
private String checkTimeStart;
|
||||
private String checkTimeEnd;
|
||||
private String typeCode;
|
||||
private String checkType;
|
||||
|
||||
|
||||
public String getCheckType() {
|
||||
return checkType;
|
||||
}
|
||||
|
||||
public void setCheckType(String checkType) {
|
||||
this.checkType = checkType;
|
||||
}
|
||||
|
||||
public String getTypeCode() {
|
||||
return typeCode;
|
||||
}
|
||||
|
||||
public void setTypeCode(String typeCode) {
|
||||
this.typeCode = typeCode;
|
||||
}
|
||||
|
||||
public String getIncomeTimeStart() {
|
||||
return incomeTimeStart;
|
||||
}
|
||||
|
||||
public void setIncomeTimeStart(String incomeTimeStart) {
|
||||
this.incomeTimeStart = incomeTimeStart;
|
||||
}
|
||||
|
||||
public String getIncomeTimeEnd() {
|
||||
return incomeTimeEnd;
|
||||
}
|
||||
|
||||
public void setIncomeTimeEnd(String incomeTimeEnd) {
|
||||
this.incomeTimeEnd = incomeTimeEnd;
|
||||
}
|
||||
|
||||
public String getCheckTimeStart() {
|
||||
return checkTimeStart;
|
||||
}
|
||||
|
||||
public void setCheckTimeStart(String checkTimeStart) {
|
||||
this.checkTimeStart = checkTimeStart;
|
||||
}
|
||||
|
||||
public String getCheckTimeEnd() {
|
||||
return checkTimeEnd;
|
||||
}
|
||||
|
||||
public void setCheckTimeEnd(String checkTimeEnd) {
|
||||
this.checkTimeEnd = checkTimeEnd;
|
||||
}
|
||||
|
||||
public void setRecordId(String recordId) {
|
||||
this.recordId = recordId;
|
||||
}
|
||||
|
||||
public String getRecordId() {
|
||||
return recordId;
|
||||
}
|
||||
public void setCheckNo(String checkNo) {
|
||||
this.checkNo = checkNo;
|
||||
}
|
||||
|
||||
public String getCheckNo() {
|
||||
return checkNo;
|
||||
}
|
||||
public void setIncomeBatchNo(String incomeBatchNo) {
|
||||
this.incomeBatchNo = incomeBatchNo;
|
||||
}
|
||||
|
||||
public String getIncomeBatchNo() {
|
||||
return incomeBatchNo;
|
||||
}
|
||||
public void setOrderNo(String orderNo) {
|
||||
this.orderNo = orderNo;
|
||||
}
|
||||
|
||||
public String getOrderNo() {
|
||||
return orderNo;
|
||||
}
|
||||
public void setMaterialCode(String materialCode) {
|
||||
this.materialCode = materialCode;
|
||||
}
|
||||
|
||||
public String getMaterialCode() {
|
||||
return materialCode;
|
||||
}
|
||||
public void setMaterialName(String materialName) {
|
||||
this.materialName = materialName;
|
||||
}
|
||||
|
||||
public String getMaterialName() {
|
||||
return materialName;
|
||||
}
|
||||
public void setQuality(BigDecimal quality) {
|
||||
this.quality = quality;
|
||||
}
|
||||
|
||||
public BigDecimal getQuality() {
|
||||
return quality;
|
||||
}
|
||||
public void setUnit(String unit) {
|
||||
this.unit = unit;
|
||||
}
|
||||
|
||||
public String getUnit() {
|
||||
return unit;
|
||||
}
|
||||
public void setSupplierCode(String supplierCode) {
|
||||
this.supplierCode = supplierCode;
|
||||
}
|
||||
|
||||
public String getSupplierCode() {
|
||||
return supplierCode;
|
||||
}
|
||||
public void setSupplierName(String supplierName) {
|
||||
this.supplierName = supplierName;
|
||||
}
|
||||
|
||||
public String getSupplierName() {
|
||||
return supplierName;
|
||||
}
|
||||
public void setIncomeTime(Date incomeTime) {
|
||||
this.incomeTime = incomeTime;
|
||||
}
|
||||
|
||||
public Date getIncomeTime() {
|
||||
return incomeTime;
|
||||
}
|
||||
public void setCheckLoc(String checkLoc) {
|
||||
this.checkLoc = checkLoc;
|
||||
}
|
||||
|
||||
public String getCheckLoc() {
|
||||
return checkLoc;
|
||||
}
|
||||
public void setCheckStatus(String checkStatus) {
|
||||
this.checkStatus = checkStatus;
|
||||
}
|
||||
|
||||
public String getCheckStatus() {
|
||||
return checkStatus;
|
||||
}
|
||||
public void setCheckManCode(String checkManCode) {
|
||||
this.checkManCode = checkManCode;
|
||||
}
|
||||
|
||||
public String getCheckManCode() {
|
||||
return checkManCode;
|
||||
}
|
||||
public void setCheckManName(String checkManName) {
|
||||
this.checkManName = checkManName;
|
||||
}
|
||||
|
||||
public String getCheckManName() {
|
||||
return checkManName;
|
||||
}
|
||||
public void setCheckTime(Date checkTime) {
|
||||
this.checkTime = checkTime;
|
||||
}
|
||||
|
||||
public Date getCheckTime() {
|
||||
return checkTime;
|
||||
}
|
||||
public void setCheckResult(String checkResult) {
|
||||
this.checkResult = checkResult;
|
||||
}
|
||||
|
||||
public String getCheckResult() {
|
||||
return checkResult;
|
||||
}
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
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;
|
||||
}
|
||||
public void setFactoryCode(String factoryCode) {
|
||||
this.factoryCode = factoryCode;
|
||||
}
|
||||
|
||||
public String getFactoryCode() {
|
||||
return factoryCode;
|
||||
}
|
||||
public void setDelFlag(String delFlag) {
|
||||
this.delFlag = delFlag;
|
||||
}
|
||||
|
||||
public String getDelFlag() {
|
||||
return delFlag;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("recordId", getRecordId())
|
||||
.append("checkNo", getCheckNo())
|
||||
.append("incomeBatchNo", getIncomeBatchNo())
|
||||
.append("orderNo", getOrderNo())
|
||||
.append("materialCode", getMaterialCode())
|
||||
.append("materialName", getMaterialName())
|
||||
.append("quality", getQuality())
|
||||
.append("unit", getUnit())
|
||||
.append("supplierCode", getSupplierCode())
|
||||
.append("supplierName", getSupplierName())
|
||||
.append("incomeTime", getIncomeTime())
|
||||
.append("checkLoc", getCheckLoc())
|
||||
.append("checkStatus", getCheckStatus())
|
||||
.append("checkManCode", getCheckManCode())
|
||||
.append("checkManName", getCheckManName())
|
||||
.append("checkTime", getCheckTime())
|
||||
.append("checkResult", getCheckResult())
|
||||
.append("status", getStatus())
|
||||
.append("attr1", getAttr1())
|
||||
.append("attr2", getAttr2())
|
||||
.append("attr3", getAttr3())
|
||||
.append("attr4", getAttr4())
|
||||
.append("createBy", getCreateBy())
|
||||
.append("createTime", getCreateTime())
|
||||
.append("updateBy", getUpdateBy())
|
||||
.append("updateTime", getUpdateTime())
|
||||
.append("factoryCode", getFactoryCode())
|
||||
.append("delFlag", getDelFlag())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,77 @@
|
||||
package com.op.quality.mapper;
|
||||
|
||||
import com.op.quality.domain.QcBomComponent;
|
||||
import com.op.quality.domain.QcCheckReportIncome;
|
||||
import com.op.quality.domain.QcCheckTaskDetail;
|
||||
import com.op.quality.domain.QcSupplier;
|
||||
import com.op.system.api.domain.SysUser;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 检验报告来料Mapper接口
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-10-19
|
||||
*/
|
||||
@Mapper
|
||||
public interface QcCheckReportIncomeMapper {
|
||||
/**
|
||||
* 查询来料报告
|
||||
*
|
||||
* @param recordId 来料检验主键
|
||||
* @return 来料检验
|
||||
*/
|
||||
public QcCheckReportIncome selectQcCheckReportIncomeByRecordId(String recordId);
|
||||
|
||||
/**
|
||||
* 查询来料报告
|
||||
*
|
||||
* @param qcCheckReportIncome 来料检验
|
||||
* @return 来料检验集合
|
||||
*/
|
||||
public List<QcCheckReportIncome> selectQcCheckReportIncomeList(QcCheckReportIncome qcCheckReportIncome);
|
||||
|
||||
/**
|
||||
* 新增来料报告
|
||||
*
|
||||
* @param qcCheckReportIncome 来料检验
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertQcCheckReportIncome(QcCheckReportIncome qcCheckReportIncome);
|
||||
|
||||
/**
|
||||
* 修改来料报告
|
||||
*
|
||||
* @param qcCheckReportIncome 来料检验
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateQcCheckReportIncome(QcCheckReportIncome qcCheckReportIncome);
|
||||
|
||||
/**
|
||||
* 删除来料报告
|
||||
*
|
||||
* @param recordId 来料检验主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQcCheckReportIncomeByRecordId(String recordId);
|
||||
|
||||
/**
|
||||
* 批量删除来料报告
|
||||
*
|
||||
* @param recordIds 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQcCheckReportIncomeByRecordIds(String[] recordIds);
|
||||
|
||||
public List<QcBomComponent> getQcListBom(QcBomComponent bomComponent);
|
||||
|
||||
public List<QcSupplier> getQcListSupplier(QcSupplier qcSupplier);
|
||||
|
||||
public List<SysUser> getQcListUser(SysUser sysUser);
|
||||
|
||||
int getTodayMaxNum(QcCheckReportIncome qcCheckReportIncome);
|
||||
|
||||
List<QcCheckTaskDetail> getCkeckProjectList(QcCheckTaskDetail qcCheckTaskDetail);
|
||||
}
|
||||
@ -0,0 +1,74 @@
|
||||
package com.op.quality.service;
|
||||
|
||||
import com.op.quality.domain.*;
|
||||
import com.op.system.api.domain.SysUser;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 来料报告Service接口
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-10-19
|
||||
*/
|
||||
public interface IQcCheckReportIncomeService {
|
||||
/**
|
||||
* 查询来料报告
|
||||
*
|
||||
* @param recordId 来料报告主键
|
||||
* @return 来料检验
|
||||
*/
|
||||
public QcCheckReportIncome selectQcCheckReportIncomeByRecordId(String recordId);
|
||||
|
||||
/**
|
||||
* 查询来料报告列表
|
||||
*
|
||||
* @param qcCheckReportIncome 来料报告
|
||||
* @return 来料检验集合
|
||||
*/
|
||||
public List<QcCheckReportIncome> selectQcCheckReportIncomeList(QcCheckReportIncome qcCheckReportIncome);
|
||||
|
||||
/**
|
||||
* 新增来料报告
|
||||
*
|
||||
* @param qcCheckReportIncome 来料报告
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertQcCheckReportIncome(QcCheckReportIncome qcCheckReportIncome);
|
||||
|
||||
/**
|
||||
* 修改来料报告
|
||||
*
|
||||
* @param qcCheckReportIncome 来料报告
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateQcCheckReportIncome(QcCheckReportIncome qcCheckReportIncome);
|
||||
|
||||
/**
|
||||
* 批量删除来料报告
|
||||
*
|
||||
* @param recordIds 需要删除的来料报告主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQcCheckReportIncomeByRecordIds(String[] recordIds);
|
||||
|
||||
/**
|
||||
* 删除来料报告信息
|
||||
*
|
||||
* @param recordId 来料报告主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQcCheckReportIncomeByRecordId(String recordId);
|
||||
|
||||
public List<QcBomComponent> getQcListBom(QcBomComponent bomComponent);
|
||||
|
||||
public List<QcSupplier> getQcListSupplier(QcSupplier qcSupplier);
|
||||
|
||||
public List<SysUser> getQcListUser(SysUser sysUser);
|
||||
|
||||
int updateIncomeStatus(QcCheckReportIncome qcCheckReportIncome);
|
||||
|
||||
List<QcCheckTaskDetail> getCkeckProjectList(QcCheckTaskDetail qcCheckTaskDetail);
|
||||
|
||||
public List<QcCheckReportIncome> getPrintData(QcCheckReportIncome qcCheckReportIncome);
|
||||
}
|
||||
@ -0,0 +1,201 @@
|
||||
package com.op.quality.service.serviceImpl;
|
||||
|
||||
import com.alibaba.fastjson2.JSONArray;
|
||||
import com.baomidou.dynamic.datasource.annotation.DS;
|
||||
import com.op.common.core.utils.DateUtils;
|
||||
import com.op.common.core.utils.uuid.IdUtils;
|
||||
import com.op.common.security.utils.SecurityUtils;
|
||||
import com.op.quality.domain.*;
|
||||
import com.op.quality.mapper.*;
|
||||
import com.op.quality.service.IQcCheckReportIncomeService;
|
||||
import com.op.system.api.domain.SysUser;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
import org.springframework.web.context.request.RequestContextHolder;
|
||||
import org.springframework.web.context.request.ServletRequestAttributes;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 来料检验Service业务层处理
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-10-19
|
||||
*/
|
||||
@Service
|
||||
public class QcCheckReportIncomeServiceImpl implements IQcCheckReportIncomeService {
|
||||
@Autowired
|
||||
private QcCheckReportIncomeMapper qcCheckReportIncomeMapper;
|
||||
|
||||
@Autowired
|
||||
private QcCheckTypeProjectMapper qcCheckTypeProjectMapper;
|
||||
|
||||
@Autowired
|
||||
private QcMaterialGroupDetailMapper qcMaterialGroupDetailMapper;
|
||||
|
||||
@Autowired
|
||||
private QcCheckTaskDetailMapper qcCheckTaskDetailMapper;
|
||||
|
||||
/**
|
||||
* 查询来料检验
|
||||
*
|
||||
* @param recordId 来料检验主键
|
||||
* @return 来料检验
|
||||
*/
|
||||
@Override
|
||||
@DS("#header.poolName")
|
||||
public QcCheckReportIncome selectQcCheckReportIncomeByRecordId(String recordId) {
|
||||
return qcCheckReportIncomeMapper.selectQcCheckReportIncomeByRecordId(recordId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询来料检验列表
|
||||
*
|
||||
* @param qcCheckReportIncome 来料检验
|
||||
* @return 来料检验
|
||||
*/
|
||||
@Override
|
||||
@DS("#header.poolName")
|
||||
public List<QcCheckReportIncome> selectQcCheckReportIncomeList(QcCheckReportIncome qcCheckReportIncome) {
|
||||
qcCheckReportIncome.setDelFlag("0");
|
||||
return qcCheckReportIncomeMapper.selectQcCheckReportIncomeList(qcCheckReportIncome);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增来料检验
|
||||
*
|
||||
* @param qcCheckReportIncome 来料检验
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
@DS("#header.poolName")
|
||||
public int insertQcCheckReportIncome(QcCheckReportIncome qcCheckReportIncome) {
|
||||
|
||||
String bpDD = DateUtils.parseDateToStr(DateUtils.YYYYMMDD, DateUtils.getNowDate());
|
||||
int liushuiNum = qcCheckReportIncomeMapper.getTodayMaxNum(qcCheckReportIncome);
|
||||
String liushuiStr = String.format("%04d", liushuiNum);
|
||||
|
||||
String createBy = SecurityUtils.getUsername();
|
||||
Date nowDate= DateUtils.getNowDate();
|
||||
//获取当前所选工厂
|
||||
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
|
||||
String key = "#header.poolName";
|
||||
String factoryCode = request.getHeader(key.substring(8)).replace("ds_","");
|
||||
|
||||
qcCheckReportIncome.setCheckNo(bpDD+liushuiStr);
|
||||
|
||||
/**qc_check_task_income**/
|
||||
String beLongId = IdUtils.fastSimpleUUID();
|
||||
qcCheckReportIncome.setRecordId(beLongId);
|
||||
qcCheckReportIncome.setFactoryCode(factoryCode);
|
||||
qcCheckReportIncome.setCreateTime(nowDate);
|
||||
qcCheckReportIncomeMapper.insertQcCheckReportIncome(qcCheckReportIncome);
|
||||
|
||||
/**取检测项**/
|
||||
QcCheckTypeProject qctp= new QcCheckTypeProject();
|
||||
qctp.setTypeId(qcCheckReportIncome.getCheckType());//生产过程检验
|
||||
qctp.setMaterialCode(qcCheckReportIncome.getMaterialCode());//特性
|
||||
/**qc_check_type_project**/
|
||||
List<QcCheckTaskDetail> items = qcCheckTypeProjectMapper.getTPByTypeMaterial(qctp);
|
||||
if(CollectionUtils.isEmpty(items)){
|
||||
/**qc_material_group_detail**/
|
||||
QcMaterialGroupDetail group = qcMaterialGroupDetailMapper.getGroupByMaterial(qcCheckReportIncome.getMaterialCode());
|
||||
if(group == null){
|
||||
return 0;//没有找到检测项目
|
||||
}
|
||||
qctp.setGroupId(group.getGroupId());//共性
|
||||
items = qcCheckTypeProjectMapper.getTPByTypeGroup(qctp);
|
||||
}
|
||||
|
||||
/**qc_check_task_detail**/
|
||||
if(CollectionUtils.isEmpty(items)){
|
||||
return 0;//没有找到检测项目
|
||||
}
|
||||
|
||||
for(QcCheckTaskDetail item:items){
|
||||
item.setRecordId(IdUtils.fastSimpleUUID());
|
||||
item.setBelongTo(beLongId);
|
||||
item.setCreateTime(nowDate);
|
||||
item.setCreateBy(createBy);
|
||||
item.setFactoryCode(factoryCode);
|
||||
item.setStatus("N");
|
||||
}
|
||||
return qcCheckTaskDetailMapper.addBatch(items);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改来料检验
|
||||
*
|
||||
* @param qcCheckReportIncome 来料检验
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
@DS("#header.poolName")
|
||||
public int updateQcCheckReportIncome(QcCheckReportIncome qcCheckReportIncome) {
|
||||
qcCheckReportIncome.setUpdateTime(DateUtils.getNowDate());
|
||||
return qcCheckReportIncomeMapper.updateQcCheckReportIncome(qcCheckReportIncome);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除来料检验
|
||||
*
|
||||
* @param recordIds 需要删除的来料检验主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
@DS("#header.poolName")
|
||||
public int deleteQcCheckReportIncomeByRecordIds(String[] recordIds) {
|
||||
return qcCheckReportIncomeMapper.deleteQcCheckReportIncomeByRecordIds(recordIds);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除来料检验信息
|
||||
*
|
||||
* @param recordId 来料检验主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
@DS("#header.poolName")
|
||||
public int deleteQcCheckReportIncomeByRecordId(String recordId) {
|
||||
return qcCheckReportIncomeMapper.deleteQcCheckReportIncomeByRecordId(recordId);
|
||||
}
|
||||
|
||||
@Override
|
||||
@DS("#header.poolName")
|
||||
public List<QcBomComponent> getQcListBom(QcBomComponent bomComponent) {
|
||||
return qcCheckReportIncomeMapper.getQcListBom(bomComponent);
|
||||
}
|
||||
|
||||
@Override
|
||||
@DS("#header.poolName")
|
||||
public List<QcSupplier> getQcListSupplier(QcSupplier qcSupplier) {
|
||||
return qcCheckReportIncomeMapper.getQcListSupplier(qcSupplier);
|
||||
}
|
||||
|
||||
//在公共库里不需要切库
|
||||
@Override
|
||||
public List<SysUser> getQcListUser(SysUser sysUser) {
|
||||
return qcCheckReportIncomeMapper.getQcListUser(sysUser);
|
||||
}
|
||||
|
||||
@Override
|
||||
@DS("#header.poolName")
|
||||
public int updateIncomeStatus(QcCheckReportIncome qcCheckReportIncome) {
|
||||
return qcCheckReportIncomeMapper.updateQcCheckReportIncome(qcCheckReportIncome);
|
||||
}
|
||||
|
||||
@Override
|
||||
@DS("#header.poolName")
|
||||
public List<QcCheckTaskDetail> getCkeckProjectList(QcCheckTaskDetail qcCheckTaskDetail) {
|
||||
return qcCheckReportIncomeMapper.getCkeckProjectList(qcCheckTaskDetail);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<QcCheckReportIncome> getPrintData(QcCheckReportIncome qcCheckReportIncome) {
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,247 @@
|
||||
<?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.op.quality.mapper.QcCheckReportIncomeMapper">
|
||||
|
||||
<resultMap type="QcCheckReportIncome" id="QcCheckReportIncomeResult">
|
||||
<result property="recordId" column="record_id" />
|
||||
<result property="checkNo" column="check_no" />
|
||||
<result property="incomeBatchNo" column="income_batch_no" />
|
||||
<result property="orderNo" column="order_no" />
|
||||
<result property="materialCode" column="material_code" />
|
||||
<result property="materialName" column="material_name" />
|
||||
<result property="quality" column="quality" />
|
||||
<result property="unit" column="unit" />
|
||||
<result property="supplierCode" column="supplier_code" />
|
||||
<result property="supplierName" column="supplier_name" />
|
||||
<result property="incomeTime" column="income_time" />
|
||||
<result property="checkLoc" column="check_loc" />
|
||||
<result property="checkStatus" column="check_status" />
|
||||
<result property="checkManCode" column="check_man_code" />
|
||||
<result property="checkManName" column="check_man_name" />
|
||||
<result property="checkTime" column="check_time" />
|
||||
<result property="checkResult" column="check_result" />
|
||||
<result property="status" column="status" />
|
||||
<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" />
|
||||
<result property="factoryCode" column="factory_code" />
|
||||
<result property="delFlag" column="del_flag" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectQcCheckReportIncomeVo">
|
||||
select record_id, check_no, income_batch_no, order_no, material_code, material_name, quality, unit, supplier_code, supplier_name, income_time, check_loc, check_status, check_man_code, check_man_name, check_time, check_result, status, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, factory_code, del_flag from qc_check_task
|
||||
</sql>
|
||||
|
||||
<select id="selectQcCheckReportIncomeList" parameterType="QcCheckReportIncome" resultMap="QcCheckReportIncomeResult">
|
||||
<include refid="selectQcCheckReportIncomeVo"/>
|
||||
<where>
|
||||
<if test="checkNo != null and checkNo != ''"> and check_no = #{checkNo}</if>
|
||||
<if test="incomeBatchNo != null and incomeBatchNo != ''"> and income_batch_no = #{incomeBatchNo}</if>
|
||||
<if test="orderNo != null and orderNo != ''"> and order_no = #{orderNo}</if>
|
||||
<if test="materialCode != null and materialCode != ''"> and material_code = #{materialCode}</if>
|
||||
<if test="materialName != null and materialName != ''"> and material_name like concat('%', #{materialName}, '%')</if>
|
||||
<if test="quality != null "> and quality = #{quality}</if>
|
||||
<if test="unit != null and unit != ''"> and unit = #{unit}</if>
|
||||
<if test="supplierCode != null and supplierCode != ''"> and supplier_code = #{supplierCode}</if>
|
||||
<if test="supplierName != null and supplierName != ''"> and supplier_name like concat('%', #{supplierName}, '%')</if>
|
||||
<if test="incomeTime != null "> and income_time = #{incomeTime}</if>
|
||||
<if test="checkLoc != null and checkLoc != ''"> and check_loc = #{checkLoc}</if>
|
||||
<if test="checkStatus != null and checkStatus != ''"> and check_status = #{checkStatus}</if>
|
||||
<if test="checkManCode != null and checkManCode != ''"> and check_man_code = #{checkManCode}</if>
|
||||
<if test="checkManName != null and checkManName != ''"> and check_man_name like concat('%', #{checkManName}, '%')</if>
|
||||
<if test="checkTime != null "> and check_time = #{checkTime}</if>
|
||||
<if test="checkResult != null and checkResult != ''"> and check_result = #{checkResult}</if>
|
||||
<if test="status != null and status != ''"> and status = #{status}</if>
|
||||
<if test="delFlag != null and delFlag != ''"> and del_flag = #{delFlag}</if>
|
||||
<if test="attr1 != null and attr1 != ''"> and attr1 = #{attr1}</if>
|
||||
<if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if>
|
||||
<if test="attr3 != null and attr3 != ''"> and attr3 = #{attr3}</if>
|
||||
<if test="attr4 != null and attr4 != ''"> and attr4 = #{attr4}</if>
|
||||
<if test="factoryCode != null and factoryCode != ''"> and factory_code = #{factoryCode}</if>
|
||||
<if test="incomeTimeStart != null "> and CONVERT(varchar(30),income_time, 120) >= #{incomeTimeStart}</if>
|
||||
<if test="incomeTimeEnd != null "> and #{incomeTimeEnd} > CONVERT(varchar(30),income_time, 120)</if>
|
||||
<if test="checkTimeStart != null "> and CONVERT(varchar(30),check_time, 120) >= #{checkTimeStart}</if>
|
||||
<if test="checkTimeEnd != null "> and #{checkTimeEnd} > CONVERT(varchar(30),check_time, 120)</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectQcCheckReportIncomeByRecordId" parameterType="String" resultMap="QcCheckReportIncomeResult">
|
||||
<include refid="selectQcCheckReportIncomeVo"/>
|
||||
where record_id = #{recordId}
|
||||
</select>
|
||||
|
||||
<select id="getQcListBom" resultType="com.op.quality.domain.QcBomComponent">
|
||||
select product_code component,product_desc_zh componentName
|
||||
from base_product
|
||||
where del_flag = '0'
|
||||
<if test="component != null and component != ''"> and product_code like concat('%', #{component}, '%')</if>
|
||||
<if test="componentName != null and componentName != ''"> and product_desc_zh like concat('%', #{componentName}, '%')</if>
|
||||
</select>
|
||||
|
||||
<select id="getQcListSupplier" resultType="com.op.quality.domain.QcSupplier">
|
||||
select supplier_code supplierCode,
|
||||
zh_desc supplierName,
|
||||
address,
|
||||
contact_phone contactPhone
|
||||
from base_supplier where active_flag = '1' and del_flag ='0'
|
||||
<if test="supplierCode != null and supplierCode != ''"> and supplier_code like concat('%', #{supplierCode}, '%')</if>
|
||||
<if test="supplierName != null and supplierName != ''"> and zh_desc like concat('%', #{supplierName}, '%')</if>
|
||||
</select>
|
||||
|
||||
<select id="getQcListUser" resultType="com.op.system.api.domain.SysUser">
|
||||
select user_id userId,
|
||||
user_name userCode,
|
||||
nick_name userName,
|
||||
phonenumber
|
||||
from sys_user where del_flag = '0' and status = '0'
|
||||
<if test="userCode != null and userCode != ''"> and user_name like concat('%', #{userCode}, '%')</if>
|
||||
<if test="userName != null and userName != ''"> and nick_name like concat('%', #{userName}, '%')</if>
|
||||
</select>
|
||||
|
||||
<select id="getTodayMaxNum" resultType="java.lang.Integer">
|
||||
select count(0)+1
|
||||
from qc_check_task
|
||||
where CONVERT(varchar(10),create_time, 120) = CONVERT(varchar(10),GETDATE(), 120)
|
||||
</select>
|
||||
|
||||
<select id="getCkeckProjectList" resultType="com.op.quality.domain.QcCheckTaskDetail">
|
||||
select td.record_id recordId,
|
||||
td.project_id projectId,
|
||||
td.project_no projectNo,
|
||||
td.rule_name ruleName,
|
||||
td.property_code propertyCode,
|
||||
td.check_mode checkMode,
|
||||
td.check_tool checkTool,
|
||||
td.unit_code unitCode,
|
||||
td.check_standard checkStandard,
|
||||
td.actual_value actualValue,
|
||||
td.status,
|
||||
td.remark,
|
||||
td.create_by createBy,
|
||||
td.create_time createTime,
|
||||
td.update_by updateBy,
|
||||
td.update_time updateTime,
|
||||
qctp.upper_diff upperDiff,
|
||||
qctp.down_diff downDiff,
|
||||
qctp.sample
|
||||
from qc_check_task_detail td
|
||||
left join qc_check_type_project qctp on td.type_project_id = qctp.id
|
||||
where td.belong_to = #{recordId}
|
||||
</select>
|
||||
|
||||
<insert id="insertQcCheckReportIncome" parameterType="QcCheckReportIncome">
|
||||
insert into qc_check_task
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="recordId != null">record_id,</if>
|
||||
<if test="checkNo != null">check_no,</if>
|
||||
<if test="incomeBatchNo != null">income_batch_no,</if>
|
||||
<if test="orderNo != null">order_no,</if>
|
||||
<if test="materialCode != null">material_code,</if>
|
||||
<if test="materialName != null">material_name,</if>
|
||||
<if test="quality != null">quality,</if>
|
||||
<if test="unit != null">unit,</if>
|
||||
<if test="supplierCode != null">supplier_code,</if>
|
||||
<if test="supplierName != null">supplier_name,</if>
|
||||
<if test="incomeTime != null">income_time,</if>
|
||||
<if test="checkLoc != null">check_loc,</if>
|
||||
<if test="checkStatus != null">check_status,</if>
|
||||
<if test="checkManCode != null">check_man_code,</if>
|
||||
<if test="checkManName != null">check_man_name,</if>
|
||||
<if test="checkTime != null">check_time,</if>
|
||||
<if test="checkResult != null">check_result,</if>
|
||||
<if test="status != null">status,</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>
|
||||
<if test="factoryCode != null and factoryCode != ''">factory_code,</if>
|
||||
<if test="delFlag != null">del_flag,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="recordId != null">#{recordId},</if>
|
||||
<if test="checkNo != null">#{checkNo},</if>
|
||||
<if test="incomeBatchNo != null">#{incomeBatchNo},</if>
|
||||
<if test="orderNo != null">#{orderNo},</if>
|
||||
<if test="materialCode != null">#{materialCode},</if>
|
||||
<if test="materialName != null">#{materialName},</if>
|
||||
<if test="quality != null">#{quality},</if>
|
||||
<if test="unit != null">#{unit},</if>
|
||||
<if test="supplierCode != null">#{supplierCode},</if>
|
||||
<if test="supplierName != null">#{supplierName},</if>
|
||||
<if test="incomeTime != null">#{incomeTime},</if>
|
||||
<if test="checkLoc != null">#{checkLoc},</if>
|
||||
<if test="checkStatus != null">#{checkStatus},</if>
|
||||
<if test="checkManCode != null">#{checkManCode},</if>
|
||||
<if test="checkManName != null">#{checkManName},</if>
|
||||
<if test="checkTime != null">#{checkTime},</if>
|
||||
<if test="checkResult != null">#{checkResult},</if>
|
||||
<if test="status != null">#{status},</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>
|
||||
<if test="factoryCode != null and factoryCode != ''">#{factoryCode},</if>
|
||||
<if test="delFlag != null">#{delFlag},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateQcCheckReportIncome" parameterType="QcCheckReportIncome">
|
||||
update qc_check_task
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="checkNo != null">check_no = #{checkNo},</if>
|
||||
<if test="incomeBatchNo != null">income_batch_no = #{incomeBatchNo},</if>
|
||||
<if test="orderNo != null">order_no = #{orderNo},</if>
|
||||
<if test="materialCode != null">material_code = #{materialCode},</if>
|
||||
<if test="materialName != null">material_name = #{materialName},</if>
|
||||
<if test="quality != null">quality = #{quality},</if>
|
||||
<if test="unit != null">unit = #{unit},</if>
|
||||
<if test="supplierCode != null">supplier_code = #{supplierCode},</if>
|
||||
<if test="supplierName != null">supplier_name = #{supplierName},</if>
|
||||
<if test="incomeTime != null">income_time = #{incomeTime},</if>
|
||||
<if test="checkLoc != null">check_loc = #{checkLoc},</if>
|
||||
<if test="checkStatus != null">check_status = #{checkStatus},</if>
|
||||
<if test="checkManCode != null">check_man_code = #{checkManCode},</if>
|
||||
<if test="checkManName != null">check_man_name = #{checkManName},</if>
|
||||
<if test="checkTime != null">check_time = #{checkTime},</if>
|
||||
<if test="checkResult != null">check_result = #{checkResult},</if>
|
||||
<if test="status != null">status = #{status},</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>
|
||||
<if test="factoryCode != null and factoryCode != ''">factory_code = #{factoryCode},</if>
|
||||
<if test="delFlag != null">del_flag = #{delFlag},</if>
|
||||
</trim>
|
||||
where record_id = #{recordId}
|
||||
</update>
|
||||
|
||||
<delete id="deleteQcCheckReportIncomeByRecordId" parameterType="String">
|
||||
delete from qc_check_task where record_id = #{recordId}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteQcCheckReportIncomeByRecordIds" parameterType="String">
|
||||
delete from qc_check_task where record_id in
|
||||
<foreach item="recordId" collection="array" open="(" separator="," close=")">
|
||||
#{recordId}
|
||||
</foreach>
|
||||
</delete>
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue