Merge branch 'dev'

Author: dolly-chhabriya-altius

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>cc.altius.FASP.rest.webservice</groupId>
     <artifactId>FASP</artifactId>
-    <version>2.127[5837]</version>
+    <version>2.128[5839]</version>
     <name>QAT</name>
     <description>Quantification Analytics Tool</description>
     <packaging>jar</packaging>

src/main/java/cc/altius/FASP/service/impl/ProgramDataServiceImpl.java

@@ -108,7 +108,7 @@ public List<ProgramData> getProgramData(List<LoadProgramInput> lpInputList, Cust
             pd.setShipmentList(this.programDataDao.getShipmentList(pv.getProgramId(), versionId, false, false, pv.getCutOffDate()));
             pd.setShipmentLinkingList(this.programDataDao.getShipmentLinkingList(pv.getProgramId(), versionId, pv.getCutOffDate()));
             pd.setBatchInventoryList(this.programDataDao.getBatchInventoryList(pv.getProgramId(), versionId, false, pv.getCutOffDate()));
-            pd.setBatchInfoList(this.programDataDao.getBatchList(pv.getProgramId(), versionId, false, pv.getCutOffDate()));
+            pd.setBatchInfoList(this.programDataDao.getBatchList(pv.getProgramId(), versionId, false, null));
             pd.setProblemReportList(this.problemService.getProblemReportList(pv.getProgramId(), versionId, curUser));
             pd.setSupplyPlan(this.programDataDao.getSimplifiedSupplyPlan(pv.getProgramId(), versionId, false, pv.getCutOffDate()));
             pd.setPlanningUnitList(this.programDataDao.getPlanningUnitListForProgramData(pv.getProgramId(), curUser, false));

src/main/resources/application.properties

@@ -31,8 +31,8 @@ syncExpiresOn=15
 
 info.app.name=QAT
 info.app.description=Quantification Analytics Tool
-info.app.version=2.127[5837]
-info.app.frontEndVersion=[13979]
+info.app.version=2.128[5839]
+info.app.frontEndVersion=[13998]
 management.endpoints.web.exposure.include=*
 management.info.env.enabled = true
 management.endpoint.sessions.enabled=true

src/main/resources/scriptsToBeRun/scriptsToBeRun.txt

@@ -1 +0,0 @@
-20260420-QAT-6200.sql

src/main/resources/version.properties

@@ -1,5 +1,5 @@
 # To change this license header, choose License Headers in Project Properties.
 # To change this template file, choose Tools | Templates
 # and open the template in the editor.
-version.major=2.127
-version.minor=5837
+version.major=2.128
+version.minor=5839

src/main/resources/versionInfo.txt

@@ -1,3 +1,18 @@
+APP Version: 2.128.5839
+Front End Version: 13998
+Date: 2026-05-02
+QAT-6364
+QAT-6359
+QAT-6357
+QAT-6356
+QAT-6354
+QAT-6351
+QAT-6350
+QAT-6348
+QAT-6346
+QAT-6314
+QAT-6290
+
 APP Version: 2.127.5837
 Front End Version: 13979
 Date: 2026-04-21