From d7637e7da67eed5c0c924b1200d839b2ba71a788 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 18 七月 2025 13:54:06 +0800
Subject: [PATCH] #bug修复
---
rsf-admin/src/page/orders/purchase/PurchaseItemList.jsx | 11 +++++++----
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java | 11 +++++++----
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/PurchaseItemServiceImpl.java | 3 +--
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/PurchaseTemplate.java | 3 ++-
4 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/rsf-admin/src/page/orders/purchase/PurchaseItemList.jsx b/rsf-admin/src/page/orders/purchase/PurchaseItemList.jsx
index c029989..ba27383 100644
--- a/rsf-admin/src/page/orders/purchase/PurchaseItemList.jsx
+++ b/rsf-admin/src/page/orders/purchase/PurchaseItemList.jsx
@@ -118,10 +118,13 @@
<StyledDatagrid
preferenceKey='purchaseItem'
bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
- rowClick={(id, resource, record) => {
- setSelect(record)
- setEditDialog(true)
- }}
+ rowClick={
+ false
+ // (id, resource, record) => {
+ // setSelect(record)
+ // setEditDialog(true)
+ // }
+ }
omit={['id', 'createTime', 'purchaseId', 'platItemId','asnQty', 'printQty', 'createBy', 'memo','splrCode','createBy$','statusBool']}
>
<NumberField source="id" />
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/PurchaseTemplate.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/PurchaseTemplate.java
index 975acfa..b9fbc17 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/PurchaseTemplate.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/PurchaseTemplate.java
@@ -8,6 +8,7 @@
import lombok.experimental.Accessors;
import java.io.Serializable;
+import java.util.Date;
@Data
@ExcelAutoColumnSize
@@ -135,7 +136,7 @@
@Excel(name = "棰勮閫佽揪鏃堕棿")
@ApiModelProperty("棰勮閫佽揪鏃堕棿")
@ExcelComment(value = "arrTime", example = "2025-05-21")
- private String arrTime;
+ private Date arrTime;
@Excel(name = "澶囨敞")
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 7026595..d0eb7ca 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
@@ -114,12 +114,15 @@
MatnrGroup group = matnrGroupService.getById(groupId.toString());
if (null != group){
pageParam.getWhere().getMap().remove("groupId");
- 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());
+ if(!group.getCode().equals("01")){
+ 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());
}
- longs.add(group.getId());
+
}
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/PurchaseItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/PurchaseItemServiceImpl.java
index ad3f323..8bea065 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/PurchaseItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/PurchaseItemServiceImpl.java
@@ -72,8 +72,7 @@
}
PurchaseTemplate template = list.stream().findFirst().get();
Purchase purchase = new Purchase();
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
- Date date = dateFormat.parse(template.getArrTime());
+ Date date = template.getArrTime();
BeanUtils.copyProperties(template, purchase);
purchase.setCode(template.getPoCode());
if (StringUtils.isBlank(template.getPoCode())) {
--
Gitblit v1.9.1