From 2127d78079f17d23e9f62454b9692e6e0c6457c2 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期六, 07 三月 2026 11:38:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java | 8 ++++++--
src/main/java/com/ruoyi/production/pojo/ProductProcess.java | 3 +++
src/main/java/com/ruoyi/common/enums/ProcessType.java | 25 +++++++++++++++++++++++++
3 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/common/enums/ProcessType.java b/src/main/java/com/ruoyi/common/enums/ProcessType.java
new file mode 100644
index 0000000..291f622
--- /dev/null
+++ b/src/main/java/com/ruoyi/common/enums/ProcessType.java
@@ -0,0 +1,25 @@
+package com.ruoyi.common.enums;
+
+public enum ProcessType implements BaseEnum<Integer>{
+
+ TIMEKEEPING(1, "璁℃椂"),
+ PIECERATE(2, "璁′欢");
+
+ private final Integer code;
+ private final String value;
+
+ ProcessType(Integer code, String value) {
+ this.code = code;
+ this.value = value;
+ }
+
+ @Override
+ public Integer getCode() {
+ return this.code;
+ }
+
+ @Override
+ public String getValue() {
+ return this.value;
+ }
+}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductProcess.java b/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
index c3d12e0..e55ab4f 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
@@ -50,6 +50,9 @@
@TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal salaryQuota;
+ @ApiModelProperty("绫诲瀷 鍖哄垎鏄鏃惰繕鏄浠� 0 璁℃椂 1璁′欢")
+ private Long type;
+
/**
* 鍒涘缓鏃堕棿
*/
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
index 13d7ccb..fa34114 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -234,13 +234,17 @@
}
}
productOrderMapper.updateById(productOrder);
- /*娣诲姞鐢熶骇鏍哥畻*/
+ /*娣诲姞鐢熶骇鏍哥畻 鍖哄垎宸ュ簭鏄浠惰繕鏄鏃�*/
+ BigDecimal workHours = (productProcess.getType() == 1)
+ ? productProcess.getSalaryQuota().multiply(productQty)
+ : productProcess.getSalaryQuota();
+
SalesLedgerProductionAccounting salesLedgerProductionAccounting = SalesLedgerProductionAccounting.builder()
.productMainId(productionProductMain.getId())
.schedulingUserId(user.getUserId())
.schedulingUserName(user.getNickName())
.finishedNum(productQty)
- .workHours(productProcess.getSalaryQuota())
+ .workHours(workHours)
.process(productProcess.getName())
.schedulingDate(LocalDate.now())
.tenantId(dto.getTenantId())
--
Gitblit v1.9.3