From c8fde8647b48e7c7d9b3beb6e8c39459f07c9eb2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 08 五月 2025 14:55:46 +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 | 150 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 142 insertions(+), 8 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 30f9f74..6c5fa1b 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,15 +2,19 @@
import cn.afterturn.easypoi.excel.ExcelImportUtil;
import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
+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.common.SpringUtils;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
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;
@@ -18,8 +22,8 @@
import com.vincent.rsf.server.manager.service.MatnrGroupService;
import com.vincent.rsf.server.manager.service.MatnrService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.vincent.rsf.server.system.entity.Fields;
-import com.vincent.rsf.server.system.service.FieldsService;
+import com.vincent.rsf.server.system.constant.SerialRuleCode;
+import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -29,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 {
@@ -81,10 +86,16 @@
}
//鑾峰彇鍔ㄦ�佸瓧娈碉紝骞朵繚瀛樻槑缁嗗唴瀹�
if (!FieldsUtils.getFieldsSta().isEmpty()) {
- String uuid = CommonUtil.randomUUID16();
- matnr.setFieldsIndex(uuid);
//淇濆瓨鐗╂枡鎵╁睍灞炴�у��
- FieldsUtils.saveFields(template, uuid);
+ try {
+ String uuid = CommonUtil.randomUUID16();
+ boolean b = FieldsUtils.saveFields(template, uuid);
+ if (b) {
+ matnr.setFieldsIndex(uuid);
+ }
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
}
matnrs.add(matnr);
});
@@ -96,8 +107,20 @@
}
@Override
- public PageParam<Matnr, BaseParam> getMatnrPage(PageParam<Matnr, BaseParam> pageParam) {
- PageParam<Matnr, BaseParam> page = this.page(pageParam, pageParam.buildWrapper(true));
+ 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);
+ }
+ }
+ }
+ /**鎷兼帴鎵╁睍瀛楁*/
+ PageParam<Matnr, BaseParam> page = this.page(pageParam, queryWrapper);
List<Matnr> records = page.getRecords();
for (Matnr record : records) {
if (!Objects.isNull(record.getFieldsIndex())) {
@@ -108,4 +131,115 @@
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;
+ }
+
+ /**
+ * @desc 鏇存柊鎵╁睍鐗╂枡鎵╁睍瀛楁鍊�
+ * @param matnr
+ * @return
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R saveMatnrs(Map<String, Object> matnr) {
+ Matnr matnr1 = JSONObject.parseObject(JSONObject.toJSONString(matnr), Matnr.class);
+ if (Objects.isNull(matnr1.getCode())) {
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_MATNR_CODE, null);
+ matnr1.setCode(ruleCode);
+ }
+ /**
+ * 鎵╁睍瀛楁瀛樺叆搴�
+ */
+ String uuid16 = CommonUtil.randomUUID16();
+ if (!FieldsUtils.getFieldsSta().isEmpty()) {
+// 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.saveOrUpdate(matnr1)) {
+ return R.error("Save Fail");
+ }
+ return R.ok(matnr1);
+ }
}
--
Gitblit v1.9.1