From 52e4610b008f7643f84c5f37a110c081123caf69 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 08 一月 2026 09:29:01 +0800
Subject: [PATCH] 报工后新增/修改生产核算；删除报工后，删除关联的核算数据
---
src/main/java/com/ruoyi/production/controller/ProductProcessRouteItemController.java | 1
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java | 2 +
src/main/java/com/ruoyi/production/pojo/ProductWorkOrder.java | 6 +++
src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java | 49 ++++++++++++++++++++++++
doc/1767778273_add_product_order_id_to_product_work_order.sql | 2 +
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 2 +
src/main/java/com/ruoyi/production/pojo/ProductProcessRouteItem.java | 2
src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java | 1
8 files changed, 63 insertions(+), 2 deletions(-)
diff --git a/doc/1767778273_add_product_order_id_to_product_work_order.sql b/doc/1767778273_add_product_order_id_to_product_work_order.sql
new file mode 100644
index 0000000..8804120
--- /dev/null
+++ b/doc/1767778273_add_product_order_id_to_product_work_order.sql
@@ -0,0 +1,2 @@
+alter table product_work_order
+ add product_order_id bigint not null default 0 comment '鐢熶骇璁㈠崟id';
diff --git a/src/main/java/com/ruoyi/production/controller/ProductProcessRouteItemController.java b/src/main/java/com/ruoyi/production/controller/ProductProcessRouteItemController.java
index 8b172c7..7370a19 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductProcessRouteItemController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductProcessRouteItemController.java
@@ -90,6 +90,7 @@
String workOrderNoStr = String.format("%s%03d", datePrefix, startSequence + i);
ProductWorkOrder workOrder = new ProductWorkOrder();
workOrder.setProductProcessRouteItemId(item.getId());
+ workOrder.setProductOrderId(item.getRouteId());
workOrder.setWorkOrderNo(workOrderNoStr);
workOrder.setStatus(1);
workOrders.add(workOrder);
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java b/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
index d635ad9..948d6de 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
@@ -12,6 +12,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
+import java.util.List;
@RequestMapping("productionProductMain")
@RestController
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductProcessRouteItem.java b/src/main/java/com/ruoyi/production/pojo/ProductProcessRouteItem.java
index 324740e..fb04df8 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductProcessRouteItem.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductProcessRouteItem.java
@@ -13,7 +13,7 @@
@TableId(type = IdType.AUTO)
private Long id;
- @ApiModelProperty(value = "宸ヨ壓璺嚎id")
+ @ApiModelProperty(value = "鐢熶骇璁㈠崟id(product_order_id)")
private Long routeId;
@ApiModelProperty(value = "宸ュ簭id")
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductWorkOrder.java b/src/main/java/com/ruoyi/production/pojo/ProductWorkOrder.java
index b740e44..f225c45 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductWorkOrder.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductWorkOrder.java
@@ -32,6 +32,12 @@
private Long productProcessRouteItemId;
/**
+ * 鐢熶骇璁㈠崟id
+ */
+ @ApiModelProperty(value = "鐢熶骇璁㈠崟id")
+ private Long productOrderId;
+
+ /**
* 鍒涘缓鏃堕棿
*/
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
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 9472e1c..2664ea8 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -10,6 +10,7 @@
import com.ruoyi.basic.mapper.ProductModelMapper;
import com.ruoyi.basic.pojo.Product;
import com.ruoyi.basic.pojo.ProductModel;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.production.controller.ProductWorkOrderController;
import com.ruoyi.production.dto.ProductStructureDto;
@@ -17,6 +18,7 @@
import com.ruoyi.production.mapper.*;
import com.ruoyi.production.pojo.*;
import com.ruoyi.production.service.ProductionProductMainService;
+import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.quality.mapper.QualityInspectMapper;
import com.ruoyi.quality.mapper.QualityInspectParamMapper;
import com.ruoyi.quality.mapper.QualityTestStandardMapper;
@@ -66,6 +68,10 @@
private ProductionProductInputMapper productionProductInputMapper;
+ private ProductOrderMapper productOrderMapper;
+
+ private SalesLedgerProductionAccountingMapper salesLedgerProductionAccountingMapper;
+
@Override
public IPage<ProductionProductMainDto> listPageProductionProductMainDto(Page page, ProductionProductMainDto productionProductMainDto) {
@@ -79,6 +85,8 @@
throw new RuntimeException("鍙傛暟涓嶈兘涓虹┖");
}
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+
if (dto.isReportWork()) {
// 鏇存柊閫昏緫 - 鍙洿鏂版暟閲�
QueryWrapper<ProductionProductOutput> outputWrapper = new QueryWrapper<>();
@@ -89,10 +97,21 @@
throw new RuntimeException("浜у嚭璁板綍涓嶅瓨鍦�");
}
+ // 鏌ヨ鐢熶骇鏍哥畻璁板綍
+ QueryWrapper<SalesLedgerProductionAccounting> accountingWrapper = new QueryWrapper<>();
+ accountingWrapper.eq("sales_ledger_work_id", dto.getProductMainId());
+ SalesLedgerProductionAccounting accounting = salesLedgerProductionAccountingMapper.selectOne(accountingWrapper);
+ if (accounting == null) {
+ throw new RuntimeException("鐢熶骇鏍哥畻璁板綍涓嶅瓨鍦�");
+ }
+
// 鍙洿鏂版暟閲�
if (dto.getQuantity() != null) {
output.setQuantity(dto.getQuantity());
productionProductOutputMapper.updateById(output);
+ // 鏇存柊鐢熶骇鏍哥畻璁板綍
+ accounting.setFinishedNum(dto.getQuantity());
+ salesLedgerProductionAccountingMapper.updateById(accounting);
}
return true;
}
@@ -136,7 +155,7 @@
String productNo = String.format("%s%03d", datePrefix, sequenceNumber);
productionProductMain.setProductNo(productNo);
- productionProductMain.setUserId(dto.getUserId());
+ productionProductMain.setUserId(user.getUserId());
productionProductMain.setProductProcessRouteItemId(dto.getProductProcessRouteItemId());
productionProductMain.setWorkOrderId(dto.getWorkOrderId());
productionProductMain.setStatus(0);
@@ -203,6 +222,28 @@
productionProductOutput.setQuantity(dto.getQuantity() != null ? dto.getQuantity() : BigDecimal.ZERO);
productionProductOutputMapper.insert(productionProductOutput);
+ // 鑾峰彇鐢熶骇璁㈠崟
+ ProductWorkOrder productWorkOrder = productWorkOrderMapper.selectById(dto.getWorkOrderId());
+ ProductOrder productOrder = productOrderMapper.selectById(productWorkOrder.getProductOrderId());
+ if (productOrder == null) {
+ throw new RuntimeException("鐢熶骇璁㈠崟涓嶅瓨鍦�");
+ }
+ // 娣诲姞鐢熶骇鏍哥畻
+ SalesLedgerProductionAccounting salesLedgerProductionAccounting = SalesLedgerProductionAccounting.builder()
+ .salesLedgerWorkId(productionProductMain.getId())
+ .salesLedgerSchedulingId(0L)
+ .salesLedgerId(productOrder.getSalesLedgerId())
+ .salesLedgerProductId(productOrder.getProductModelId())
+ .schedulingUserId(user.getUserId())
+ .schedulingUserName(user.getNickName())
+ .finishedNum(dto.getQuantity() != null ? dto.getQuantity() : BigDecimal.ZERO)
+ .workHours(productProcess.getSalaryQuota())
+ .process(productProcess.getName())
+ .schedulingDate(LocalDate.now())
+ .tenantId(dto.getTenantId())
+ .build();
+ salesLedgerProductionAccountingMapper.insert(salesLedgerProductionAccounting);
+
return true;
}
@@ -227,6 +268,12 @@
.eq(ProductionProductOutput::getProductMainId, id)
);
+ // 鍒犻櫎鍏宠仈鐨勬牳绠楁暟鎹�
+ salesLedgerProductionAccountingMapper.delete(
+ new LambdaQueryWrapper<SalesLedgerProductionAccounting>()
+ .eq(SalesLedgerProductionAccounting::getSalesLedgerWorkId, id)
+ );
+
// 鍒犻櫎涓昏〃
return productionProductMainMapper.deleteById(id) > 0;
}
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
index 620b7a1..515bee2 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
@@ -222,6 +222,8 @@
String workOrderNoStr = String.format("%s%03d", datePrefix, sequenceNumber);
ProductWorkOrder productWorkOrder = new ProductWorkOrder();
productWorkOrder.setProductProcessRouteItemId(productProcessRouteItem.getId());
+ productWorkOrder.setProductOrderId(productOrder.getId());
+ productWorkOrder.setPlanQuantity(salesLedgerProduct.getQuantity());
productWorkOrder.setWorkOrderNo(workOrderNoStr);
productWorkOrder.setStatus(1);
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
index 7db5456..1e5ec4f 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -677,6 +677,8 @@
String workOrderNoStr = String.format("%s%03d", datePrefix, sequenceNumber);
ProductWorkOrder productWorkOrder = new ProductWorkOrder();
productWorkOrder.setProductProcessRouteItemId(productProcessRouteItem.getId());
+ productWorkOrder.setProductOrderId(productOrder.getId());
+ productWorkOrder.setPlanQuantity(salesLedgerProduct.getQuantity());
productWorkOrder.setWorkOrderNo(workOrderNoStr);
productWorkOrder.setStatus(1);
productWorkOrderMapper.insert(productWorkOrder);
--
Gitblit v1.9.3