From 4d99e718536ac77dff26dde8da7a59cdc9b52de8 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 20 五月 2026 10:13:57 +0800
Subject: [PATCH] fix:1.生产报工优化
---
src/main/java/com/ruoyi/production/mapper/ProductionProductMainMapper.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/mapper/ProductionProductMainMapper.java b/src/main/java/com/ruoyi/production/mapper/ProductionProductMainMapper.java
index 2bdefa3..b1c41ac 100644
--- a/src/main/java/com/ruoyi/production/mapper/ProductionProductMainMapper.java
+++ b/src/main/java/com/ruoyi/production/mapper/ProductionProductMainMapper.java
@@ -4,11 +4,13 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.production.dto.ProductionProductMainDto;
+import com.ruoyi.production.dto.SalesLedgerProductionAccountingDto;
import com.ruoyi.production.pojo.ProductOrder;
import com.ruoyi.production.pojo.ProductionProductMain;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+import java.util.ArrayList;
import java.util.List;
@Mapper
@@ -17,14 +19,23 @@
IPage<ProductionProductMainDto> listPageProductionProductMainDto(Page page, @Param("c") ProductionProductMainDto productionProductMainDto);
/**
- * 鏍规嵁宸ュ崟ID鎵归噺鍒犻櫎鐢熶骇涓昏〃鏁版嵁
+ * 鏍规嵁宸ュ崟 ID 鎵归噺鍒犻櫎鎶ュ伐涓昏〃鏁版嵁銆�
*/
int deleteByWorkOrderIds(@Param("workOrderIds") List<Long> workOrderIds);
/**
- * 鏍规嵁鎶ュ伐id鏌ヨ鐢熶骇璁㈠崟
- * @param productMainId
- * @return
+ * 鏍规嵁鎶ュ伐 ID 鏌ヨ鐢熶骇璁㈠崟銆�
*/
ProductOrder getOrderByMainId(@Param("productMainId") Long productMainId);
+
+ IPage<ProductionProductMainDto> listProductionDetails(@Param("ew") SalesLedgerProductionAccountingDto salesLedgerProductionAccountingDto, Page page);
+
+ ArrayList<Long> listMain(List<Long> idList);
+
+ List<ProductionProductMainDto> getByProductWorkOrderId(Long productWorkOrderId);
+
+ /**
+ * 鏍￠獙鍚屼竴鐢熶骇璁㈠崟涓嬬殑涓婁竴閬撳伐搴忔槸鍚﹀凡缁忔姤宸ャ��
+ */
+ boolean checkPreviousProcessReported(@Param("workOrderId") Long workOrderId, @Param("currentDragSort") Integer currentDragSort);
}
--
Gitblit v1.9.3