From 951b46befc5b4ec669f882bebd934d64897059f9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 01 八月 2025 12:58:29 +0800
Subject: [PATCH] 调拔单功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java | 56 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 30 insertions(+), 26 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 d0eb7ca..fa494fc 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
@@ -57,39 +57,43 @@
throw new CoolException("鐗╂枡瀵煎叆澶辫触锛侊紒");
}
List<Matnr> matnrs = new ArrayList<>();
- List<Map<String, String>> list = result.getList();
+ List<MatnrsTemplate> list = result.getList();
list.forEach(template -> {
Matnr matnr = new Matnr();
- matnr.setBarcode(template.get("barcode"))
- .setCode(template.get("code"))
- .setDescrible(template.get("describle"))
- .setColor(template.get("color"))
- .setFlagCheck(!Objects.isNull(template.get("flagCheck")) ? Short.parseShort(template.get("flagCheck")) : 0)
- .setWeight(!Objects.isNull(template.get("weight")) ? Double.parseDouble(template.get("weight")) : 0.0)
- .setValidWarn(!Objects.isNull(template.get("validWarn")) ? Integer.parseInt(template.get("validWarn")): 0)
- .setValid(!Objects.isNull(template.get("valid")) ? Integer.parseInt( template.get("valid")) : 0)
- .setUnit(template.get("unit"))
- .setStockUnit(template.get("purUnit"))
- .setSpec(template.get("spec"))
- .setStagn(!Objects.isNull(template.get("stagn")) ? Integer.parseInt(template.get("stagn")) : 0)
- .setModel(template.get("model"))
- .setGroupCode(template.get("groupCode"))
- .setPurUnit(template.get("purUnit"))
- .setStockLevel(!Objects.isNull(template.get("stockLevel")) ? Short.parseShort(template.get("stockLevel")) : 0)
- .setSafeQty(!Objects.isNull(template.get("safeQty")) ? Double.parseDouble(template.get("safeQty")) : 0)
- .setMinQty(!Objects.isNull(template.get("safeQty")) ? Double.parseDouble(template.get("minQty")) : 0);
- if (Objects.isNull(template.get("groupCode")) && Objects.isNull(template.get("groupName"))) {
+ matnr.setBarcode(template.getBarcode())
+ .setCode(template.getCode())
+ .setName(template.getName())
+ .setDescrible(template.getDescrible())
+ .setColor(template.getColor())
+ .setFlagCheck(!Objects.isNull(template.getFlagCheck()) ? Short.parseShort(template.getFlagCheck()) : 0)
+ .setWeight(!Objects.isNull(template.getWeight()) ? Double.parseDouble(template.getWeight()) : 0.0)
+ .setValidWarn(!Objects.isNull(template.getValidWarn()) ? Integer.parseInt(template.getValidWarn()): 0)
+ .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(!Objects.isNull(template.getStockLevel()) ? Short.parseShort(template.getStockLevel()) : 0)
+ .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.get("groupCode")), MatnrGroup::getCode, template.get("groupCode"))
- .eq(!Objects.isNull(template.get("groupName")),MatnrGroup::getName, template.get("groupName")));
+ .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(template, uuid);
+ boolean b = FieldsUtils.saveFields(map, uuid);
if (b) {
matnr.setFieldsIndex(uuid);
}
@@ -115,15 +119,15 @@
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));
+ 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());
}
-
-
}
}
QueryWrapper<Matnr> queryWrapper = pageParam.buildWrapper(true);
--
Gitblit v1.9.1