From a7418fdc3875d68b03f5d89ceaa0c66a8e3902cd Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 24 十二月 2025 14:03:54 +0800
Subject: [PATCH] 销售订单报检区分物料属性
---
inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java
index bf78e7f..9fd882a 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java
@@ -109,11 +109,12 @@
@PostMapping("/inspectionReport")
public Result<?> inspectionReport(@RequestBody Map<String, Object> param) {
List<Long> ids = (List<Long>) param.get("ids");
- String orderType = Objects.nonNull(param.get("ids"))?param.get("ids").toString():"";
+ String orderType = Objects.nonNull(param.get("orderType"))?param.get("orderType").toString():"";
+ String materialProp = Objects.nonNull(param.get("materialProp"))?param.get("materialProp").toString():"";
if(!OrderType.validateValue(orderType)){
throw new ErrorException("鎵归噺鎶ユ澶辫触,闈炴硶鐨勯攢鍞鍗曞垎绫绘灇涓�");
}
- return Result.success(rawMaterialOrderService.inspectionReport(ids,orderType));
+ return Result.success(rawMaterialOrderService.inspectionReport(ids,orderType,materialProp));
}
/**
@@ -358,4 +359,13 @@
return Result.success(rawMaterialOrderService.confirmSplitOrder(orderSplitDTO));
}
+ /**
+ * 鏍规嵁ifsId鏌ヨ涓嬪崟鏁伴噺
+ */
+ @ApiOperation(value = "鏍规嵁ifsId鏌ヨ涓嬪崟鏁伴噺")
+ @GetMapping("/getOrderCountByIfsId/{ifsId}")
+ public Result getOrderCountByIfsId(@PathVariable("ifsId") Long ifsId){
+ return Result.success(rawMaterialOrderService.getOrderCountByIfsId(ifsId));
+ }
+
}
--
Gitblit v1.9.3