From 675af262e4e511c9a240d9c1fa3332d1dc8d0c42 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 13 一月 2026 13:15:37 +0800
Subject: [PATCH] 1.工时管理：辅助工时编辑后录入人姓名变成编辑人问题修复 2.外购下单：标签打印功能调整 3.人员：培训计划导入导出添加【培训大类】字段 4.业务管理：报检新增【物料属性】字段选择，其余页面添加【物料属性】查询条件以及数据回显
---
inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java
index ab022c5..cb87b26 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.basic.dto.InventoryDetailDTO;
+import com.ruoyi.basic.pojo.IfsInventoryQuantity;
import com.ruoyi.basic.pojo.StandardProductList;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.inspect.pojo.InsOrder;
@@ -46,7 +48,7 @@
// 鑾峰彇ifs搴撳瓨淇℃伅
- void getIfsOrder();
+ void getIfsOrder(Map<String,Object> objectMap,Boolean isSplitOrder);
/**
* 淇敼璁㈠崟鍗曞彿
@@ -58,7 +60,7 @@
- void updateIfsInventoryQuantity(Integer id);
+ void updateIfsInventoryQuantity(Long id);
/**
* 閾滄潗涓嬪崟
@@ -88,6 +90,13 @@
* @return
*/
List<InsOrderPrintingVo> labelOrderPrinting(List<Integer> ids);
+
+ /**
+ * 澶栬喘浜у搧鏍囩鎵撳嵃
+ * @param ids
+ * @return
+ */
+ List<InventoryDetailDTO> labelOutsideOrderPrinting(List<Integer> ids);
/**
* 鏍规嵁鏍峰搧id鏌ヨ妫�楠岄」鏍�
@@ -123,4 +132,11 @@
* @return
*/
Result judgeNotSpotCheckOrder(List<SampleProductDto> sampleList, InsOrder insOrder);
+
+ /**
+ * 绉诲簱鎿嶄綔
+ * @param one
+ * @return
+ */
+ String moveRawMaterial(IfsInventoryQuantity one);
}
--
Gitblit v1.9.3