From 4bcd26a4975d6722bff65690e7a8331cd0afd520 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 31 三月 2026 17:46:19 +0800
Subject: [PATCH] yys 1.销售，采购台账产品反着来 2.产品图纸带到生产订单来
---
src/main/java/com/ruoyi/production/pojo/ProductWorkOrder.java | 61 ++++++++++++++++++++++++------
1 files changed, 48 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductWorkOrder.java b/src/main/java/com/ruoyi/production/pojo/ProductWorkOrder.java
index 0715535..60ddf05 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductWorkOrder.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductWorkOrder.java
@@ -1,13 +1,17 @@
package com.ruoyi.production.pojo;
import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.util.List;
/**
* 浜у搧宸ュ崟瀹炰綋绫�
@@ -17,7 +21,15 @@
@TableName("product_work_order")
public class ProductWorkOrder implements Serializable {
+
+
private static final long serialVersionUID = 1L;
+
+
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "棰滆壊 1-鐏拌壊 2-榛勮壊 3-缁胯壊 4-绾㈣壊")
+ private Integer color;
/**
* 涓婚敭id
@@ -32,17 +44,27 @@
private Long productProcessRouteItemId;
/**
+ * 鐢熶骇璁㈠崟id
+ */
+ @ApiModelProperty(value = "鐢熶骇璁㈠崟id")
+ private Long productOrderId;
+
+ /**
* 鍒涘缓鏃堕棿
*/
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
/**
* 淇敼鏃堕棿
*/
@ApiModelProperty(value = "淇敼鏃堕棿")
- @TableField(fill = FieldFill.UPDATE)
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
/**
@@ -52,9 +74,9 @@
private String workOrderNo;
/**
- * 鐘舵�� 1 寰呯‘璁� 2 寰呯敓浜� 3鐢熶骇涓� 4宸茬敓浜�
+ * 鐘舵�� 1 寰呯‘璁� 2 寰呯敓浜� 3鐢熶骇涓�
*/
- @ApiModelProperty(value = "鐘舵�� 1 寰呯‘璁� 2 寰呯敓浜� 3鐢熶骇涓� 4宸茬敓浜�")
+ @ApiModelProperty(value = "鐘舵�� 1 寰呯‘璁� 2 寰呯敓浜� 3宸插畬鎴�")
private Integer status;
/**
@@ -68,41 +90,54 @@
* 璁″垝寮�濮嬫椂闂�
*/
@ApiModelProperty(value = "璁″垝寮�濮嬫椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate planStartTime;
/**
* 璁″垝缁撴潫鏃堕棿
*/
@ApiModelProperty(value = "璁″垝缁撴潫鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate planEndTime;
/**
* 瀹為檯寮�濮嬫椂闂�
*/
@ApiModelProperty(value = "瀹為檯寮�濮嬫椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate actualStartTime;
/**
* 瀹為檯缁撴潫鏃堕棿
*/
@ApiModelProperty(value = "瀹為檯缁撴潫鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate actualEndTime;
/**
- * 鏄惁鎶ュ伐
+ * 闇�姹傞噺
*/
- @ApiModelProperty(value = "鏄惁鎶ュ伐")
- private boolean reportWork;
+ @ApiModelProperty(value = "闇�姹傛暟閲�")
+ private BigDecimal planQuantity;
/**
- * 瀹為檯鏁伴噺
+ * 瀹屾垚鏁伴噺
*/
- @ApiModelProperty(value = "鏁伴噺")
- private BigDecimal quantity;
+ @ApiModelProperty(value = "瀹屾垚鏁伴噺")
+ private BigDecimal completeQuantity;
/**
- * 鎶ュ伐id
+ * 鐢ㄦ埛鏉冮檺
*/
- @ApiModelProperty(value = "鎶ュ伐id")
- private Long productMainId;
-}
\ No newline at end of file
+ @ApiModelProperty(value = "鐢ㄦ埛鎶ュ伐鏉冮檺")
+ private String userPower;
+
+ @ApiModelProperty(value = "璁″垝鏁�")
+ private Integer planNum;
+
+
+}
--
Gitblit v1.9.3