rfid流程修改

highway
陈恒杰 1 year ago
parent 9bb46f6a5e
commit dbd3b16007

@ -54,7 +54,7 @@ public class ProRfidProcessDetail extends BaseEntity {
/** 出时间 */ /** 出时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "出时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "出时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date outTime; private Date outTime;
/** 状态0待办1完成 */ /** 状态0待办1完成 */
@ -107,6 +107,39 @@ public class ProRfidProcessDetail extends BaseEntity {
@Excel(name = "订单号") @Excel(name = "订单号")
private String orderCode; private String orderCode;
@Excel(name = "产品编码")
private String productName;
@Excel(name = "生产时间")
private String productDate;
@Excel(name = "班次")
private String shiftId;
public String getShiftId() {
return shiftId;
}
public void setShiftId(String shiftId) {
this.shiftId = shiftId;
}
public String getProductDate() {
return productDate;
}
public void setProductDate(String productDate) {
this.productDate = productDate;
}
public String getProductName() {
return productName;
}
public void setProductName(String productName) {
this.productName = productName;
}
public String getOrderCode() { public String getOrderCode() {
return orderCode; return orderCode;
} }
@ -288,29 +321,35 @@ public class ProRfidProcessDetail extends BaseEntity {
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return "ProRfidProcessDetail{" +
.append("recordId", getRecordId()) "recordId='" + recordId + '\'' +
.append("workorderCode", getWorkorderCode()) ", workorderCode='" + workorderCode + '\'' +
.append("rfid", getRfid()) ", rfid='" + rfid + '\'' +
.append("factoryCode", getFactoryCode()) ", factoryCode='" + factoryCode + '\'' +
.append("machineCode", getMachineCode()) ", machineCode='" + machineCode + '\'' +
.append("nowProcessId", getNowProcessId()) ", prodLineCode='" + prodLineCode + '\'' +
.append("nextProcessId", getNextProcessId()) ", nowProcessId='" + nowProcessId + '\'' +
.append("orderNum", getOrderNum()) ", nextProcessId='" + nextProcessId + '\'' +
.append("inTime", getInTime()) ", orderNum=" + orderNum +
.append("outTime", getOutTime()) ", inTime=" + inTime +
.append("status", getStatus()) ", outTime=" + outTime +
.append("remark", getRemark()) ", status='" + status + '\'' +
.append("attr1", getAttr1()) ", attr1='" + attr1 + '\'' +
.append("attr2", getAttr2()) ", attr2='" + attr2 + '\'' +
.append("attr3", getAttr3()) ", attr3='" + attr3 + '\'' +
.append("attr4", getAttr4()) ", attr4='" + attr4 + '\'' +
.append("createBy", getCreateBy()) ", workBatchCode='" + workBatchCode + '\'' +
.append("createTime", getCreateTime()) ", bindStatus='" + bindStatus + '\'' +
.append("updateBy", getUpdateBy()) ", productCode='" + productCode + '\'' +
.append("updateTime", getUpdateTime()) ", productModel='" + productModel + '\'' +
.append("workBatchCode", getWorkBatchCode()) ", nowProcessCode='" + nowProcessCode + '\'' +
.append("bindStatus", getBindStatus()) ", nowProcessName='" + nowProcessName + '\'' +
.toString(); ", nextProcessCode='" + nextProcessCode + '\'' +
", nextProcessName='" + nextProcessName + '\'' +
", orderCode='" + orderCode + '\'' +
", productName='" + productName + '\'' +
", productDate='" + productDate + '\'' +
", shiftId='" + shiftId + '\'' +
'}';
} }
} }

@ -64,11 +64,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
pp.process_name as nextProcessName, pp.process_name as nextProcessName,
ppp.process_code as nowProcessCode, ppp.process_code as nowProcessCode,
ppp.process_name as nowProcessName, ppp.process_name as nowProcessName,
pow.order_code as orderCode pow.order_code as orderCode,
pow.product_code as productCode,
pow.product_name as productName,
pow.product_date as productDate,
pow.shift_id as shiftId
from pro_rfid_process_detail ppd from pro_rfid_process_detail ppd
left join pro_process pp on pp.process_id = ppd.next_process_id left join pro_process pp on pp.process_id = ppd.next_process_id
left join pro_process ppp on ppp.process_id = ppd.now_process_id left join pro_process ppp on ppp.process_id = ppd.now_process_id
left join pro_order_workorder pow on pow.workorder_code = ppd.workorder_code left join pro_order_workorder pow on pow.workorder_code = ppd.workorder_code
order by ppd.in_time desc
<where> <where>
<if test="workorderCode != null and workorderCode != ''"> and ppd.workorder_code like concat('%', #{workorderCode}, '%')</if> <if test="workorderCode != null and workorderCode != ''"> and ppd.workorder_code like concat('%', #{workorderCode}, '%')</if>
<if test="rfid != null and rfid != ''"> and rfid like concat('%', #{rfid}, '%')</if> <if test="rfid != null and rfid != ''"> and rfid like concat('%', #{rfid}, '%')</if>

Loading…
Cancel
Save