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 | 45 +++++++++++++++++++++++++++++++++++----------
1 files changed, 35 insertions(+), 10 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 ea5ac0a..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,8 +3,12 @@
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;
+import com.ruoyi.inspect.pojo.InsSample;
import com.ruoyi.inspect.pojo.InsUnqualifiedRetestProduct;
import com.ruoyi.inspect.dto.*;
import com.ruoyi.inspect.vo.InsOrderPrintingVo;
@@ -29,7 +33,7 @@
//淇敼妫�楠屼笅鍗曟暟鎹�
int upInsOrder(Integer orderId,Integer sampleId, String appointed, Integer userId,String sonLaboratory);
- int addInsOrder(List<SampleProductDto> list, InsOrder insOrder, List<List<Integer>> pairing);
+ int addInsOrder(List<SampleProductDto> list, InsOrder insOrder);
Map<String, Object> getInsOrder(Integer id);
@@ -39,19 +43,12 @@
IPage<SampleProductDto2> selectSampleAndProductByOrderId(IPage<SampleProductDto2> page, SampleProductDto2 sampleProductDto);
- IPage<CostStatisticsDto> costStatistics(IPage<CostStatisticsDto> page, CostStatisticsDto costStatisticsDto);
-
- Map<String, Object> costStatistics2(CostStatisticsDto costStatisticsDto);
-
- Map<String, Object> selectSampleDefects(Page page, String inspectionItems, String orderNumber);
int updateStatus(Integer id);
- void export(CostStatisticsDto costStatisticsDto,HttpServletResponse response)throws IOException, ServletException;
-
// 鑾峰彇ifs搴撳瓨淇℃伅
- void getIfsOrder();
+ void getIfsOrder(Map<String,Object> objectMap,Boolean isSplitOrder);
/**
* 淇敼璁㈠崟鍗曞彿
@@ -63,7 +60,7 @@
- void updateIfsInventoryQuantity(Integer id);
+ void updateIfsInventoryQuantity(Long id);
/**
* 閾滄潗涓嬪崟
@@ -95,6 +92,13 @@
List<InsOrderPrintingVo> labelOrderPrinting(List<Integer> ids);
/**
+ * 澶栬喘浜у搧鏍囩鎵撳嵃
+ * @param ids
+ * @return
+ */
+ List<InventoryDetailDTO> labelOutsideOrderPrinting(List<Integer> ids);
+
+ /**
* 鏍规嵁鏍峰搧id鏌ヨ妫�楠岄」鏍�
* @param insSampleId
* @return
@@ -114,4 +118,25 @@
* @param response
*/
void rawAllInsOrderExport(SampleOrderDto sampleOrderDto, HttpServletResponse response);
+
+ /**
+ * 淇敼鏍峰搧鍨嬪彿
+ * @param insSample
+ */
+ void updateSampleModel(InsSample insSample);
+
+ /**
+ * 鏌ヨ褰撳墠鏃堕棿鏄惁娌℃湁璇ユ娴嬮」鐨勬娊鏍疯鍒�
+ * @param sampleList
+ * @param insOrder
+ * @return
+ */
+ Result judgeNotSpotCheckOrder(List<SampleProductDto> sampleList, InsOrder insOrder);
+
+ /**
+ * 绉诲簱鎿嶄綔
+ * @param one
+ * @return
+ */
+ String moveRawMaterial(IfsInventoryQuantity one);
}
--
Gitblit v1.9.3