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 1e633e0..7512f77 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 @@ -25,9 +25,12 @@ import org.jeecg.modules.wms.shipment.shipmentHeader.entity.ShipmentDetail; import org.jeecg.modules.wms.shipment.shipmentHeader.entity.ShipmentHeader; import org.jeecg.modules.wms.shipment.shipmentHeader.service.IShipmentDetailService; import org.jeecg.modules.wms.shipment.shipmentHeader.service.IShipmentHeaderService; +import org.jeecg.modules.wms.task.taskHeader.entity.TaskDetail; import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader; +import org.jeecg.modules.wms.task.taskHeader.service.ITaskDetailService; import org.jeecg.utils.StringUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.lang.ref.WeakReference; @@ -61,12 +64,15 @@ public class MesServiceImpl implements IMesService { private IShipmentContainerDetailService shipmentContainerDetailService; @Resource private IShipmentContainerHeaderService shipmentContainerHeaderService; + @Resource + private ITaskDetailService taskDetailService; /** * 要求入库单详情 必须是不重样的 * @return */ @Override + @Transactional(rollbackFor = Exception.class) public Result receiptMaterial(MesReceiptMaterial mesReceiptMaterial, String warehouseCode) { List<Receive> receiveList = new ArrayList<>(); String referCode = mesReceiptMaterial.getReferCode(); @@ -124,6 +130,7 @@ public class MesServiceImpl implements IMesService { } @Override + @Transactional(rollbackFor = Exception.class) public Result shipmentMaterial(MesShipmentMaterial mesShipmentMaterial, String warehouseCode) { String referCode = mesShipmentMaterial.getReferCode(); String toPort = mesShipmentMaterial.getToPort(); @@ -200,12 +207,17 @@ public class MesServiceImpl implements IMesService { } @Override + @Transactional(rollbackFor = Exception.class) public Result backMesReceipt(TaskHeader taskHeader) { + List<TaskDetail> taskDetailList = taskDetailService.getTaskDetailListByTaskId(taskHeader.getId()); + for(TaskDetail taskDetail : taskDetailList) { + } return null; } @Override + @Transactional(rollbackFor = Exception.class) public Result backMesShipment(TaskHeader taskHeader) { return null; }