From 024504a3933e8f2f86e80383e61fa574524a0d28 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期二, 10 三月 2026 16:39:52 +0800
Subject: [PATCH] logo修改 +入库完成校验
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemController.java | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemController.java
index 638612a..257030e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemController.java
@@ -13,13 +13,16 @@
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.FieldsUtils;
import com.vincent.rsf.server.manager.controller.params.LocToTaskParams;
+import com.vincent.rsf.server.manager.entity.Loc;
import com.vincent.rsf.server.manager.entity.LocItem;
+import com.vincent.rsf.server.manager.entity.ViewStockManage;
import com.vincent.rsf.server.manager.enums.TaskResouceType;
import com.vincent.rsf.server.manager.service.LocItemService;
import com.vincent.rsf.server.manager.service.LocService;
import com.vincent.rsf.server.system.controller.BaseController;
import com.vincent.rsf.server.manager.enums.LocStsType;
import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -40,16 +43,36 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<LocItem, BaseParam> pageParam = new PageParam<>(baseParam, LocItem.class);
+ // 搴撲綅鐘舵�佺瓫閫夛細鍏宠仈 man_loc锛屼笉鑳戒綔涓� man_loc_item 瀛楁鍙備笌 buildWrapper
+ Object useStatus = map.get("useStatus");
+ if (pageParam.getWhere() != null && pageParam.getWhere().getMap() != null) {
+ pageParam.getWhere().getMap().remove("useStatus");
+ }
+ QueryWrapper<LocItem> wrapper = pageParam.buildWrapper(true);
+ if (useStatus != null && StringUtils.isNotBlank(useStatus.toString())) {
+ String status = useStatus.toString().replace("'", "''");
+ wrapper.apply("EXISTS (SELECT 1 FROM man_loc ml WHERE ml.id = man_loc_item.loc_id AND ml.use_status = '" + status + "')");
+ }
+ FieldsUtils.setFieldsFilters(wrapper, pageParam, LocItem.class);
/**鎷兼帴鎵╁睍瀛楁*/
- PageParam<LocItem, BaseParam> page = locItemService.page(pageParam, pageParam.buildWrapper(true));
+ PageParam<LocItem, BaseParam> page = locItemService.page(pageParam, wrapper);
List<LocItem> records = page.getRecords();
for (LocItem record : records) {
if (!Objects.isNull(record.getFieldsIndex())) {
Map<String, String> fields = FieldsUtils.getFields(record.getFieldsIndex());
record.setExtendFields(fields);
}
+ // 濉厖搴撲綅鐘舵�侊紝渚夸簬鍒楄〃灞曠ず
+ if (record.getLocId() != null) {
+ Loc loc = locService.getById(record.getLocId());
+ if (loc != null) {
+ record.setLocUseStatus(loc.getUseStatus());
+ record.setLocUseStatus$(loc.getUseStatus$());
+ }
+ }
}
+ locItemService.fillSpecModelFromMatnrForRecords(records);
page.setRecords(records);
return R.ok().add(page);
@@ -77,7 +100,15 @@
Map<String, String> fields = FieldsUtils.getFields(record.getFieldsIndex());
record.setExtendFields(fields);
}
+ if (record.getLocId() != null) {
+ Loc loc = locService.getById(record.getLocId());
+ if (loc != null) {
+ record.setLocUseStatus(loc.getUseStatus());
+ record.setLocUseStatus$(loc.getUseStatus$());
+ }
+ }
}
+ locItemService.fillSpecModelFromMatnrForRecords(records);
page.setRecords(records);
return R.ok().add(page);
--
Gitblit v1.9.1