From 2c65c31aceb16c1d06c692266e3fb555ecafdfb5 Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期三, 23 十月 2024 09:10:47 +0800
Subject: [PATCH] change-4
---
jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/domain/BsOrderScheduling.java | 44 +++++++++++---------------------------------
1 files changed, 11 insertions(+), 33 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/domain/BsOrderScheduling.java b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/domain/BsOrderScheduling.java
index 5e67680..58b3798 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/domain/BsOrderScheduling.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/domain/BsOrderScheduling.java
@@ -73,106 +73,86 @@
private String model;
/** 鐢熶骇鐘舵�� */
- @Excel(name = "鐢熶骇鐘舵��")
private String productionStatus;
@ExcelProperty(value = "鐢熶骇鐘舵��", index = 4)
private String productionStatusString;
/** 宸ユ椂 */
- @Excel(name = "宸ユ椂")
- @ExcelProperty(value = "宸ユ椂", index = 5)
+ @ExcelIgnore
private String workingHours;
@TableField(exist = false)
private Integer workingHoursInt;
/** 褰撳墠宸ヤ綅 */
- @Excel(name = "褰撳墠宸ヤ綅")
- @ExcelProperty(value = "褰撳墠宸ヤ綅", index = 6)
+ @ExcelIgnore
private String currentWorkstation;
/** 璐ㄩ噺鐘舵�� */
- @Excel(name = "璐ㄩ噺鐘舵��")
- @ExcelProperty(value = "璐ㄩ噺鐘舵��", index = 7)
+ @ExcelProperty(value = "璐ㄩ噺鐘舵��", index = 5)
private String qualityStatus;
/** 鏄惁鎵撳嵃 */
- @Excel(name = "鏄惁鎵撳嵃")
private String whetherOrPrint;
/** 10鎶ュ伐 */
- @Excel(name = "10鎶ュ伐")
@ExcelIgnore
private String report10;
/** 20鎶ュ伐 */
- @Excel(name = "20鎶ュ伐")
@ExcelIgnore
private String report20;
/** 鍚堢涓婄嚎 */
- @Excel(name = "鍚堢涓婄嚎")
@ExcelIgnore
private String combinedBoxTime;
/** 鎬昏涓嬬嚎 */
- @Excel(name = "鎬昏涓嬬嚎")
@ExcelIgnore
private String finalAssemblyTime;
/** 鎿嶄綔浜� */
- @Excel(name = "鎿嶄綔浜�")
- @ExcelProperty(value = "鎿嶄綔浜�", index = 14)
+ @ExcelProperty(value = "鎿嶄綔浜�", index = 10)
private String operator;
/** 鎿嶄綔鏃堕棿 */
- @Excel(name = "鎿嶄綔鏃堕棿")
- @ExcelProperty(value = "鎿嶄綔鏃堕棿", index = 15)
+ @ExcelProperty(value = "鎿嶄綔鏃堕棿", index = 11)
private String operateTime;
/** 鐘舵�� */
- @Excel(name = "鐘舵��")
@ExcelIgnore
private String status;
/** 棰勭暀瀛楁1 */
- @Excel(name = "棰勭暀瀛楁1")
@ExcelIgnore
private String spareField1;
/** 棰勭暀瀛楁2 */
- @Excel(name = "棰勭暀瀛楁2")
@ExcelIgnore
private String spareField2;
/** 棰勭暀瀛楁3 */
- @Excel(name = "棰勭暀瀛楁3")
@ExcelIgnore
private String spareField3;
/** 棰勭暀瀛楁4 */
- @Excel(name = "棰勭暀瀛楁4")
@ExcelIgnore
private String spareField4;
/** 鍒涘缓鐢ㄦ埛 */
- @Excel(name = "鍒涘缓鐢ㄦ埛")
@ExcelIgnore
private String createUser;
/** 鏇存敼鐢ㄦ埛 */
- @Excel(name = "鏇存敼鐢ㄦ埛")
@ExcelIgnore
private String updateUser;
/** 澶囨敞 */
- @Excel(name = "澶囨敞")
@ExcelIgnore
private String remarks;
/** CVT鎶ュ伐 */
- @Excel(name = "CVT鎶ュ伐")
@ExcelIgnore
private String report30;
@@ -187,42 +167,40 @@
/** 鍚堢涓婄嚎鏃堕棿 */
@Excel(name = "鍚堢涓婄嚎鏃堕棿")
- @ExcelProperty(value = "鍚堢涓婄嚎鏃堕棿", index = 8)
+ @ExcelProperty(value = "鍚堢涓婄嚎鏃堕棿", index = 6)
@com.alibaba.excel.annotation.format.DateTimeFormat("yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date boxClosingOnlineTime;
/** 鍚堢涓嬬嚎鏃堕棿 */
@Excel(name = "鍚堢涓嬬嚎鏃堕棿")
- @ExcelProperty(value = "鍚堢涓嬬嚎鏃堕棿", index = 9)
+ @ExcelProperty(value = "鍚堢涓嬬嚎鏃堕棿", index = 7)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date closingBoxOfflineTime;
/** 鎬昏涓婄嚎鏃堕棿 */
@Excel(name = "鎬昏涓婄嚎鏃堕棿")
- @ExcelProperty(value = "鎬昏涓婄嚎鏃堕棿", index =10)
+ @ExcelProperty(value = "鎬昏涓婄嚎鏃堕棿", index =8)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date finalAssemblyLaunchTime;
/** 鎬昏涓嬬嚎鏃堕棿 */
@Excel(name = "鎬昏涓嬬嚎鏃堕棿")
- @ExcelProperty(value = "鎬昏涓嬬嚎鏃堕棿", index = 11)
+ @ExcelProperty(value = "鎬昏涓嬬嚎鏃堕棿", index = 9)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date finalAssemblyOfflineTime;
/** CVT涓婄嚎鏃堕棿 */
- @Excel(name = "CVT涓婄嚎鏃堕棿")
- @ExcelProperty(value = "CVT涓婄嚎鏃堕棿", index = 12)
+ @ExcelIgnore
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date cvtLaunchTime;
/** CVT涓嬬嚎鏃堕棿 */
- @Excel(name = "CVT涓嬬嚎鏃堕棿")
- @ExcelProperty(value = "CVT涓嬬嚎鏃堕棿", index = 13)
+ @ExcelIgnore
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date cvtOfflineTime;
--
Gitblit v1.9.3