From 975f05889bde73c4d6d9b8f0ccaa08574c4d4e46 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Wed, 1 Apr 2026 17:32:43 +0800 Subject: [PATCH] =?UTF-8?q?2026-04-01=20=E5=B7=A5=E5=8D=95=E6=9D=90?= =?UTF-8?q?=E6=96=99=E4=B8=8A=E6=9C=BA=E8=AE=B0=E5=BD=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/schedule/data/MaterialOnMachineRecordData.java | 2 ++ .../mapper/schedule/MaterialOnMachineRecordMapper.xml | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gaotao/modules/schedule/data/MaterialOnMachineRecordData.java b/src/main/java/com/gaotao/modules/schedule/data/MaterialOnMachineRecordData.java index 938fbf6..d19ea5c 100644 --- a/src/main/java/com/gaotao/modules/schedule/data/MaterialOnMachineRecordData.java +++ b/src/main/java/com/gaotao/modules/schedule/data/MaterialOnMachineRecordData.java @@ -79,5 +79,7 @@ public class MaterialOnMachineRecordData { private String resourceId; private Float originalHistQty; + + private Float stageRemainQty; } diff --git a/src/main/resources/mapper/schedule/MaterialOnMachineRecordMapper.xml b/src/main/resources/mapper/schedule/MaterialOnMachineRecordMapper.xml index fde71a8..b21c37e 100644 --- a/src/main/resources/mapper/schedule/MaterialOnMachineRecordMapper.xml +++ b/src/main/resources/mapper/schedule/MaterialOnMachineRecordMapper.xml @@ -102,7 +102,8 @@ sor.OperationDesc AS operationDesc, sor.WorkCenterNo AS workCenterNo, ssr.S_ResourceID AS resourceId, - smh.OriginalHistQty as originalHistQty + smh.OriginalHistQty as originalHistQty, + ROUND(ISNULL(smh.OriginalHistQty, 0) - ISNULL(smh.NetIssueQty, 0), 3) AS stageRemainQty FROM SFDC_MaterialHist smh WITH(NOLOCK) LEFT JOIN Part p WITH(NOLOCK) ON smh.Site = p.Site AND smh.PartNo = p.PartNo LEFT JOIN ShopOrder so WITH(NOLOCK) ON smh.Site = so.Site AND smh.OrderNo = so.OrderNo