From ad9930c5cf8624b8056bb9fda164fa65e66ef9cd Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 26 三月 2025 13:30:11 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java | 156 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 128 insertions(+), 28 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 1c875d1..bbc13ea 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
@@ -2,10 +2,10 @@
import cn.afterturn.easypoi.excel.ExcelImportUtil;
import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
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;
@@ -14,6 +14,7 @@
import com.vincent.rsf.server.common.utils.CommonUtil;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.utils.FieldsUtils;
+import com.vincent.rsf.server.manager.controller.params.MatnrToGroupParams;
import com.vincent.rsf.server.manager.entity.MatnrGroup;
import com.vincent.rsf.server.manager.entity.excel.MatnrsTemplate;
import com.vincent.rsf.server.manager.mapper.MatnrMapper;
@@ -32,6 +33,7 @@
import java.util.List;
import java.util.Map;
import java.util.Objects;
+import java.util.stream.Collectors;
@Service("matnrService")
public class MatnrServiceImpl extends ServiceImpl<MatnrMapper, Matnr> implements MatnrService {
@@ -87,7 +89,11 @@
String uuid = CommonUtil.randomUUID16();
matnr.setFieldsIndex(uuid);
//淇濆瓨鐗╂枡鎵╁睍灞炴�у��
- FieldsUtils.saveFields(template, uuid);
+ try {
+ FieldsUtils.saveFields(template, uuid);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
}
matnrs.add(matnr);
});
@@ -99,28 +105,118 @@
}
@Override
- public IPage<Map<String, Object>> getMatnrPage(PageParam<Matnr, BaseParam> pageParam) {
- IPage<Map<String, Object>> reulst = this.baseMapper.selectMatnrs(pageParam, pageParam.buildWrapper(true));
- /**鑾峰彇鐗╂枡鍒嗛〉淇℃伅 */
- List<Map<String, Object>> mapList = reulst.getRecords();
- if (!mapList.isEmpty()) {
- mapList.forEach(map -> {
- if (!Objects.isNull(map.get("fieldsIndex"))) {
- FieldsUtils.mergeFields(map, map.get("fieldsIndex").toString());
+ public PageParam<Matnr, BaseParam> getMatnrPage(PageParam<Matnr, BaseParam> pageParam, Map<String, Object> params) {
+ QueryWrapper<Matnr> queryWrapper = pageParam.buildWrapper(true);
+ if (params.containsKey("groupId")) {
+ Object groupId = params.get("groupId");
+ if (!Objects.isNull(groupId)) {
+ List<MatnrGroup> matnrGroups = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>().eq(MatnrGroup::getParentId, Long.parseLong(groupId.toString())).select(MatnrGroup::getId));
+ if (!matnrGroups.isEmpty()) {
+ List<Long> longs = matnrGroups.stream().map(MatnrGroup::getId).collect(Collectors.toList());
+ queryWrapper.or().in("group_id", longs);
}
- });
+ }
}
- List<Matnr> matnrs = JSONArray.parseArray(JSON.toJSONString(mapList), Matnr.class);
-// PageParam<Matnr, BaseParam> page = this.page(pageParam, pageParam.buildWrapper(true));
-// List<Matnr> records = page.getRecords();
-// for (Matnr record : records) {
-// if (!Objects.isNull(record.getFieldsIndex())) {
-// Map<String, String> fields = FieldsUtils.getFields(record.getFieldsIndex());
-// record.setExtendFields(fields);
-// }
+// IPage<Map<String, Object>> reulst = this.baseMapper.selectMatnrs(pageParam, queryWrapper);
+// /**鑾峰彇鐗╂枡鍒嗛〉淇℃伅 */
+// List<Map<String, Object>> mapList = reulst.getRecords();
+// if (!mapList.isEmpty()) {
+// mapList.forEach(map -> {
+// if (!Objects.isNull(map.get("fieldsIndex"))) {
+// FieldsUtils.mergeFields(map, map.get("fieldsIndex").toString());
+// }
+// });
// }
-// page.setRecords(records);
- return reulst;
+
+ /**鎷兼帴鎵╁睍瀛楁*/
+ PageParam<Matnr, BaseParam> page = this.page(pageParam, queryWrapper);
+ List<Matnr> records = page.getRecords();
+ for (Matnr record : records) {
+ if (!Objects.isNull(record.getFieldsIndex())) {
+ Map<String, String> fields = FieldsUtils.getFields(record.getFieldsIndex());
+ record.setExtendFields(fields);
+ }
+ }
+ page.setRecords(records);
+ return page;
+ }
+
+ @Override
+ public Matnr selectMatnrById(Long id) {
+ Matnr matnr = this.baseMapper.selectById(id);
+ if (Objects.isNull(matnr)) {
+ throw new CoolException("褰撳墠鐗╂枡涓嶅瓨鍦紒锛�");
+ }
+ if (!Objects.isNull(matnr.getFieldsIndex())) {
+ Map<String, String> fields = FieldsUtils.getFields(matnr.getFieldsIndex());
+ matnr.setExtendFields(fields);
+ }
+ return matnr;
+ }
+
+ /**
+ * 鐗╂枡缁戝畾
+ * @param params
+ * @return
+ */
+ @Override
+ public boolean bindMatnrs(MatnrToGroupParams params) {
+ if (Objects.isNull(params) && params.getIds().isEmpty()) {
+ throw new CoolException("鐗╂枡涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(params.getGroupId())) {
+ throw new CoolException("鍒嗙粍涓嶈兘涓虹┖锛侊紒");
+ }
+ MatnrGroup groups = matnrGroupService.getOne(new LambdaQueryWrapper<MatnrGroup>().eq(MatnrGroup::getId, params.getGroupId()));
+ if (Objects.isNull(groups)) {
+ throw new CoolException("鐗╂枡鍒嗙粍涓嶅瓨鍦紒锛�");
+ }
+ if (!this.update(new LambdaUpdateWrapper<Matnr>()
+ .in(Matnr::getId, params.getIds())
+ .set(Matnr::getGroupId, groups.getId())
+ .set(Matnr::getGroupCode, groups.getCode()))) {
+ throw new CoolException("缁戝畾澶辫触锛侊紒");
+ }
+ return true;
+ }
+
+ /**
+ * 鎵归噺淇敼鐗╂枡
+ * @param params
+ * @return
+ */
+ @Override
+ public boolean batchUpdate(MatnrToGroupParams params) {
+ if (Objects.isNull(params.getMatnr())) {
+ throw new CoolException("鐗╂枡灞炴�т笉鑳戒负绌猴紒锛�");
+ }
+ if (Objects.isNull(params.getIds()) || params.getIds().isEmpty()) {
+ throw new CoolException("鎵�閫夌墿鏂欎笉鑳戒负绌猴紒锛�");
+ }
+ Matnr matnr = params.getMatnr();
+ if (!this.update(new LambdaUpdateWrapper<Matnr>().in(Matnr::getId, params.getIds())
+ .set(!Objects.isNull(matnr.getStatus()), Matnr::getStatus, matnr.getStatus())
+ .set(!Objects.isNull(matnr.getFlagCheck()), Matnr::getFlagCheck, matnr.getFlagCheck())
+ .set(!Objects.isNull(matnr.getFlagLabelMange()), Matnr::getFlagLabelMange, matnr.getFlagLabelMange())
+ .set(!Objects.isNull(matnr.getStockLevel()), Matnr::getStockLevel, matnr.getStockLevel())
+ .set(!Objects.isNull(matnr.getShipperId()), Matnr::getShipperId, matnr.getShipperId())
+ .set(!Objects.isNull(matnr.getMinQty()), Matnr::getMinQty, matnr.getMinQty())
+ .set(!Objects.isNull(matnr.getMaxQty()), Matnr::getMaxQty, matnr.getMaxQty())
+ .set(!Objects.isNull(matnr.getValid()), Matnr::getValid, matnr.getValid())
+ .set(!Objects.isNull(matnr.getValidWarn()), Matnr::getValidWarn, matnr.getValidWarn())
+ .set(!Objects.isNull(matnr.getStockUnit()), Matnr::getStockUnit, matnr.getStockUnit())
+ )) {
+ throw new CoolException("鎵归噺鎿嶄綔澶辫触锛侊紒");
+ }
+
+ return true;
+ }
+
+ @Override
+ public PageParam<Matnr, BaseParam> getPages(Map<String, Object> map) {
+
+
+ return null;
}
/**
@@ -134,8 +230,6 @@
Matnr matnr1 = JSONObject.parseObject(JSONObject.toJSONString(matnr), Matnr.class);
if (Objects.isNull(matnr1.getCode())) {
String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_MATNR_CODE, null);
- System.out.println("=========>");
- System.out.println(ruleCode);
matnr1.setCode(ruleCode);
}
/**
@@ -143,12 +237,18 @@
*/
String uuid16 = CommonUtil.randomUUID16();
if (!FieldsUtils.getFieldsSta().isEmpty()) {
- FieldsUtils.saveFields(matnr, uuid16);
- matnr1.setFieldsIndex(uuid16);
+// Map<String, ?> extendFields = (Map<String, ?>) matnr.get("extendFields");
+ try {
+ FieldsUtils.saveFields(matnr, uuid16);
+ matnr1.setFieldsIndex(uuid16);
+ } catch (Exception ex) {
+ log.error(ex.toString());
+ throw new CoolException("鍔ㄦ�佸瓧娈典繚瀛樺け璐�");
+ }
}
- if (!this.save(matnr1)) {
+ if (!this.saveOrUpdate(matnr1)) {
return R.error("Save Fail");
}
- return R.ok("淇濆瓨鎴愬姛!!");
+ return R.ok(matnr1);
}
}
--
Gitblit v1.9.1