From 53c0da6e44a01acf9d97bdc7abaf25e5984b92dc Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 13 七月 2026 14:39:57 +0800
Subject: [PATCH] 修改生产核算
---
src/main/resources/mapper/production/ProductionProductMainMapper.xml | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index d2e89f7..77d6495 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -136,11 +136,15 @@
ifnull(ppo.quantity, 0) as quantity,
ifnull(ppo.scrap_qty, 0) as scrapQty,
date(pa.scheduling_date) as schedulingDate,
+ pa.scheduling_user_id as schedulingUserId,
pa.scheduling_user_name as schedulingUserName,
cast(ifnull(ppm.work_hour, 0) as decimal(18,4)) as workHour,
cast(ifnull(pa.work_hours, 0) as decimal(18,4)) as workHours,
+ cast(ifnull(pa.adjust_amount, 0) as decimal(18,4)) as adjustAmount,
+ pa.adjust_remark as adjustRemark,
cast(
case
+ when pa.adjust_amount is not null then ifnull(pa.adjust_amount, 0)
when poro.type = 0 then ifnull(pa.work_hours, 0) * ifnull(ppm.work_hour, 0)
else ifnull(pa.work_hours, 0) * ifnull(pa.finished_num, 0) *
case
--
Gitblit v1.9.3