yinq
/
aucma-mes-back
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change - 设备台账

Browse Source
master
yinq 12 months ago
parent 7e8f989e98
commit 6e4c6a06ca
2 changed files with 141 additions and 87 deletions
Show Stats Download Patch File Download Diff File

27
aucma-base/src/main/java/com/aucma/base/domain/BaseDeviceLedger.java
Unescape Escape View File

@ -83,6 +83,18 @@ public class BaseDeviceLedger extends BaseEntity {
@Excel(name = "所属工位") @Excel(name = "所属工位")
private String productLineCode; private String productLineCode;
/**
* 工厂编号
*/
@Excel(name = "工厂编号")
private String factoryCode;
/**
* 工厂名称
*/
@Excel(name = "工厂名称")
private String factoryName;
/** /**
* 启用标识 * 启用标识
*/ */
@ -115,6 +127,21 @@ public class BaseDeviceLedger extends BaseEntity {
@Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date updatedTime; private Date updatedTime;
public String getFactoryName() {
return factoryName;
}
public void setFactoryName(String factoryName) {
this.factoryName = factoryName;
}
public String getFactoryCode() {
return factoryCode;
}
public void setFactoryCode(String factoryCode) {
this.factoryCode = factoryCode;
}
public String getCostCenter() { public String getCostCenter() {
return costCenter; return costCenter;

103
aucma-base/src/main/resources/mapper/base/BaseDeviceLedgerMapper.xml
Unescape Escape View File

@ -5,45 +5,67 @@
<mapper namespace="com.aucma.base.mapper.BaseDeviceLedgerMapper"> <mapper namespace="com.aucma.base.mapper.BaseDeviceLedgerMapper">
<resultMap type="BaseDeviceLedger" id="BaseDeviceLedgerResult"> <resultMap type="BaseDeviceLedger" id="BaseDeviceLedgerResult">
<result property="objId" column="obj_id" /> <result property="objId" column="obj_id"/>
<result property="deviceCode" column="device_code" /> <result property="deviceCode" column="device_code"/>
<result property="deviceName" column="device_name" /> <result property="deviceName" column="device_name"/>
<result property="deviceModel" column="device_model" /> <result property="deviceModel" column="device_model"/>
<result property="deviceType" column="device_type" /> <result property="deviceType" column="device_type"/>
<result property="deviceAddress" column="device_address" /> <result property="deviceAddress" column="device_address"/>
<result property="deviceStatus" column="device_status" /> <result property="deviceStatus" column="device_status"/>
<result property="usedDepartment" column="used_department" /> <result property="usedDepartment" column="used_department"/>
<result property="productLineCode" column="product_line_code" /> <result property="productLineCode" column="product_line_code"/>
<result property="costCenter" column="cost_center" /> <result property="costCenter" column="cost_center"/>
<result property="manufacturer" column="manufacturer" /> <result property="manufacturer" column="manufacturer"/>
<result property="enableDate" column="enable_date" /> <result property="enableDate" column="enable_date"/>
<result property="isFlag" column="is_flag" /> <result property="isFlag" column="is_flag"/>
<result property="createdBy" column="created_by" /> <result property="createdBy" column="created_by"/>
<result property="createdTime" column="created_time" /> <result property="createdTime" column="created_time"/>
<result property="updatedBy" column="updated_by" /> <result property="updatedBy" column="updated_by"/>
<result property="updatedTime" column="updated_time" /> <result property="updatedTime" column="updated_time"/>
<result property="factoryCode" column="factory_code"/>
</resultMap> </resultMap>
<sql id="selectBaseDeviceLedgerVo"> <sql id="selectBaseDeviceLedgerVo">
select obj_id, device_code, device_name, device_model, device_type, device_address, device_status, used_department, cost_center, manufacturer, enable_date,product_line_code, is_flag, created_by, created_time, updated_by, updated_time from base_deviceledger select obj_id,
device_code,
device_name,
device_model,
device_type,
device_address,
device_status,
used_department,
cost_center,
manufacturer,
enable_date,
product_line_code,
factory_code,
is_flag,
created_by,
created_time,
updated_by,
updated_time
from base_deviceledger
</sql> </sql>
<select id="selectBaseDeviceLedgerList" parameterType="BaseDeviceLedger" resultMap="BaseDeviceLedgerResult"> <select id="selectBaseDeviceLedgerList" parameterType="BaseDeviceLedger" resultMap="BaseDeviceLedgerResult">
<include refid="selectBaseDeviceLedgerVo"/> <include refid="selectBaseDeviceLedgerVo"/>
<where> <where>
<if test="deviceCode != null and deviceCode != ''"> and device_code = #{deviceCode}</if> <if test="deviceCode != null and deviceCode != ''">and device_code = #{deviceCode}</if>
<if test="deviceName != null and deviceName != ''"> and device_name like concat(concat('%', #{deviceName}), '%')</if> <if test="deviceName != null and deviceName != ''">and device_name like concat(concat('%', #{deviceName}),
<if test="deviceModel != null and deviceModel != ''"> and device_model = #{deviceModel}</if> '%')
<if test="deviceType != null "> and device_type = #{deviceType}</if> </if>
<if test="deviceAddress != null and deviceAddress != ''"> and device_address = #{deviceAddress}</if> <if test="deviceModel != null and deviceModel != ''">and device_model = #{deviceModel}</if>
<if test="deviceStatus != null "> and device_status = #{deviceStatus}</if> <if test="deviceType != null ">and device_type = #{deviceType}</if>
<if test="usedDepartment != null and usedDepartment != ''"> and used_department = #{usedDepartment}</if> <if test="deviceAddress != null and deviceAddress != ''">and device_address = #{deviceAddress}</if>
<if test="productLineCode != null and productLineCode != ''"> and product_line_code = #{productLineCode}</if> <if test="deviceStatus != null ">and device_status = #{deviceStatus}</if>
<if test="isFlag != null "> and is_flag = #{isFlag}</if> <if test="usedDepartment != null and usedDepartment != ''">and used_department = #{usedDepartment}</if>
<if test="createdBy != null and createdBy != ''"> and created_by = #{createdBy}</if> <if test="productLineCode != null and productLineCode != ''">and product_line_code = #{productLineCode}
<if test="createdTime != null "> and created_time = #{createdTime}</if> </if>
<if test="updatedBy != null and updatedBy != ''"> and updated_by = #{updatedBy}</if> <if test="isFlag != null ">and is_flag = #{isFlag}</if>
<if test="updatedTime != null "> and updated_time = #{updatedTime}</if> <if test="createdBy != null and createdBy != ''">and created_by = #{createdBy}</if>
<if test="createdTime != null ">and created_time = #{createdTime}</if>
<if test="updatedBy != null and updatedBy != ''">and updated_by = #{updatedBy}</if>
<if test="updatedTime != null ">and updated_time = #{updatedTime}</if>
</where> </where>
</select> </select>
@ -70,6 +92,7 @@
<if test="costCenter != null">cost_center,</if> <if test="costCenter != null">cost_center,</if>
<if test="manufacturer != null">manufacturer,</if> <if test="manufacturer != null">manufacturer,</if>
<if test="enableDate != null">enable_date,</if> <if test="enableDate != null">enable_date,</if>
<if test="factoryCode != null">factory_code,</if>
<if test="isFlag != null">is_flag,</if> <if test="isFlag != null">is_flag,</if>
<if test="createdBy != null">created_by,</if> <if test="createdBy != null">created_by,</if>
<if test="createdTime != null">created_time,</if> <if test="createdTime != null">created_time,</if>
@ -86,9 +109,10 @@
<if test="deviceStatus != null">#{deviceStatus},</if> <if test="deviceStatus != null">#{deviceStatus},</if>
<if test="usedDepartment != null">#{usedDepartment},</if> <if test="usedDepartment != null">#{usedDepartment},</if>
<if test="productLineCode != null">#{productLineCode},</if> <if test="productLineCode != null">#{productLineCode},</if>
<if test="costCenter != null">cost_center,</if> <if test="costCenter != null">#{costCenter},</if>
<if test="manufacturer != null">manufacturer,</if> <if test="manufacturer != null">#{manufacturer},</if>
<if test="enableDate != null">enable_date,</if> <if test="enableDate != null">#{enableDate},</if>
<if test="factoryCode != null">#{factoryCode},</if>
<if test="isFlag != null">#{isFlag},</if> <if test="isFlag != null">#{isFlag},</if>
<if test="createdBy != null">#{createdBy},</if> <if test="createdBy != null">#{createdBy},</if>
<if test="createdTime != null">#{createdTime},</if> <if test="createdTime != null">#{createdTime},</if>
@ -107,10 +131,11 @@
<if test="deviceAddress != null">device_address = #{deviceAddress},</if> <if test="deviceAddress != null">device_address = #{deviceAddress},</if>
<if test="deviceStatus != null">device_status = #{deviceStatus},</if> <if test="deviceStatus != null">device_status = #{deviceStatus},</if>
<if test="usedDepartment != null">used_department = #{usedDepartment},</if> <if test="usedDepartment != null">used_department = #{usedDepartment},</if>
<if test="costCenter != null">#{costCenter},</if> <if test="costCenter != null">cost_center = #{costCenter},</if>
<if test="manufacturer != null">#{manufacturer},</if> <if test="manufacturer != null">manufacturer = #{manufacturer},</if>
<if test="enableDate != null">#{enableDate},</if> <if test="enableDate != null">enable_date = #{enableDate},</if>
<if test="productLineCode != null">product_line_code = #{productLineCode},</if> <if test="productLineCode != null">product_line_code = #{productLineCode},</if>
<if test="factoryCode != null">factory_code = #{factoryCode},</if>
<if test="isFlag != null">is_flag = #{isFlag},</if> <if test="isFlag != null">is_flag = #{isFlag},</if>
<if test="createdBy != null">created_by = #{createdBy},</if> <if test="createdBy != null">created_by = #{createdBy},</if>
<if test="createdTime != null">created_time = #{createdTime},</if> <if test="createdTime != null">created_time = #{createdTime},</if>
@ -121,7 +146,9 @@
</update> </update>
<delete id="deleteBaseDeviceLedgerByObjId" parameterType="Long"> <delete id="deleteBaseDeviceLedgerByObjId" parameterType="Long">
delete from base_deviceledger where obj_id = #{objId} delete
from base_deviceledger
where obj_id = #{objId}
</delete> </delete>
<delete id="deleteBaseDeviceLedgerByObjIds" parameterType="String"> <delete id="deleteBaseDeviceLedgerByObjIds" parameterType="String">

Write Preview
Loading…
Cancel
Save