diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mes/servuce/impl/MesServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mes/servuce/impl/MesServiceImpl.java
index ff4f158..7c394a4 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mes/servuce/impl/MesServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mes/servuce/impl/MesServiceImpl.java
@@ -150,7 +150,11 @@ public class MesServiceImpl implements IMesService {
if (!success) {
throw new JeecgBootException("MES下发入库信息，更新入库组盘头失败");
}
- return huahengMultiHandlerService.createReceiptTask(receiptContainerHeader, warehouseCode);
+ result = receiptContainerHeaderService.createReceiptTask(receiptContainerHeader, warehouseCode);
+ if (!result.isSuccess()) {
+ throw new JeecgBootException(result.getMessage());
+ }
+ return result;
}
@Override
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wms/service/WmsServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wms/service/WmsServiceImpl.java
index b961b56..b591eec 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wms/service/WmsServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wms/service/WmsServiceImpl.java
@@ -162,7 +162,11 @@ public class WmsServiceImpl implements WmsService {
if (!success) {
throw new JeecgBootException("WMS下发入库信息，更新入库组盘头失败");
}
- return huahengMultiHandlerService.createReceiptTask(receiptContainerHeader, warehouseCode);
+ result = receiptContainerHeaderService.createReceiptTask(receiptContainerHeader, warehouseCode);
+ if (!result.isSuccess()) {
+ throw new JeecgBootException(result.getMessage());
+ }
+ return result;
}
@Override
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/service/impl/HuahengMultiHandlerServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/service/impl/HuahengMultiHandlerServiceImpl.java
index be13839..c7ed5f5 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/service/impl/HuahengMultiHandlerServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/service/impl/HuahengMultiHandlerServiceImpl.java
@@ -72,12 +72,10 @@ public class HuahengMultiHandlerServiceImpl extends HuahengBaseController implem
@Override
@Transactional(rollbackFor = Exception.class)
public Result createReceiptTask(ReceiptContainerHeader receiptContainerHeader, String warehouseCode) {
- String lockKey = warehouseCode;
- Result result = handleMultiProcess("createReceiptTask", lockKey, new MultiProcessListener() {
+ Result result = handleMultiProcess("createReceiptTask", warehouseCode, new MultiProcessListener() {
@Override
public Result<?> doProcess() {
- Result result = receiptContainerHeaderService.createReceiptTask(receiptContainerHeader, warehouseCode);
- return result;
+ return receiptContainerHeaderService.createReceiptTask(receiptContainerHeader, warehouseCode);
}
});
return result;
@@ -89,8 +87,7 @@ public class HuahengMultiHandlerServiceImpl extends HuahengBaseController implem
Result result = handleMultiProcess("combination", new MultiProcessListener() {
@Override
public Result<?> doProcess() {
- Result result = shipmentCombinationService.combination(combinationModel);
- return result;
+ return shipmentCombinationService.combination(combinationModel);
}
});
return result;
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/service/impl/ReceiptContainerHeaderServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/service/impl/ReceiptContainerHeaderServiceImpl.java
index 5bb4d0b..1ae2079 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/service/impl/ReceiptContainerHeaderServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/service/impl/ReceiptContainerHeaderServiceImpl.java
@@ -57,26 +57,37 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl<ReceiptContai
@Autowired
private ReceiptContainerHeaderMapper receiptContainerHeaderMapper;
+
@Autowired
private ReceiptContainerDetailMapper receiptContainerDetailMapper;
+
@Resource
private IContainerService containerService;
+
@Resource
private IReceiptContainerDetailService receiptContainerDetailService;
+
@Resource
private ILocationService locationService;
+
@Resource
private IReceiptContainerHeaderService receiptContainerHeaderService;
+
@Resource
private ITaskHeaderService taskHeaderService;
+
@Resource
private ITaskDetailService taskDetailService;
+
@Resource
private IReceiptDetailService receiptDetailService;
+
@Resource
private IReceiptHeaderService receiptHeaderService;
+
@Resource
private IInventoryHeaderService inventoryHeaderService;
+
@Resource
private IParameterConfigurationService parameterConfigurationService;
@@ -106,7 +117,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl<ReceiptContai
}
@Override
- @Transactional(rollbackFor = JeecgBootException.class, propagation = Propagation.REQUIRES_NEW)
+ @Transactional
@OperationLog(bizId = "''", bizType = "'入库单追踪'", tag = "'入库任务生成'", extra = "#extraJsonString1", msg = "'任务ID：' + #taskHeader.getId()",
condition = "#receiptContainerDetailList.size() > 0", recordReturnValue = true)
@OperationLog(bizId = "''", bizType = "'任务追踪'", tag = "'入库任务生成'", extra = "#extraJsonString2",
@@ -115,7 +126,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl<ReceiptContai
public Result<TaskHeader> createReceiptTask(ReceiptContainerHeader receiptContainerHeader, String warehouseCode) {
log.info("开始创建入库任务");
if (!receiptContainerHeader.getWarehouseCode().equals(warehouseCode)) {
- return Result.error("创建入库任务, id:" + receiptContainerHeader.getId() + "的入库组盘不能在" + warehouseCode + "仓库操作");
+ throw new JeecgBootException("创建入库任务, id:" + receiptContainerHeader.getId() + "的入库组盘不能在" + warehouseCode + "仓库操作");
}
String containerCode = receiptContainerHeader.getContainerCode();
String fromLocationCode = receiptContainerHeader.getFromLocationCode();
@@ -125,11 +136,11 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl<ReceiptContai
List<ReceiptContainerDetail> receiptContainerDetailList =
receiptContainerDetailService.getReceiptContainerDetailListByHeaderId(receiptContainerHeader.getId());
if (receiptContainerDetailList.size() == 0) {
- return Result.error("创建入库任务, id:" + receiptContainerHeader.getId() + "的入库组盘，没有组盘明细，请先组盘！");
+ throw new JeecgBootException("创建入库任务, id:" + receiptContainerHeader.getId() + "的入库组盘，没有组盘明细，请先组盘！");
}
int receiptContainerStatus = receiptContainerHeader.getStatus();
if (receiptContainerStatus != QuantityConstant.RECEIPT_CONTAINER_BUILD) {
- return Result.error("创建入库任务, 入库组盘状态不是创建状态");
+ throw new JeecgBootException("创建入库任务, 入库组盘状态不是创建状态");
}
String containerFillStatus = QuantityConstant.STATUS_CONTAINER_FILL_SOME;
if (!StringUtils.isEmpty(receiptContainerHeader.getContainerFillStatus())) {
@@ -411,30 +422,36 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl<ReceiptContai
}
@Override
+ @Transactional
public Result cancelReceiving(List<Integer> ids) {
Result result = null;
for (Integer id : ids) {
- result = cancelReceiving(id);
+ result = receiptContainerHeaderService.cancelReceiving(id);
+ if (!result.isSuccess()) {
+ throw new JeecgBootException(result.getMessage());
+ }
}
return result;
}
@Override
+ @Transactional
public boolean updateToPortById(String toPort, int id) {
ReceiptContainerHeader receiptContainerHeader = new ReceiptContainerHeader();
receiptContainerHeader.setToPort(toPort);
receiptContainerHeader.setId(id);
- boolean success = updateById(receiptContainerHeader);
+ boolean success = receiptContainerHeaderService.updateById(receiptContainerHeader);
return success;
}
@Override
+ @Transactional
public boolean updateToPortAndStatus(String toPort, int status, int id) {
ReceiptContainerHeader receiptContainerHeader = new ReceiptContainerHeader();
receiptContainerHeader.setToPort(toPort);
receiptContainerHeader.setStatus(status);
receiptContainerHeader.setId(id);
- boolean success = updateById(receiptContainerHeader);
+ boolean success = receiptContainerHeaderService.updateById(receiptContainerHeader);
return success;
}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java
index 937e008..e6b0176 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java
@@ -222,7 +222,7 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
combinationModel.setShipQty(inventoryQty);
shipmentQty = shipmentQty.subtract(inventoryQty);
}
- Result result = huahengMultiHandlerService.combination(combinationModel);
+ Result result = shipmentCombinationService.combination(combinationModel);
if (!result.isSuccess()) {
throw new JeecgBootException(result.getMessage());
}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
index 5990fe6..6f18a45 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
@@ -867,7 +867,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
}
@Override
- @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)
+ @Transactional
public Result sendTaskToWcs(Integer taskId) {
TaskHeader taskHeader = taskHeaderService.getById(taskId);
if (taskHeader == null) {