From 6416b165e4a3c8ecc2d547ceef0fb3962d3c7b56 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 12 一月 2026 14:58:45 +0800
Subject: [PATCH] 1.查询产品信息列表接口,销售台账查询其产品的状态 2.增添不合格现象字段,取消生产状态字段 3.修改发货审批接口,发货审批通过,生产该订单出库记录 4.存在质检记录并已提交的销售台账删除时做出限制 5.生产报工投入,产出2:1调整

---
 src/main/java/com/ruoyi/dto/WordDateDto.java |   40 ++++++++++++++++++++++++++++------------
 1 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/ruoyi/dto/WordDateDto.java b/src/main/java/com/ruoyi/dto/WordDateDto.java
index c316d2d..09bd0be 100644
--- a/src/main/java/com/ruoyi/dto/WordDateDto.java
+++ b/src/main/java/com/ruoyi/dto/WordDateDto.java
@@ -15,18 +15,34 @@
     private String qmoth;       // 绛捐鏃ユ湡-鏈堬紙娉ㄦ剰鍘熸枃妗f嫾鍐欙細qmoth=month锛�
     private String qday;        // 绛捐鏃ユ湡-鏃�
 
-    private String syear;       // 鍚堝悓寮�濮嬪勾
-    private String smoth;       // 鍚堝悓寮�濮嬫湀
-    private String sday;        // 鍚堝悓寮�濮嬫棩
-    private String eyear;       // 鍚堝悓缁撴潫骞达紙浠匒绫诲瀷闇�瑕侊級
-    private String emoth;       // 鍚堝悓缁撴潫鏈堬紙浠匒绫诲瀷闇�瑕侊級
-    private String eday;        // 鍚堝悓缁撴潫鏃ワ紙浠匒绫诲瀷闇�瑕侊級
+    private String syear = "";       // 鍚堝悓寮�濮嬪勾
+    private String smoth = "";       // 鍚堝悓寮�濮嬫湀
+    private String sday = "";        // 鍚堝悓寮�濮嬫棩
+    private String eyear = "";       // 鍚堝悓缁撴潫骞达紙浠匒绫诲瀷闇�瑕侊級
+    private String emoth = "";       // 鍚堝悓缁撴潫鏈堬紙浠匒绫诲瀷闇�瑕侊級
+    private String eday = "";        // 鍚堝悓缁撴潫鏃ワ紙浠匒绫诲瀷闇�瑕侊級
 
     // 璇曠敤鏈熺浉鍏�
-    private String styear;      // 璇曠敤鏈熷紑濮嬪勾
-    private String stmoth;      // 璇曠敤鏈熷紑濮嬫湀
-    private String stday;       // 璇曠敤鏈熷紑濮嬫棩
-    private String seyear;      // 璇曠敤鏈熺粨鏉熷勾
-    private String semoth;      // 璇曠敤鏈熺粨鏉熸湀
-    private String seday;       // 璇曠敤鏈熺粨鏉熸棩
+    private String styear = "";      // 璇曠敤鏈熷紑濮嬪勾
+    private String stmoth = "";      // 璇曠敤鏈熷紑濮嬫湀
+    private String stday = "";       // 璇曠敤鏈熷紑濮嬫棩
+    private String seyear = "";      // 璇曠敤鏈熺粨鏉熷勾
+    private String semoth = "";      // 璇曠敤鏈熺粨鏉熸湀
+    private String seday = "";       // 璇曠敤鏈熺粨鏉熸棩
+
+    private String bsyear = "";       // 鍚堝悓寮�濮嬪勾
+    private String bsmoth = "";       // 鍚堝悓寮�濮嬫湀
+    private String bsday = "";        // 鍚堝悓寮�濮嬫棩
+
+    // 璇曠敤鏈熺浉鍏�
+    private String bstyear = "";      // 璇曠敤鏈熷紑濮嬪勾
+    private String bstmoth = "";      // 璇曠敤鏈熷紑濮嬫湀
+    private String bstday = "";       // 璇曠敤鏈熷紑濮嬫棩
+    private String bseyear = "";      // 璇曠敤鏈熺粨鏉熷勾
+    private String bsemoth = "";      // 璇曠敤鏈熺粨鏉熸湀
+    private String bseday = "";       // 璇曠敤鏈熺粨鏉熸棩
+
+    private String csyear = "";       // 鍚堝悓寮�濮嬪勾
+    private String csmoth = "";       // 鍚堝悓寮�濮嬫湀
+    private String csday = "";        // 鍚堝悓寮�濮嬫棩
 }

--
Gitblit v1.9.3