From 138871092ea016a6b1bdd43a7570865acd04473e Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期二, 04 十一月 2025 22:16:21 +0800
Subject: [PATCH] #新增 1. 出库单据优化修改
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java | 71 +++++++++++++++++++++--------------
1 files changed, 42 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..34c5ea3 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,6 +23,7 @@
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.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -41,6 +41,9 @@
@Autowired
private MatnrGroupService matnrGroupService;
+
+ @Autowired
+ private FieldsService fieldsService;
/**
* @return
@@ -75,6 +78,7 @@
* @param list
* @return
*/
+ @Override
public List<Matnr> getMatnrTempletes(List<MatnrsTemplate> list) {
List<Matnr> matnrs = new ArrayList<>();
list.forEach(template -> {
@@ -82,6 +86,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 +95,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,21 +139,24 @@
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());
}
}
+
}
QueryWrapper<Matnr> queryWrapper = pageParam.buildWrapper(true);
queryWrapper.in(!longs.isEmpty(),"group_id", longs);
--
Gitblit v1.9.1