From 6b8585fc452ecdcaa82d86fab79a9f27bb442851 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 05 十一月 2026 09:13:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_南通_苏珩' into dev_南通_苏珩
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/scrap/MesWmScrapReceiptMapper.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/scrap/MesWmScrapReceiptMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/scrap/MesWmScrapReceiptMapper.java
index eec7891..0e1861c 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/scrap/MesWmScrapReceiptMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/scrap/MesWmScrapReceiptMapper.java
@@ -14,6 +14,12 @@
@Mapper
public interface MesWmScrapReceiptMapper extends BaseMapperX<MesWmScrapReceiptDO> {
+ @Select("SELECT l.item_id AS itemId, l.batch_id AS batchId, l.batch_code AS batchCode, SUM(l.quantity) AS quantity FROM mes_wm_product_produce p " +
+ "JOIN mes_wm_product_produce_line l ON l.produce_id=p.id AND l.deleted=0 " +
+ "WHERE p.deleted=0 AND p.work_order_id=#{orderId} AND p.status=#{finished} " +
+ "AND l.item_id IS NOT NULL AND l.quantity > 0 GROUP BY l.item_id,l.batch_id,l.batch_code")
+ List<cn.iocoder.yudao.module.mes.controller.admin.wm.scrap.MesWmScrapReceiptController.OutputItem> selectOrderOutputs(
+ @Param("orderId") Long orderId, @Param("finished") Integer finished);
default MesWmScrapReceiptDO selectByCode(String code) {
return selectOne(MesWmScrapReceiptDO::getCode, code);
}
--
Gitblit v1.9.3