From c19bcccbe4f091b4286a3ff40ee4a97c4e9848d6 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 19 三月 2026 10:22:37 +0800
Subject: [PATCH] 修改bom产品信息，如果有关联生成订单完成数量>0，则不许改；否则修改关联的产品结构，订单产品信息，工艺路线产品信息
---
src/main/java/com/ruoyi/quality/pojo/RawMaterial.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/pojo/RawMaterial.java b/src/main/java/com/ruoyi/quality/pojo/RawMaterial.java
index df0c2d2..bf7d158 100644
--- a/src/main/java/com/ruoyi/quality/pojo/RawMaterial.java
+++ b/src/main/java/com/ruoyi/quality/pojo/RawMaterial.java
@@ -1,19 +1,17 @@
package com.ruoyi.quality.pojo;
import com.baomidou.mybatisplus.annotation.*;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.Date;
-
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
/**
* <p>
@@ -46,7 +44,7 @@
private String batchNo;
@ApiModelProperty("妫�楠岀粨鏋� 0鍚堟牸 1涓嶅悎鏍�")
- @Excel(name = "妫�楠岀粨鏋�", readConverterExp = "0=鍚堟牸,1=涓嶅悎鏍�")
+ @Excel(name = "妫�楠岀粨鏋�", readConverterExp = "0=涓嶅悎鏍�,1=鍚堟牸")
private Integer checkResult;
@ApiModelProperty("绫诲埆(0:鏈彁浜�;1:宸叉彁浜�)")
@@ -59,6 +57,7 @@
@ApiModelProperty("妫�楠屾棩鏈�")
@JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
@Excel(name = "妫�娴嬫棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
private Date checkTime;
--
Gitblit v1.9.3