From dcd1aab9b5bec2556161c16bd1bc4fe71fef476d Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 08 六月 2026 17:17:47 +0800
Subject: [PATCH] 关于社保补缴的计算,如果社保保险设置有多条数据,根据创建时间来判断,当月即以后得参考标准用对应的配置,并且需要统计当年从1月到现在缴纳的所有社保金额,和最新的社保比列得出的金额进行比较,计算需要补缴的金额,只有社会保险设置新增一条数据的当月会计算,其余月份对应的都是0
---
src/main/java/com/ruoyi/production/pojo/ProductionOrderPick.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOrderPick.java b/src/main/java/com/ruoyi/production/pojo/ProductionOrderPick.java
index e0180e1..61c5d19 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOrderPick.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOrderPick.java
@@ -28,7 +28,7 @@
private Long id;
@Schema(description = "浜у搧瑙勬牸id")
- private Integer productModelId;
+ private Long productModelId;
@Schema(description = "鏁伴噺")
private BigDecimal quantity;
@@ -56,4 +56,30 @@
@Schema(description = "閮ㄩ棬ID")
@TableField(fill = FieldFill.INSERT)
private Long deptId;
+
+ @Schema(description = "宸ュ簭鍚嶇О")
+ private String operationName;
+
+ @Schema(description = "宸ュ簭id")
+ private Long technologyOperationId;
+
+ @Schema(description = "闇�姹傛暟閲�")
+ private BigDecimal demandedQuantity;
+
+ @Schema(description = "琛ユ枡鎬婚噺")
+ private BigDecimal feedingQty;
+
+ @Schema(description = "閫�鏂欐暟閲�")
+ private BigDecimal returnQty;
+
+ @Schema(description = "瀹為檯鏁伴噺")
+ private BigDecimal actualQty;
+
+ @Schema(description = "鏄惁宸查��鏂�")
+ @TableField("is_returned")
+ private Boolean returned;
+
+ @Schema(description = "鏄惁bom棰嗘枡")
+ @TableField("is_bom")
+ private Boolean bom;
}
--
Gitblit v1.9.3