Integry/IntegryManagementSystem
19
0
Fork 0
Code Actions Packages Projects Releases Activity

Fix su causale (colli V-) durante il picking libero

Browse Source
This commit is contained in:
Giuseppe Scorrano
2025-02-25 11:03:48 +01:00
parent 750792571f
commit a1afb90c8c
2 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ems-engine/src/main/java/it/integry/ems/retail/wms/generic/controller/WMSGenericController.java
View File

@@ -37,7 +37,6 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.net.InetAddress;
import java.nio.file.Paths;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
@@ -118,8 +117,8 @@ public class WMSGenericController {
return ServiceRestResponse.createPositiveResponse();
}
@RequestMapping(value = EmsRestConstants.PATH_CHECK_LATEST_WMS_VERSION_JSON, method = RequestMethod.GET)
public Object checkWMSLatestVersionJSON(HttpServletResponse response) throws Exception {
@GetMapping(value = EmsRestConstants.PATH_CHECK_LATEST_WMS_VERSION_JSON)
public WMSVersionDTO checkWMSLatestVersionJSON(HttpServletResponse response) throws Exception {
String wmsVersionFile = Paths.get(UtilityDirs.getWebAppPath(), "wms", "version.txt").toString();
if (new File(wmsVersionFile).exists()) {
List<String> lines = UtilityString.splitStringToMultipleLine(IoUtils.readFileAsString(new File(wmsVersionFile)));
@@ -139,7 +138,7 @@ public class WMSGenericController {
WMSVersionDTO wmsVersionDTO = new WMSVersionDTO()
.setLatestVersion(versionString)
.setLatestVersionCode(versionCode)
.setUrl("http://" + InetAddress.getLocalHost().getHostAddress() + ":8080" + emsProperties.getRootApi() + "/wms/android-release.apk");
.setUrl("/wms/android-release.apk");

20
ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSGenericService.java
View File

@@ -2039,10 +2039,10 @@ public class WMSGenericService {
boolean gestisciColli = WMSUtility.isGestisciColli(mtbDepo, entityProcessor, multiDBTransactionManager);
MtbColt uds = null;
if (!gestisciColli){
if (!gestisciColli) {
CreateUDSRequestDTO createUDSRequest = new CreateUDSRequestDTO();
createUDSRequest.setCodMdep(mtbDepo.getCodMdep())
.setCausaleCollo(CreateUDSRequestDTO.Causale.SCARICO);
.setCausaleCollo(CreateUDSRequestDTO.Causale.SCARICO);
uds = wmsLavorazioneService.createUDS(createUDSRequest);
}
@@ -2050,7 +2050,7 @@ public class WMSGenericService {
for (MtbColt mtbColtToMove : mtbCotlList) {
if (dtbDoct != null) {
for (MtbColr mtbColr : mtbColtToMove.getMtbColr()) {
if(!gestisciColli){
if (!gestisciColli) {
InsertUDSRowRequestDTO insertUDSRowRequest = new InsertUDSRowRequestDTO();
insertUDSRowRequest
.setSourceMtbColr(mtbColr)
@@ -2143,12 +2143,17 @@ public class WMSGenericService {
.setNumColloRif(cloneMtbColr.getNumColloRif())
.setSerColloRif(cloneMtbColr.getSerColloRif())
.setDataColloRif(cloneMtbColr.getDataColloRif())
.setCausale(MtbColr.Causale.VERSAMENTO)
.setUtente(requestDataDTO.getUsername())
.setQtaCol(stornoSourceMtbColr.getQtaCol().multiply(new BigDecimal(-1)))
.setNumCnf(stornoSourceMtbColr.getNumCnf().multiply(new BigDecimal(-1)));
if (destinationMtbColt.getGestione().equalsIgnoreCase("V") && destinationMtbColt.getSegno() == -1) {
stornoSourceMtbColr.setCausale(null);
} else {
stornoSourceMtbColr.setCausale(MtbColr.Causale.VERSAMENTO);
}
mtbColrSourceObservableField.add(stornoSourceMtbColr);
}
@@ -2164,13 +2169,18 @@ public class WMSGenericService {
cloneMtbColr.setCodJcom(null);
}
if (destinationMtbColt.getGestione().equalsIgnoreCase("V") && destinationMtbColt.getSegno() == -1) {
cloneMtbColr.setCausale(null);
} else {
cloneMtbColr.setCausale(MtbColr.Causale.VERSAMENTO);
}
cloneMtbColr
.setGestione(null)
.setSerCollo(null)
.setNumCollo(null)
.setDataCollo(null)
.setRiga(null)
.setCausale(MtbColr.Causale.VERSAMENTO)
.setUtente(requestDataDTO.getUsername());
mtbColrDestObservableField.add(cloneMtbColr);