From 7b2233d1dab53574facc66b3bebffcd8ca5919de Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 21 三月 2026 14:27:19 +0800
Subject: [PATCH] yys 1.已退货完毕的出库单号不要展示在关联出库单中 2.退货管理唯一处理 3.生产订单-库存数量回显 4.发货管理回显退货数量 5.发货增加详情接口 6.生产核算清理脏数据 7.生产报工-删除生产报工记录报错 8.筛选客户名称数据展示有误
---
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