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/purchase/pojo/ProductRecord.java |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ruoyi/purchase/pojo/ProductRecord.java b/src/main/java/com/ruoyi/purchase/pojo/ProductRecord.java
index bc0a5e6..f7cae28 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/ProductRecord.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/ProductRecord.java
@@ -1,8 +1,6 @@
 package com.ruoyi.purchase.pojo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
@@ -35,6 +33,11 @@
      * 閲囪喘鍙拌处id
      */
     private Long purchaseLedgerId;
+
+    /**
+     * 浜у搧id
+     */
+    private Long saleLedgerProjectId;
 
     /**
      * 浜у搧澶х被
@@ -89,7 +92,7 @@
     /**
      * 鏈鏉ョエ鏁�
      */
-    private Long ticketsNum;
+    private BigDecimal ticketsNum;
 
     /**
      * 鏈鏉ョエ閲戦(鍏�)
@@ -99,12 +102,12 @@
     /**
      * 鏈潵绁ㄦ暟
      */
-    private Long futureTickets;
+    private BigDecimal futureTickets = BigDecimal.ZERO;
 
     /**
      * 鏈潵绁ㄩ噾棰�(鍏�)
      */
-    private BigDecimal futureTicketsAmount;
+    private BigDecimal futureTicketsAmount = BigDecimal.ZERO;
 
     /**
      * 浜у搧id
@@ -121,4 +124,7 @@
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date createdAt;
+
+    @TableField(fill = FieldFill.INSERT)
+    private Long tenantId;
 }

--
Gitblit v1.9.3