From 23eb9c9a21afc8ed065706f0e6494ee998a217b5 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 04 三月 2026 16:35:27 +0800
Subject: [PATCH] fix:1.班次页面：月度统计时间调整为上月26到本月25；班次支持右键添加批注 2.外购下单：KJNS域订单免检自动更新批次属性；外购下单-全部页新增【更新IFS批次属性】按钮，支持更新已提交订单的批次属性 3.资源要求-设备：设备核查计划：核查负责人回显问题修复；设备使用授权：检验项目导出数据错误问题修复
---
inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 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 28bdc73..ef8614b 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.IfsInventoryQuantityDto;
+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;
@@ -30,7 +32,7 @@
//淇敼妫�楠屼笅鍗曟暟鎹�
- int upInsOrder(Integer orderId,Integer sampleId, String appointed, Integer userId,String sonLaboratory);
+ int upInsOrder(Integer orderId, Integer sampleId, String appointed, Integer userId, String sonLaboratory);
int addInsOrder(List<SampleProductDto> list, InsOrder insOrder);
@@ -47,10 +49,11 @@
// 鑾峰彇ifs搴撳瓨淇℃伅
- void getIfsOrder(Map<String,Object> objectMap,Boolean isSplitOrder);
+ void getIfsOrder(Map<String, Object> objectMap, Boolean isSplitOrder);
/**
* 淇敼璁㈠崟鍗曞彿
+ *
* @param insOrder
*/
void updateEntrustCode(InsOrder insOrder);
@@ -58,11 +61,11 @@
List<InsUnqualifiedRetestProduct> getRetestResult(Integer insProductId);
-
void updateIfsInventoryQuantity(Long id);
/**
* 閾滄潗涓嬪崟
+ *
* @param list
* @param copperInsOrder
* @return
@@ -71,6 +74,7 @@
/**
* 淇敼濮旀墭缂栧彿
+ *
* @param insOrder
*/
void updateOrderEntrustCode(InsOrder insOrder);
@@ -78,6 +82,7 @@
/**
* 淇敼妫�楠屼笅鍗曞唴瀹�
+ *
* @param insOrderUpdateDto
* @return
*/
@@ -85,13 +90,17 @@
/**
* 鎴愬搧鏍囩鎵撳嵃
+ *
* @param ids
* @return
*/
List<InsOrderPrintingVo> labelOrderPrinting(List<Integer> ids);
+ List<InventoryDetailDTO> labelOutsideOrderPrinting(List<Integer> ids);
+
/**
* 鏍规嵁鏍峰搧id鏌ヨ妫�楠岄」鏍�
+ *
* @param insSampleId
* @return
*/
@@ -99,6 +108,7 @@
/**
* 娣诲姞閬楁紡鐨勬楠岄」
+ *
* @param omitOrderProductDto
* @return
*/
@@ -106,6 +116,7 @@
/**
* 鎴愬搧妫�楠屽崟瀵煎嚭
+ *
* @param sampleOrderDto
* @param response
*/
@@ -113,12 +124,14 @@
/**
* 淇敼鏍峰搧鍨嬪彿
+ *
* @param insSample
*/
void updateSampleModel(InsSample insSample);
/**
* 鏌ヨ褰撳墠鏃堕棿鏄惁娌℃湁璇ユ娴嬮」鐨勬娊鏍疯鍒�
+ *
* @param sampleList
* @param insOrder
* @return
@@ -128,6 +141,7 @@
/**
* 绉诲簱鎿嶄綔
+ *
* @param one
* @return
*/
--
Gitblit v1.9.3