diff --git a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java index 746abb2..e314c26 100644 --- a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java +++ b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java @@ -1026,6 +1026,7 @@ public class WcsIntegrationServiceImpl implements WcsIntegrationService { } @Override + @Transactional public void completePalletAssembly(Map params) throws Exception { SysUserEntity currentUser = (SysUserEntity) SecurityUtils.getSubject().getPrincipal(); diff --git a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsTaskServiceImpl.java b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsTaskServiceImpl.java index 234d2ba..1d9ac68 100644 --- a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsTaskServiceImpl.java +++ b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsTaskServiceImpl.java @@ -15,6 +15,7 @@ import com.gaotao.modules.warehouse.service.PalletService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; import java.util.Date; @@ -48,6 +49,7 @@ public class WcsTaskServiceImpl implements WcsTaskService { } @Override + @Transactional public void processWcsCallbackTask(WcsCallbackTask callbackTask) { // 判断是否为超时恢复的任务 boolean isTimeoutRecovery = "处理中".equals(callbackTask.getStatus()); @@ -99,10 +101,11 @@ public class WcsTaskServiceImpl implements WcsTaskService { // 5. 如果是入库,更新对应的wms_order_task状态 if ("入库".equals(callbackTask.getTransTypeDesc())) { updateOrderTaskStatusForInbound(callbackTask); - + wcsIntegrationMapper.updatePalletCallingFlag(callbackTask.getSite(), callbackTask.getPalletId(), "N", "SYS_WMS"); } if ("出库".equals(callbackTask.getTransTypeDesc())) { wcsIntegrationMapper.updatePalletWcsLocation(callbackTask.getSite(), callbackTask.getPalletId(), ""); + wcsIntegrationMapper.updatePalletCallingFlag(callbackTask.getSite(), callbackTask.getPalletId(), "Y", "SYS_WMS"); } // 6. 更新任务状态为已完成