From 1badfb47887a8b95e422341fb7b44f1610cae11b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 14 七月 2025 20:16:36 +0800
Subject: [PATCH] no message
---
rsf-admin/src/page/orders/check/SelectMatnrModal.jsx | 4 ++--
rsf-server/src/main/java/com/vincent/rsf/server/system/constant/DictTypeCode.java | 4 +++-
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderItemController.java | 21 ++++++++++-----------
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java | 8 +++++++-
rsf-admin/src/page/orders/check/CheckOrderEdit.jsx | 4 ++--
5 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/rsf-admin/src/page/orders/check/CheckOrderEdit.jsx b/rsf-admin/src/page/orders/check/CheckOrderEdit.jsx
index 0844f23..d15fa5d 100644
--- a/rsf-admin/src/page/orders/check/CheckOrderEdit.jsx
+++ b/rsf-admin/src/page/orders/check/CheckOrderEdit.jsx
@@ -21,8 +21,8 @@
const CheckOrderEdit = () => {
const translate = useTranslate();
- const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_order_type')) || [];
- const business = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_business_type')) || [];
+ const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_order_type' && dict.group == 3)) || [];
+ const business = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_check_order_type')) || [];
return (
<>
diff --git a/rsf-admin/src/page/orders/check/SelectMatnrModal.jsx b/rsf-admin/src/page/orders/check/SelectMatnrModal.jsx
index bf53f9c..3ee3738 100644
--- a/rsf-admin/src/page/orders/check/SelectMatnrModal.jsx
+++ b/rsf-admin/src/page/orders/check/SelectMatnrModal.jsx
@@ -127,7 +127,7 @@
"orders": formData,
"items": tabelData,
}
- const res = await request.post(`/outStock/items/save`, parmas);
+ const res = await request.post(`/check/items/save`, parmas);
if (res?.data?.code === 200) {
setOpen(false);
refresh();
@@ -140,7 +140,7 @@
"orders": formData,
"items": tabelData,
}
- const res = await request.post(`/outStock/items/update`, parmas);
+ const res = await request.post(`/check/items/update`, parmas);
if (res?.data?.code === 200) {
setOpen(false);
refresh();
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderItemController.java
index 470fa54..dc74d9c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderItemController.java
@@ -22,7 +22,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-
import javax.servlet.http.HttpServletResponse;
import java.util.*;
@@ -40,7 +39,7 @@
private CheckOrderItemService checkOrderItemService;
- @PreAuthorize("hasAuthority('manager:checkItem:list')")
+ @PreAuthorize("hasAuthority('manager:check:list')")
@PostMapping("/checkItem/page")
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
@@ -49,25 +48,25 @@
return R.ok().add(checkOrderItemService.page(pageParam, wrapper));
}
- @PreAuthorize("hasAuthority('manager:checkItem:list')")
+ @PreAuthorize("hasAuthority('manager:check:list')")
@PostMapping("/checkItem/list")
public R list(@RequestBody Map<String, Object> map) {
return R.ok().add(checkOrderItemService.list());
}
- @PreAuthorize("hasAuthority('manager:checkItem:list')")
+ @PreAuthorize("hasAuthority('manager:check:list')")
@PostMapping({"/checkItem/many/{ids}", "/checkItem/many/{ids}"})
public R many(@PathVariable Long[] ids) {
return R.ok().add(checkOrderItemService.listByIds(Arrays.asList(ids)));
}
- @PreAuthorize("hasAuthority('manager:checkItem:list')")
+ @PreAuthorize("hasAuthority('manager:check:list')")
@GetMapping("/checkItem/{id}")
public R get(@PathVariable("id") Long id) {
return R.ok().add(checkOrderItemService.getById(id));
}
- @PreAuthorize("hasAuthority('manager:checkItem:save')")
+ @PreAuthorize("hasAuthority('manager:check:save')")
@OperationLog("Create 瀛楀吀鏁版嵁闆�")
@PostMapping("/checkItem/save")
public R save(@RequestBody AsnOrderItem order) {
@@ -81,7 +80,7 @@
return R.ok("Save Success").add(order);
}
- @PreAuthorize("hasAuthority('manager:checkItem:update')")
+ @PreAuthorize("hasAuthority('manager:check:update')")
@OperationLog("Update 瀛楀吀鏁版嵁闆�")
@PostMapping("/checkItem/update")
public R update(@RequestBody AsnOrderItem order) {
@@ -93,7 +92,7 @@
return R.ok("Update Success").add(order);
}
- @PreAuthorize("hasAuthority('manager:checkItem:remove')")
+ @PreAuthorize("hasAuthority('manager:check:remove')")
@OperationLog("Delete 瀛楀吀鏁版嵁闆�")
@PostMapping("/checkItem/remove/{ids}")
public R remove(@PathVariable Long[] ids) {
@@ -103,7 +102,7 @@
return R.ok("Delete Success").add(ids);
}
- @PreAuthorize("hasAuthority('manager:checkItem:list')")
+ @PreAuthorize("hasAuthority('manager:check:list')")
@PostMapping("/checkItem/query")
public R query(@RequestParam(required = false) String condition) {
List<KeyValVo> vos = new ArrayList<>();
@@ -123,7 +122,7 @@
* @description: 鐩樼偣鍗曞鍑�
* @version 1.0
*/
- @PreAuthorize("hasAuthority('manager:checkItem:list')")
+ @PreAuthorize("hasAuthority('manager:check:list')")
@PostMapping("/checkItem/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
List<AsnOrderItem> orders = new ArrayList<>();
@@ -144,7 +143,7 @@
*/
@PostMapping("/checkItem/template/download")
@ApiOperation("涓嬭浇鐩樼偣鍗曟ā鏉�")
- @PreAuthorize("hasAuthority('manager:checkItem:update')")
+ @PreAuthorize("hasAuthority('manager:check:update')")
public void downloadTemplate(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
CheckOrderTemplate template = ExcelUtil.mockData(CheckOrderTemplate.class);
List<CheckOrderTemplate> list = Arrays.asList(template);
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java
index 8f573db..91ee28e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.system.constant.DictTypeCode;
import com.vincent.rsf.server.system.entity.DictData;
import com.vincent.rsf.server.system.service.DictDataService;
@@ -199,9 +200,13 @@
if (Cools.isEmpty(this.exceStatus)){
return "";
}
+ String exceType = DictTypeCode.DICT_ASN_EXCE_STATUS;
+ if (this.type.equals(OrderType.ORDER_CHECK.type)) {
+ exceType = DictTypeCode.SYS_CHECK_EXCE_STATUS;
+ }
DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
- .eq(DictData::getDictTypeCode, DictTypeCode.DICT_ASN_EXCE_STATUS)
+ .eq(DictData::getDictTypeCode, exceType)
.eq(DictData::getValue, this.exceStatus));
if (Objects.isNull(dictData)) {
return null;
@@ -209,6 +214,7 @@
return dictData.getLabel();
}
+
public String getType$(){
if (Cools.isEmpty(this.type)){
return "";
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/DictTypeCode.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/DictTypeCode.java
index 9d1fb4f..023c76a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/DictTypeCode.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/DictTypeCode.java
@@ -78,9 +78,11 @@
*/
public final static String SYS_WAVE_ITEM_EXCE_STATUS = "sys_wave_item_exce_status";
-
/**
* 娉㈡涓嬪彂鎵ц鐘舵��
*/
public final static String SYS_WAVE_EXCE_STATUS = "sys_wave_exce_status";
+
+ /**鐩樼偣鍗曟墽琛岀姸鎬�*/
+ public final static String SYS_CHECK_EXCE_STATUS = "sys_check_exce_status";
}
--
Gitblit v1.9.1