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