From 515dc2664c481e3a65245b71aa1ff4a4d6bfb64f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 21 三月 2025 15:32:06 +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/controller/MatnrController.java | 38 ++++++++++----------------------------
1 files changed, 10 insertions(+), 28 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
index c992c2d..1a763ae 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
@@ -47,7 +47,7 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<Matnr, BaseParam> pageParam = new PageParam<>(baseParam, Matnr.class);
- return R.ok().add( matnrService.getMatnrPage(pageParam));
+ return R.ok().add(matnrService.getMatnrPage(pageParam));
}
@PreAuthorize("hasAuthority('manager:matnr:list')")
@@ -62,11 +62,10 @@
return R.ok().add(matnrService.listByIds(Arrays.asList(ids)));
}
-
@PreAuthorize("hasAuthority('manager:matnr:list')")
@GetMapping("/matnr/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(matnrService.getById(id));
+ return R.ok(matnrService.selectMatnrById(id));
}
@PreAuthorize("hasAuthority('manager:matnr:save')")
@@ -76,36 +75,16 @@
if (Objects.isNull(matnr)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- if (Objects.isNull(matnr.get("matnr"))) {
+ if (Objects.isNull(matnr.get("name"))) {
throw new CoolException("鍚嶇О涓嶈兘涓虹┖锛侊紒");
}
if (Objects.isNull(matnr.get("groupId"))) {
throw new CoolException("鐗╂枡鍒嗙粍涓嶈兘涓虹┖锛侊紒");
}
+ matnr.put("createBy", getLoginUserId());
+ matnr.put("updateBy", getLoginUserId());
+ return matnrService.saveMatnrs(matnr);
- 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);
- }
- /**
- * 鎵╁睍瀛楁瀛樺叆搴�
- */
- String uuid16 = CommonUtil.randomUUID16();
- if (!FieldsUtils.getFieldsSta().isEmpty()) {
- FieldsUtils.saveFields(matnr, uuid16);
- matnr1.setFieldsIndex(uuid16);
- }
-
- matnr1.setCreateBy(getLoginUserId());
- matnr1.setUpdateBy(getLoginUserId());
-
- if (!matnrService.save(matnr1)) {
- return R.error("Save Fail");
- }
- return R.ok("Save Success").add(matnr);
}
@PreAuthorize("hasAuthority('manager:matnr:update')")
@@ -124,9 +103,12 @@
if (!matnrService.updateById(matnr)) {
return R.error("Update Fail");
}
- if (!Objects.isNull(params.get("fieldsIndex"))) {
+ if (!FieldsUtils.getFieldsSta().isEmpty()) {
+ Matnr matnr1 = matnrService.getById(matnr.getId());
+ params.put("fieldsIndex", matnr1.getFieldsIndex());
FieldsUtils.updateFieldsValue(params);
}
+
return R.ok("Update Success").add(matnr);
}
--
Gitblit v1.9.1