From 91bf52413fded1d71f3c6d0e359d3c5c2bbd8900 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期六, 06 九月 2025 17:49:31 +0800
Subject: [PATCH] art: 热处理外协入库、小内圈外协入库、物料调拨
---
src/main/java/org/jeecg/modules/lsw/controller/LswMaterialController.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/lsw/controller/LswMaterialController.java b/src/main/java/org/jeecg/modules/lsw/controller/LswMaterialController.java
index 40bf0cb..00d0f04 100644
--- a/src/main/java/org/jeecg/modules/lsw/controller/LswMaterialController.java
+++ b/src/main/java/org/jeecg/modules/lsw/controller/LswMaterialController.java
@@ -8,6 +8,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.constant.CommonConstant;
@@ -23,6 +24,8 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
/**
@@ -126,7 +129,6 @@
}
- @AutoLog(value = "绾胯竟搴撶墿鏂欎俊鎭�-閫氳繃浜х嚎绫诲瀷鏌ヨ绾胯竟搴撶墿鏂�")
@ApiOperation(value = "绾胯竟搴撶墿鏂欎俊鎭�-閫氳繃浜х嚎绫诲瀷鏌ヨ绾胯竟搴撶墿鏂�", notes = "绾胯竟搴撶墿鏂欎俊鎭�-閫氳繃浜х嚎绫诲瀷鏌ヨ绾胯竟搴撶墿鏂�")
@GetMapping(value = "/queryLswMaterialByProductionType")
public Result<List<LswMaterial>> queryLswMaterialByProductionType(@RequestParam("factoryId") String factoryId) {
@@ -164,4 +166,20 @@
}
return Result.OK(lswMaterialList);
}
+
+ @ApiOperation(value = "绾胯竟搴撶墿鏂欎俊鎭�-鏍规嵁鐗╂枡绫诲瀷鏌ヨ", notes = "绾胯竟搴撶墿鏂欎俊鎭�-鏍规嵁鐗╂枡绫诲瀷鏌ヨ")
+ @GetMapping(value = "/queryByMaterialCategory")
+ public Result<List<LswMaterial>> queryByMaterialCategory(@RequestParam("materialCategory") String materialCategory) {
+ if (StringUtils.isBlank(materialCategory)) {
+ return Result.ok(Collections.emptyList());
+ }
+ String[] split = materialCategory.split(",");
+ LambdaQueryWrapper<LswMaterial> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.in(LswMaterial::getMaterialCategory, Arrays.asList(split));
+ queryWrapper.eq(LswMaterial::getDelFlag, CommonConstant.DEL_FLAG_0);
+ queryWrapper.eq(LswMaterial::getMaterialStatus, CommonConstant.STATUS_1);
+ queryWrapper.orderByAsc(LswMaterial::getMaterialNumber);
+ List<LswMaterial> lswMaterialList = lswMaterialService.list(queryWrapper);
+ return Result.ok(lswMaterialList);
+ }
}
--
Gitblit v1.9.3