From 12c5c9b4eaaac1dc51cd0be88864260535394541 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 29 九月 2025 16:47:38 +0800
Subject: [PATCH] 业务管理相关页面添加`批号`查询条件
---
inspect-server/src/main/java/com/ruoyi/inspect/dto/ReportPageDto.java | 3 +++
inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPlanVO.java | 3 +++
inspect-server/src/main/java/com/ruoyi/inspect/vo/UnqualifiedHandlerVO.java | 3 +++
inspect-server/src/main/resources/mapper/InsReportMapper.xml | 3 ++-
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 3 ++-
inspect-server/src/main/java/com/ruoyi/inspect/dto/UnqualifiedHandlerDto.java | 3 +++
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java | 11 ++++++-----
inspect-server/src/main/java/com/ruoyi/inspect/dto/InsOrderPlanDTO.java | 3 +++
8 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/dto/InsOrderPlanDTO.java b/inspect-server/src/main/java/com/ruoyi/inspect/dto/InsOrderPlanDTO.java
index bfaa09b..f61b0eb 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/dto/InsOrderPlanDTO.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/dto/InsOrderPlanDTO.java
@@ -32,4 +32,7 @@
@ApiModelProperty("鏄惁澶嶆牳")
private Integer isCheck;
+ @ApiModelProperty("鎵瑰彿")
+ private String updateBatchNo;
+
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/dto/ReportPageDto.java b/inspect-server/src/main/java/com/ruoyi/inspect/dto/ReportPageDto.java
index 1b1c69f..d27c8c9 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/dto/ReportPageDto.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/dto/ReportPageDto.java
@@ -42,4 +42,7 @@
@ApiModelProperty(value = "鍙湅鑷繁鏍囪瘑")
private Integer createOrderUser;
+ @ApiModelProperty(value = "鏇存柊鍚庣殑ifs鎵规鍙�")
+ private String updateBatchNo;
+
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/dto/UnqualifiedHandlerDto.java b/inspect-server/src/main/java/com/ruoyi/inspect/dto/UnqualifiedHandlerDto.java
index 1b0d8e0..d4eb38c 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/dto/UnqualifiedHandlerDto.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/dto/UnqualifiedHandlerDto.java
@@ -68,6 +68,9 @@
@ApiModelProperty("鎵瑰彿")
private String lotBatchNo;
+ @ApiModelProperty("鏇存柊鍚庣殑ifs鎵瑰彿")
+ private String updateBatchNo;
+
@ApiModelProperty("wdr鍙�")
private String waivDevRejNo;
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 dc0649a..0215407 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
@@ -42,9 +42,11 @@
import com.ruoyi.inspect.mapper.InsOrderMapper;
import com.ruoyi.inspect.mapper.InsProductMapper;
import com.ruoyi.inspect.mapper.InsSampleMapper;
+import com.ruoyi.inspect.mapper.InsUnqualifiedHandlerMapper;
import com.ruoyi.inspect.pojo.IfsSplitOrderRecord;
import com.ruoyi.inspect.pojo.InsOrder;
import com.ruoyi.inspect.pojo.InsReport;
+import com.ruoyi.inspect.pojo.InsUnqualifiedHandler;
import com.ruoyi.inspect.service.IfsSplitOrderRecordService;
import com.ruoyi.inspect.service.InsOrderService;
import com.ruoyi.inspect.service.InsReportService;
@@ -100,6 +102,8 @@
private IfsApiUtils ifsApiUtils;
private IfsSplitOrderRecordService ifsSplitOrderRecordService;
+
+ private InsUnqualifiedHandlerMapper insUnqualifiedHandlerMapper;
@Override
@@ -597,16 +601,13 @@
if (!ifsInventoryQuantity.getInspectStatus().equals(2)) {
throw new ErrorException("涓嶅悎鏍肩殑鍘熸潗鏂欐墠鑳借姝ユ斁琛�");
}
-
// todo:闇�瑕佸垽鏂璷a娴佺▼鏄惁鏄姝ユ斁琛�
String toLocation = insOrderService.moveRawMaterial(ifsInventoryQuantity);
- ifsInventoryQuantityMapper.update(null, new LambdaUpdateWrapper<IfsInventoryQuantity>()
+ return ifsInventoryQuantityMapper.update(null, new LambdaUpdateWrapper<IfsInventoryQuantity>()
.set(IfsInventoryQuantity::getInspectStatus, 4)
.set(IfsInventoryQuantity::getToLocation, toLocation)
- .eq(IfsInventoryQuantity::getId, ifsInventoryId));
-
- return true;
+ .eq(IfsInventoryQuantity::getId, ifsInventoryId))>0;
}
/**
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPlanVO.java b/inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPlanVO.java
index 125d3f3..b6be44b 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPlanVO.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPlanVO.java
@@ -78,4 +78,7 @@
@ApiModelProperty(value = "鏄惁涓烘媶鍒嗚鍗�(0:鍚� 1:鏄�)")
private Integer isSplitOrder;
+ @ApiModelProperty(value = "鏇存柊鍚庣殑ifs鎵规鍙�")
+ private String updateBatchNo;
+
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/vo/UnqualifiedHandlerVO.java b/inspect-server/src/main/java/com/ruoyi/inspect/vo/UnqualifiedHandlerVO.java
index bebc1ca..9de2e52 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/vo/UnqualifiedHandlerVO.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/vo/UnqualifiedHandlerVO.java
@@ -68,6 +68,9 @@
@ApiModelProperty("鎵瑰彿")
private String lotBatchNo;
+ @ApiModelProperty("鏇存柊鍚庣殑ifs鎵瑰彿")
+ private String updateBatchNo;
+
@ApiModelProperty("wdr鍙�")
private String waivDevRejNo;
diff --git a/inspect-server/src/main/resources/mapper/InsReportMapper.xml b/inspect-server/src/main/resources/mapper/InsReportMapper.xml
index fa58164..4cb4198 100644
--- a/inspect-server/src/main/resources/mapper/InsReportMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsReportMapper.xml
@@ -18,7 +18,8 @@
io.laboratory,
io.ifs_inventory_id,
iiq.is_copper,
- ip.son_laboratory
+ ip.son_laboratory,
+ iiq.update_batch_no
from ins_report ir
left join ins_order io on io.id = ir.ins_order_id
LEFT JOIN ifs_inventory_quantity iiq ON iiq.id = io.ifs_inventory_id
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index 0357d82..9f9164c 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -193,7 +193,8 @@
ira.url_s,
ira.temp_url_pdf,
iiq.is_copper,
- iiq.is_split_order
+ iiq.is_split_order,
+ iiq.update_batch_no
FROM
ins_order io
LEFT JOIN ins_sample isa ON isa.ins_order_id = io.id
--
Gitblit v1.9.3