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 |   67 ++++++++++++++++++++++++---------
 1 files changed, 49 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 d8d7fd8..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
@@ -4,6 +4,7 @@
 
 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;
@@ -15,6 +16,7 @@
  * @author ruimin
  * @date 2023-12-11
  */
+@Data
 public class OmProductionOrdeInfo extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -142,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;
@@ -164,7 +170,7 @@
 
     /** 甯傚満鍖哄煙缂栫爜 */
     @Excel(name = "甯傚満鍖哄煙缂栫爜")
-    private String marketAreaCode;
+    private String materialCode;
 
     /** 杞欢鐗堟湰缂栫爜 */
     @Excel(name = "杞欢鐗堟湰缂栫爜")
@@ -175,7 +181,7 @@
     private String productCompanyCode;
 
     /** 棰勭暀瀛楁1 */
-    private String spareField1;
+    private String trolleyYard;
 
     /** 棰勭暀瀛楁2 */
     private String spareField2;
@@ -186,11 +192,38 @@
     /** 棰勭暀瀛楁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;
@@ -526,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;
     }
@@ -553,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;
     }
@@ -624,10 +657,8 @@
             .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())

--
Gitblit v1.9.3