From e56277542f60f386a109b1b072a1dbda390588fd Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期三, 11 二月 2026 15:54:29 +0800
Subject: [PATCH] EXISTS 保持一致
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java | 82 ++++++++++++++++++++++++++--------------
1 files changed, 53 insertions(+), 29 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java
index 181193c..7f51d3f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java
@@ -6,7 +6,6 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.common.domain.BaseParam;
@@ -24,7 +23,9 @@
import com.vincent.rsf.server.manager.service.MatnrService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
+import com.vincent.rsf.server.system.service.FieldsService;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -41,6 +42,9 @@
@Autowired
private MatnrGroupService matnrGroupService;
+
+ @Autowired
+ private FieldsService fieldsService;
/**
* @return
@@ -75,6 +79,7 @@
* @param list
* @return
*/
+ @Override
public List<Matnr> getMatnrTempletes(List<MatnrsTemplate> list) {
List<Matnr> matnrs = new ArrayList<>();
list.forEach(template -> {
@@ -82,6 +87,7 @@
matnr.setBarcode(template.getBarcode())
.setCode(template.getCode())
.setName(template.getName())
+ .setId(null)
.setDescrible(template.getDescrible())
.setColor(template.getColor())
.setFlagCheck(!Objects.isNull(template.getFlagCheck()) ? Short.parseShort(template.getFlagCheck()) : 0)
@@ -90,36 +96,41 @@
.setValid(!Objects.isNull(template.getValid()) ? Integer.parseInt( template.getValid()) : 0)
.setUnit(template.getUnit())
.setStockUnit(template.getPurUnit())
- .setShipperId(template.getShipperId())
.setSize(template.getSize())
.setSpec(template.getSpec())
.setStagn(!Objects.isNull(template.getStagn()) ? Integer.parseInt(template.getStagn()) : 0)
.setModel(template.getModel())
.setGroupCode(template.getGroupCode())
.setPurUnit(template.getPurUnit())
- .setStockLevel(MatnrLocLevel.getTypeVal(template.getStockLevel()))
+ .setStockLevel(!Objects.isNull(template.getStockLevel()) ? MatnrLocLevel.getTypeVal(template.getStockLevel()) : null)
.setSafeQty(!Objects.isNull(template.getSafeQty()) ? Double.parseDouble(template.getSafeQty()) : 0)
.setMinQty(!Objects.isNull(template.getMinQty()) ? Double.parseDouble(template.getMinQty()) : 0);
if (!Objects.isNull(template.getGroupCode()) || !Objects.isNull(template.getGroupName())) {
MatnrGroup matnrGroups = matnrGroupService.getOne(new LambdaQueryWrapper<MatnrGroup>()
.eq(!Objects.isNull(template.getGroupCode()), MatnrGroup::getCode, template.getGroupCode())
- .eq(!Objects.isNull(template.getGroupName()),MatnrGroup::getName, template.getGroupName()));
- matnr.setGroupId(matnrGroups.getId());
- }
- //鑾峰彇鍔ㄦ�佸瓧娈碉紝骞朵繚瀛樻槑缁嗗唴瀹�
- if (!FieldsUtils.getFieldsSta().isEmpty()) {
- //淇濆瓨鐗╂枡鎵╁睍灞炴�у��
- try {
- Map<String, Object> map = JSONObject.parseObject(JSONObject.toJSONString(template), Map.class);
- String uuid = CommonUtil.randomUUID16();
- boolean b = FieldsUtils.saveFields(map, uuid);
- if (b) {
- matnr.setFieldsIndex(uuid);
- }
- } catch (Exception e) {
- throw new RuntimeException(e);
+ .eq(!Objects.isNull(template.getGroupName()), MatnrGroup::getName, template.getGroupName()));
+ if (!Objects.isNull(matnrGroups)) {
+ matnr.setGroupId(matnrGroups.getId()).setGroupCode(matnrGroups.getCode());
}
}
+// List<Fields> fields = fieldsService.list(new LambdaQueryWrapper<Fields>()
+// .eq(Fields::getUnique, CommonStatus.COMMONSTATUS_NO.val)
+// .eq(Fields::getFlagEnable, CommonStatus.COMMONSTATUS_YES.val));
+//
+// //鑾峰彇鍔ㄦ�佸瓧娈碉紝骞朵繚瀛樻槑缁嗗唴瀹�
+// if (!fields.isEmpty()) {
+// //淇濆瓨鐗╂枡鎵╁睍灞炴�у��
+// try {
+// Map<String, Object> map = JSONObject.parseObject(JSONObject.toJSONString(template), Map.class);
+// String uuid = CommonUtil.randomUUID16();
+// boolean b = FieldsUtils.saveFields(map, uuid);
+// if (b) {
+// matnr.setFieldsIndex(uuid);
+// }
+// } catch (Exception e) {
+// throw new RuntimeException(e);
+// }
+// }
matnrs.add(matnr);
});
return matnrs;
@@ -129,24 +140,37 @@
public PageParam<Matnr, BaseParam> getMatnrPage(PageParam<Matnr, BaseParam> pageParam, Map<String, Object> params) {
List<Long> longs = new ArrayList<>();
if (params.containsKey("groupId")) {
- Object groupId = params.get("groupId");
- MatnrGroup group = matnrGroupService.getById(groupId.toString());
- if (null != group){
- pageParam.getWhere().getMap().remove("groupId");
- if(!group.getCode().equals("01")){
- List<MatnrGroup> matnrGroups = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>()
- .eq(MatnrGroup::getParentId, Long.parseLong(groupId.toString()))
- .select(MatnrGroup::getId));
- if (!matnrGroups.isEmpty()) {
- longs = matnrGroups.stream().map(MatnrGroup::getId).collect(Collectors.toList());
+ if (!Objects.isNull(params.get("groupId"))) {
+ Object groupId = params.get("groupId");
+ MatnrGroup group = matnrGroupService.getById(groupId.toString());
+ if (null != group){
+ pageParam.getWhere().getMap().remove("groupId");
+ if(!group.getCode().equals("01")){
+ List<MatnrGroup> matnrGroups = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>()
+ .eq(MatnrGroup::getParentId, Long.parseLong(groupId.toString()))
+ .select(MatnrGroup::getId));
+ if (!matnrGroups.isEmpty()) {
+ longs = matnrGroups.stream().map(MatnrGroup::getId).collect(Collectors.toList());
+ }
+ longs.add(group.getId());
}
- longs.add(group.getId());
}
}
+
+ }
+ // locUseStatus 浠呯敤浜庝笅鏂� EXISTS 瀛愭煡璇紝涓嶈兘浣滀负 man_matnr 琛ㄥ瓧娈靛弬涓� buildWrapper
+ Object locUseStatus = params.get("locUseStatus");
+ if (pageParam.getWhere() != null && pageParam.getWhere().getMap() != null) {
+ pageParam.getWhere().getMap().remove("locUseStatus");
}
QueryWrapper<Matnr> queryWrapper = pageParam.buildWrapper(true);
queryWrapper.in(!longs.isEmpty(),"group_id", longs);
+ // 鍑哄簱閫夌墿鏂欙細鎸夊簱浣嶇姸鎬佺瓫閫夛紙浠呭睍绀哄湪璇ュ簱浣嶇姸鎬佷笅鏈夋湁鏁堝簱瀛樼殑鐗╂枡锛屼笌 listStockByMatnrIds 鍙ｅ緞涓�鑷达細鎺掗櫎宸插垹鏄庣粏涓庡凡鍒犲簱浣嶏級
+ if (locUseStatus != null && StringUtils.isNotBlank(locUseStatus.toString())) {
+ String useStatus = locUseStatus.toString().replace("'", "''");
+ queryWrapper.apply("EXISTS (SELECT 1 FROM man_loc_item li INNER JOIN man_loc l ON li.loc_id = l.id AND (l.deleted = 0 OR l.deleted IS NULL) WHERE li.matnr_id = man_matnr.id AND li.deleted = 0 AND l.use_status = '" + useStatus + "')");
+ }
FieldsUtils.setFieldsFilters(queryWrapper,pageParam,Matnr.class);
/**鎷兼帴鎵╁睍瀛楁*/
--
Gitblit v1.9.1