From 1e7849282875b5bcd237d93f7b496aecb6ede4b6 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 05 五月 2025 10:01:11 +0800
Subject: [PATCH] 1. 任务历史档报错问题修复 2. 单据添加收货单明细不显示问题修复
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskLogController.java | 4 +++-
rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx | 11 ++++++-----
rsf-admin/src/page/orders/asnOrder/AsnWareModal.jsx | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java | 2 +-
rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml | 2 +-
rsf-admin/src/i18n/zh.js | 10 +++++-----
rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx | 13 ++++++-------
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskLog.java | 2 +-
8 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 256c6a2..e68df35 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -568,18 +568,18 @@
spec: "瑙勬牸",
model: "鍨嬪彿",
matnrCode: "鐗╂枡缂栫爜",
- anfme: "璁″垝鏀惰揣鏁�",
- stockUnit: "搴撳瓨鍗曚綅",
+ anfme: "璁″垝鏁�",
+ stockUnit: "鍗曚綅",
isptResult: "璐ㄦ缁撴灉",
purQty: "閲囪喘閲�",
purUnit: "閲囪喘鍗曚綅",
unit: '鍗曚綅',
- qty: "瀹屾垚鏁伴噺",
+ qty: "瀹屾垚鏁�",
safeQty: '鍚堟牸鏁�',
disQty: '涓嶅悎鏍兼暟',
- splrBatch: "渚涘簲鍟嗘壒娆�",
+ splrBatch: "鎵规",
splrCode: "渚涘簲鍟嗙紪鐮�",
- splrName: "渚涘簲鍟嗗悕绉�",
+ splrName: "渚涘簲鍟�",
qrcode: "浜岀淮鐮�",
barcode: "鏉″舰鐮�",
packName: "鍖呰",
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
index 93e1f8c..e13a7cb 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
@@ -123,7 +123,7 @@
actions={(
<TopToolbar>
<FilterButton />
- <MyCreateButton onClick={() => { setCreateDialog(true) }} />
+ {/* <MyCreateButton onClick={() => { setCreateDialog(true) }} /> */}
<SelectColumnsButton preferenceKey='asnOrderItem' />
{/* <MyExportButton /> */}
</TopToolbar>
@@ -133,10 +133,11 @@
<StyledDatagrid
preferenceKey='asnOrderItem'
bulkActionButtons={false}
- rowClick={(id, resource, record) => {
- setSelect(record)
- setEditDialog(true)
- }}
+ rowClick={false}
+ // rowClick={(id, resource, record) => {
+ // setSelect(record)
+ // setEditDialog(true)
+ // }}
omit={['id', 'createTime', 'purQty', 'purUnit', 'poDetlCode', 'createBy', 'memo', 'model', 'packName', 'splrCode', 'qrcode', 'poDetlId', 'matnrId', 'asnId']}
>
<NumberField source="id" />
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
index d001fde..e6c2bec 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
@@ -434,13 +434,6 @@
const notify = useNotify();
const [columns, setColumns] = useState([
-
- {
- field: 'maktx',
- headerName: translate('table.field.asnOrderItem.maktx'),
- width: 250,
- editable: false,
- },
{
field: 'matnrCode',
headerName: translate('table.field.asnOrderItem.matnrCode'),
@@ -448,6 +441,12 @@
editable: false,
},
{
+ field: 'maktx',
+ headerName: translate('table.field.asnOrderItem.maktx'),
+ width: 250,
+ editable: false,
+ },
+ {
field: 'anfme',
headerName: translate('table.field.asnOrderItem.anfme') + "*",
type: 'number',
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnWareModal.jsx b/rsf-admin/src/page/orders/asnOrder/AsnWareModal.jsx
index 770ef8b..aa6ffd3 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnWareModal.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnWareModal.jsx
@@ -183,8 +183,8 @@
const notify = useNotify();
const [columns, setColumns] = useState([
// { field: 'id', headerName: 'ID', width: 100 },
- { field: 'name', headerName: translate('table.field.matnr.name'), width: 300 },
{ field: 'code', headerName: translate('table.field.matnr.code'), width: 200 },
+ { field: 'name', headerName: translate('table.field.matnr.name'), width: 300 },
{ field: 'groupId$', headerName: translate('table.field.matnr.groupId'), width: 100 },
{ field: 'spec', headerName: translate('table.field.matnr.spec'), width: 100 },
{ field: 'model', headerName: translate('table.field.matnr.model'), width: 100 },
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskLogController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskLogController.java
index 6cdf20f..6d6ec3a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskLogController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskLogController.java
@@ -30,7 +30,9 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<TaskLog, BaseParam> pageParam = new PageParam<>(baseParam, TaskLog.class);
- return R.ok().add(taskLogService.page(pageParam, pageParam.buildWrapper(true)));
+// PageParam<TaskLog, BaseParam> logs = taskLogService.page(pageParam, pageParam.buildWrapper(true));
+ return R.ok(taskLogService.page(pageParam, pageParam.buildWrapper(true)));
+// return R.ok().add(taskLogService.page(pageParam, pageParam.buildWrapper(true)));
}
@PreAuthorize("hasAuthority('manager:taskLog:list')")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskLog.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskLog.java
index bb58f96..1dec3f3 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskLog.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskLog.java
@@ -258,7 +258,7 @@
DictData dictDatas = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
.eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_TASK_TYPE)
.eq(DictData::getValue, this.taskType));
- if (Objects.isNull(dictDatas) || Objects.isNull(dictDatas.getLabel())) {
+ if (Cools.isEmpty(dictDatas)) {
return null;
}
return dictDatas.getLabel();
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
index 6f9dbe6..2335a25 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
@@ -163,7 +163,7 @@
* @time 2025/4/7 13:28
*/
@Transactional(rollbackFor = Exception.class)
- private void svaeOrUpdateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) throws Exception{
+ public void svaeOrUpdateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) throws Exception{
AsnOrder orders = params.getOrders();
params.getItems().forEach(item -> {
item.put("asnId", orders.getId());
diff --git a/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml b/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
index 6d3ab9c..07fd049 100644
--- a/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
+++ b/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
@@ -57,7 +57,7 @@
aoi.memo
FROM
man_asn_order_item aoi
- INNER JOIN man_qly_ispt_item qii ON aoi.id = qii.asn_item_id
+ LEFT JOIN man_qly_ispt_item qii ON aoi.id = qii.asn_item_id
) t
${ew.customSqlSegment}
</select>
--
Gitblit v1.9.1