From 6d313a4a6f9f9d7ea65ec50ab0d4491e595edb97 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期二, 15 十月 2024 09:47:26 +0800
Subject: [PATCH] -打印bug修改
---
jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java | 152 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 134 insertions(+), 18 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java
index 6a51915..5843a16 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java
@@ -1,7 +1,10 @@
package com.jcdm.main.om.productionOrde.domain;
import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.jcdm.common.annotation.Excel;
@@ -13,12 +16,33 @@
* @author ruimin
* @date 2023-12-11
*/
+@Data
public class OmProductionOrdeInfo extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** ID */
private Long id;
+
+ @Excel(name = "鏄惁鎶ュ伐")
+ private String sfResult;
+
+ @Excel(name = "鎶ュ伐缁撴灉浠ｇ爜锛圫鎴愬姛锛孎澶辫触锛�")
+ private String resultCode;
+
+ @Excel(name = "鎶ュ伐淇℃伅缁撴灉")
+ private String resultText;
+
+ @Excel(name = "宸ョ珯缂栧彿")
+ private String stationCode;
+
+
+
+ @Excel(name = "浜у搧搴忓垪鍙�")
+ private String productNum;
+
+ @Excel(name = "宸ュ巶缂栧彿")
+ private String siteCode;
/** 鐢熶骇宸ュ崟鍙� */
@Excel(name = "鐢熶骇宸ュ崟鍙�")
@@ -80,9 +104,15 @@
@Excel(name = "瀹為檯涓婄嚎鏁伴噺")
private Long actualOnlineQty;
+ /** 浜у搧鍨嬪彿 */
+ @Excel(name = "浜у搧鍨嬪彿")
+ private String productModel;
+
+
/** 涓婄嚎瀹屽伐鏍囪 */
private String onlineCompletionMark;
+ @TableField(exist = false)
private Long frontEndId;
/** 闇�姹傛棩鏈� */
@@ -114,6 +144,10 @@
@Excel(name = "宸ュ崟鐘舵��", readConverterExp = "1=鍒涘缓銆�2宸插彂甯冦��3鐢熶骇涓��4宸插喕缁撱��5宸插畬宸ャ��6宸插叧闂�")
private String orderStatus;
+ /** 鍒涘缓鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
/** 鍒涘缓浜� */
@Excel(name = "鍒涘缓浜�")
private String createUser;
@@ -136,7 +170,7 @@
/** 甯傚満鍖哄煙缂栫爜 */
@Excel(name = "甯傚満鍖哄煙缂栫爜")
- private String marketAreaCode;
+ private String materialCode;
/** 杞欢鐗堟湰缂栫爜 */
@Excel(name = "杞欢鐗堟湰缂栫爜")
@@ -147,7 +181,7 @@
private String productCompanyCode;
/** 棰勭暀瀛楁1 */
- private String spareField1;
+ private String trolleyYard;
/** 棰勭暀瀛楁2 */
private String spareField2;
@@ -158,10 +192,88 @@
/** 棰勭暀瀛楁4 */
private String spareField4;
+ /** 鑷姩绔檔g鏍囪锛岀敤浜庤繑淇ˉ鏁版嵁 */
+ @Excel(name = "鑷姩绔檔g鏍囪锛岀敤浜庤繑淇ˉ鏁版嵁")
+ private String automaticNgFlag;
+
+ /** 鑷姩绔檔g宸ヤ綅 */
+ @Excel(name = "鑷姩绔檔g宸ヤ綅")
+ private String automaticNgStation;
+
+ /** 鑷姩绔檔g铻轰笣鍙� */
+ @Excel(name = "鑷姩绔檔g铻轰笣鍙�")
+ private String automaticNgScrewNumber;
+
+ /** 浜哄伐绔檔g鏍囪 */
+ @Excel(name = "浜哄伐绔檔g鏍囪")
+ private String artificialNgFlag;
+
+ @TableField(exist = false)
private Long[] idNums;
+ @TableField(exist = false)
private String flag;
+
+ @Override
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ @Override
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getProductModel() {
+ return productModel;
+ }
+
+ public void setProductModel(String productModel) {
+ this.productModel = productModel;
+ }
+
+ public String getSfResult() {
+ return sfResult;
+ }
+
+ public void setSfResult(String sfResult) {
+ this.sfResult = sfResult;
+ }
+
+ public String getResultCode() {
+ return resultCode;
+ }
+
+ public void setResultCode(String resultCode) {
+ this.resultCode = resultCode;
+ }
+
+ public String getResultText() {
+ return resultText;
+ }
+
+ public void setResultText(String resultText) {
+ this.resultText = resultText;
+ }
+
+ public String getStationCode() {
+ return stationCode;
+ }
+
+ public void setStationCode(String stationCode) {
+ this.stationCode = stationCode;
+ }
+
+ public String getProductNum() {
+ return productNum;
+ }
+
+ public void setProductNum(String productNum) {
+ this.productNum = productNum;
+ }
+ public String getSiteCode() {return siteCode;}
+ public void setSiteCode(String siteCode) {this.siteCode = siteCode;}
public String getFlag() {
return flag;
}
@@ -447,16 +559,16 @@
{
return custom;
}
- public void setMarketAreaCode(String marketAreaCode)
- {
- this.marketAreaCode = marketAreaCode;
+
+ public String getMaterialCode() {
+ return materialCode;
}
- public String getMarketAreaCode()
- {
- return marketAreaCode;
+ public void setMaterialCode(String materialCode) {
+ this.materialCode = materialCode;
}
- public void setSoftwareVersionCode(String softwareVersionCode)
+
+ public void setSoftwareVersionCode(String softwareVersionCode)
{
this.softwareVersionCode = softwareVersionCode;
}
@@ -474,16 +586,16 @@
{
return productCompanyCode;
}
- public void setSpareField1(String spareField1)
- {
- this.spareField1 = spareField1;
+
+ public String getTrolleyYard() {
+ return trolleyYard;
}
- public String getSpareField1()
- {
- return spareField1;
+ public void setTrolleyYard(String trolleyYard) {
+ this.trolleyYard = trolleyYard;
}
- public void setSpareField2(String spareField2)
+
+ public void setSpareField2(String spareField2)
{
this.spareField2 = spareField2;
}
@@ -545,13 +657,17 @@
.append("remarks", getRemarks())
.append("streamNumber", getStreamNumber())
.append("custom", getCustom())
- .append("marketAreaCode", getMarketAreaCode())
.append("softwareVersionCode", getSoftwareVersionCode())
.append("productCompanyCode", getProductCompanyCode())
- .append("spareField1", getSpareField1())
.append("spareField2", getSpareField2())
.append("spareField3", getSpareField3())
.append("spareField4", getSpareField4())
+ .append("siteCode", getSiteCode())
+ .append("productNum", getProductNum())
+ .append("stationCode", getStationCode())
+ .append("resultCode", getResultCode())
+ .append("resultText", getResultText())
+ .append("sfResult", getSfResult())
.toString();
}
}
--
Gitblit v1.9.3