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/controller/InsOrderController.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
index 6250602..d11fa34 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.basic.dto.InventoryDetailDTO;
import com.ruoyi.basic.mapper.IfsInventoryQuantityMapper;
import com.ruoyi.basic.pojo.IfsInventoryQuantity;
import com.ruoyi.basic.pojo.StandardProductList;
@@ -54,6 +55,13 @@
@GetMapping("/selectInsOrderParameter")
public Result selectInsOrderParameter(Page page, SampleOrderDto sampleOrderDto) throws Exception {
return Result.success(insOrderService.selectInsOrderParameter(page, sampleOrderDto));
+ }
+
+ @ApiOperation(value = "澶栬喘涓嬪崟鎴愬搧鏍囩鎵撳嵃")
+ @PostMapping("/labelOutsideOrderPrinting")
+ public Result<List<InventoryDetailDTO>> labelOutsideOrderPrinting(@RequestBody Map<String, Object> param) {
+ List<Integer> ids = (List<Integer>) param.get("ids");
+ return Result.success(insOrderService.labelOutsideOrderPrinting(ids));
}
//鐢ㄤ簬妫�楠屼笅鍗曞尯鍒煡鐪嬫墍鏈夎鍗曞拰鍙煡鐪嬪悓涓�涓鎵樺崟浣嶇殑璁㈠崟
@@ -145,6 +153,12 @@
return Result.success(insProductService.selectNoProducts(page, insProduct,orderId,ids));
}
+ //鎾ら攢瀹℃牳锛屾煡璇㈡挙閿�鐨勬娴嬮」
+ @GetMapping("/getRevocationInsProductList")
+ public Result<?> getRevocationInsProductList(@RequestParam("orderId") Integer orderId){
+ return Result.success(insProductService.getRevocationInsProductList(orderId));
+ }
+
@ApiOperation(value = "寰呮鐨勬挙閿�")
@PostMapping("/updateInspected")
@@ -152,8 +166,8 @@
Integer orderId = (Integer) param.get("orderId");
String ids = (String) param.get("ids");
Integer typeSource = (Integer) param.get("typeSource");
- Long ifsInventoryId = (Long) param.get("ifsInventoryId");
if(Objects.nonNull(typeSource) && typeSource == 1){
+ Long ifsInventoryId = Long.parseLong(param.get("ifsInventoryId").toString());
ifsInventoryQuantityMapper.update(null,new LambdaUpdateWrapper<IfsInventoryQuantity>()
.set(IfsInventoryQuantity::getState,0)
.eq(IfsInventoryQuantity::getId,ifsInventoryId));
--
Gitblit v1.9.3