From 0beb4e197c13ccce94a943e158993c503700f4da Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 20 八月 2026 17:57:23 +0800
Subject: [PATCH] feat(sales): 实现发货模块部分发货与批量发货功能
---
src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java | 44 ++++++++++++++++++++++++++++++++++----------
1 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
index 9c92254..1fceab7 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
@@ -9,7 +9,9 @@
import com.ruoyi.device.dto.DeviceMaintenanceDto;
import com.ruoyi.device.execl.DeviceMaintenanceExeclDto;
import com.ruoyi.device.mapper.DeviceMaintenanceMapper;
+import com.ruoyi.device.pojo.DeviceLedger;
import com.ruoyi.device.pojo.DeviceMaintenance;
+import com.ruoyi.device.service.IDeviceLedgerService;
import com.ruoyi.device.service.IDeviceMaintenanceService;
import com.ruoyi.framework.web.domain.AjaxResult;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,7 +19,6 @@
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
@@ -28,6 +29,9 @@
@Autowired
private DeviceMaintenanceMapper deviceMaintenanceMapper;
+
+ @Autowired
+ private IDeviceLedgerService deviceLedgerService;
@Override
public IPage<DeviceMaintenanceDto> queryPage(Page page, DeviceMaintenanceDto deviceMaintenanceDto) {
@@ -45,6 +49,31 @@
}
@Override
+ public AjaxResult batchSaveDeviceRepair(DeviceMaintenance deviceMaintenance) {
+ List<Long> deviceIds = deviceMaintenance.getDeviceIds();
+ List<DeviceMaintenance> list = new ArrayList<>();
+ for (Long deviceId : deviceIds) {
+ DeviceLedger ledger = deviceLedgerService.getById(deviceId);
+ if (ledger == null) {
+ continue;
+ }
+ DeviceMaintenance m = new DeviceMaintenance();
+ m.setDeviceLedgerId(deviceId);
+ m.setDeviceName(ledger.getDeviceName());
+ m.setDeviceModel(ledger.getDeviceModel());
+ m.setMaintenancePlanTime(deviceMaintenance.getMaintenancePlanTime());
+ m.setMaintenanceItem(deviceMaintenance.getMaintenanceItem());
+ m.setCreateUser(deviceMaintenance.getCreateUser());
+ m.setStatus(0);
+ list.add(m);
+ }
+ if (list.isEmpty()) {
+ return AjaxResult.error("鏈壘鍒版湁鏁堣澶�");
+ }
+ return this.saveBatch(list) ? AjaxResult.success() : AjaxResult.error();
+ }
+
+ @Override
public AjaxResult updateDeviceDeviceMaintenance(DeviceMaintenance deviceMaintenance) {
if (this.updateById(deviceMaintenance)) {
return AjaxResult.success();
@@ -54,18 +83,13 @@
@Override
public void export(HttpServletResponse response, Long[] ids) {
- ArrayList<Long> arrayList = new ArrayList<>();
- Arrays.stream(ids).map(id -> {
- return arrayList.add( id);
- });
- List<DeviceMaintenance> supplierManageList = deviceMaintenanceMapper.selectBatchIds(arrayList);
+ List<DeviceMaintenance> supplierManageList = deviceMaintenanceMapper.selectList(null);
ArrayList<DeviceMaintenanceExeclDto> deviceLedgerExeclDtos = new ArrayList<>();
- supplierManageList.stream().forEach(deviceMaintenance -> {
+ supplierManageList.forEach(deviceMaintenance -> {
DeviceMaintenanceExeclDto deviceRepairExeclDto = new DeviceMaintenanceExeclDto();
BeanUtils.copyProperties(deviceMaintenance,deviceRepairExeclDto);
- deviceRepairExeclDto.setStatus(deviceMaintenance.getStatus() == 0 ? "寰呯淮淇�" : "瀹岀粨");
- deviceRepairExeclDto.setMaintenanceResult(deviceMaintenance.getMaintenanceResult() == 0 ? "缁翠慨" : "瀹屽ソ");
-
+ deviceRepairExeclDto.setStatus(deviceMaintenance.getStatus() == 0 ? "寰呯淮淇�" : deviceMaintenance.getStatus() == 1 ? "瀹岀粨" : "澶辫触");
+// deviceRepairExeclDto.setMaintenanceResult(deviceMaintenance.getMaintenanceResult() != null && deviceMaintenance.getMaintenanceResult() == 0 ? "缁翠慨" : "瀹屽ソ");
deviceLedgerExeclDtos.add(deviceRepairExeclDto);
});
ExcelUtil<DeviceMaintenanceExeclDto> util = new ExcelUtil<DeviceMaintenanceExeclDto>(DeviceMaintenanceExeclDto.class);
--
Gitblit v1.9.3