From ce1b2967ffe3e33a929f7c537de8a374c789e3ac Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 07 五月 2026 15:15:26 +0800
Subject: [PATCH] ifs批次属性更新：修复接口报错
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
index 2bb2006..798ccdc 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
@@ -51,6 +51,7 @@
import com.ruoyi.inspect.service.InsOrderService;
import com.ruoyi.inspect.service.InsReportService;
import com.ruoyi.inspect.service.RawMaterialOrderService;
+import com.ruoyi.inspect.vo.ProductVo;
import com.ruoyi.performance.mapper.AuxiliaryOutputWorkingHoursMapper;
import com.ruoyi.performance.pojo.AuxiliaryOutputWorkingHours;
import com.ruoyi.system.mapper.UserMapper;
@@ -85,16 +86,27 @@
public class RawMaterialOrderServiceImpl implements RawMaterialOrderService {
private StandardTreeMapper standardTreeMapper;
+
private IfsInventoryQuantityMapper ifsInventoryQuantityMapper;
+
private UserMapper userMapper;
+
private InsOrderService insOrderService;
+
private InsOrderMapper insOrderMapper;
+
private InsSampleMapper insSampleMapper;
+
private final NumberGenerator<InsOrder> numberGenerator;
+
private InsReportService insReportService;
+
private WechatProperty wechatProperty;
+
private ThreadPoolTaskExecutor threadPoolTaskExecutor;
+
private InsProductMapper insProductMapper;
+
private AuxiliaryOutputWorkingHoursMapper auxiliaryOutputWorkingHoursMapper;
private IfsApiUtils ifsApiUtils;
@@ -392,7 +404,7 @@
insOrderMapper.updateById(insOrder);
// 娣诲姞宸ユ椂
- addAuxiliary(insOrder, ifsInventoryQuantity);
+// addAuxiliary(insOrder, ifsInventoryQuantity);
// todo: ifs鐩存帴绉诲簱
insReportService.isRawMaterial(insOrder,true,true);
@@ -487,7 +499,7 @@
insOrderMapper.insert(insOrder);
// 娣诲姞宸ユ椂
- addAuxiliary(insOrder, ifsInventoryQuantity);
+// addAuxiliary(insOrder, ifsInventoryQuantity);
// todo: ifs鐩存帴绉诲簱
insReportService.isRawMaterial(insOrder,true,true);
@@ -625,7 +637,7 @@
insOrderMapper.updateById(insOrder);
// 娣诲姞宸ユ椂
- addAuxiliary(insOrder, ifsInventoryQuantity);
+// addAuxiliary(insOrder, ifsInventoryQuantity);
return insOrder.getId();
}
@@ -772,6 +784,9 @@
}
}
+ //鏌ヨ妫�楠岄」璁板綍
+ List<Long> ifsIds = ifsByOverList.stream().map(IfsInventoryQuantitySupplierDto::getId).collect(Collectors.toList());
+ List<ProductVo> inspectList = insProductMapper.selectInspectListByIfsIfs(ifsIds);
response.setContentType("application/vnd.ms-excel");
@@ -783,10 +798,12 @@
//鏂板缓ExcelWriter
ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).build();
//鑾峰彇sheet0瀵硅薄
- WriteSheet mainSheet = EasyExcel.writerSheet(0, "鍘熸潗鏂欐娴嬩俊鎭鍑�").head(IfsInventoryQuantitySupplierDto.class).build();
+ WriteSheet mainSheet = EasyExcel.writerSheet(0, "鍘熸潗鏂欐娴嬩俊鎭�昏").head(IfsInventoryQuantitySupplierDto.class).build();
+ WriteSheet inspectSheet = EasyExcel.writerSheet(1, "鍘熸潗鏂欐娴嬫暟鎹鎯�").head(ProductVo.class).build();
//鍚憇heet0鍐欏叆鏁版嵁 浼犲叆绌簂ist杩欐牱鍙鍑鸿〃澶�
excelWriter.write(ifsByOverList, mainSheet);
+ excelWriter.write(inspectList, inspectSheet);
//鍏抽棴娴�
excelWriter.finish();
} catch (IOException e) {
--
Gitblit v1.9.3