From 7f7491da89fdec2ccf678c104b449213ea4fdbef Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 22 七月 2025 13:27:54 +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/api/service/impl/PdaCheckOrderServiceImpl.java | 3 +++
rsf-admin/src/i18n/zh.js | 1 +
rsf-admin/src/i18n/en.js | 1 +
rsf-admin/src/page/task/TaskPanel.jsx | 3 ++-
rsf-admin/src/page/statistics/stockManage/WarehouseStockList.jsx | 15 +++++++++------
5 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 54cddd9..0bc7bb3 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -979,6 +979,7 @@
batch: "batch",
spec: "spec",
model: "model",
+ sourceCode: "sourceCode",
},
stock: {
code: "Code",
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index b902fdd..6137fab 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -1012,6 +1012,7 @@
batch: "鎵规",
spec: "瑙勬牸",
model: "鍨嬪彿",
+ sourceCode: "婧愬崟鎹�",
},
taskItemLog: {
taskItemId: "taskItemId",
diff --git a/rsf-admin/src/page/statistics/stockManage/WarehouseStockList.jsx b/rsf-admin/src/page/statistics/stockManage/WarehouseStockList.jsx
index 9570f91..94fb604 100644
--- a/rsf-admin/src/page/statistics/stockManage/WarehouseStockList.jsx
+++ b/rsf-admin/src/page/statistics/stockManage/WarehouseStockList.jsx
@@ -52,18 +52,21 @@
'& .RaDatagrid-row': {
cursor: 'auto'
},
- '& .column-name': {
- },
-
'& .MuiTableCell-root': {
whiteSpace: 'nowrap',
overflow: 'visible',
textOverflow: 'unset'
- },
- '& .opt': {
+ },
+ '& .opt': {
width: 180,
whiteSpace: 'normal',
- }
+ },
+ '& .column-maktx': {
+ maxWidth: '15em',
+ overflow: 'hidden',
+ textOverflow: 'ellipsis',
+ whiteSpace: 'nowrap',
+ },
}));
diff --git a/rsf-admin/src/page/task/TaskPanel.jsx b/rsf-admin/src/page/task/TaskPanel.jsx
index 6207229..c9c429d 100644
--- a/rsf-admin/src/page/task/TaskPanel.jsx
+++ b/rsf-admin/src/page/task/TaskPanel.jsx
@@ -58,12 +58,13 @@
bulkActionButtons={false}
rowClick={false}
expandSingle
- omit={['id', 'createTime', 'createBy', 'memo', 'taskId', 'orderId', 'orderItemId', 'matnrId']}
+ omit={['id', 'createTime', 'createBy$', 'memo', 'taskId', 'orderId', 'orderItemId', 'matnrId']}
>
<NumberField source="id" />
<NumberField source="taskId" label="table.field.taskItem.taskId" />
<NumberField source="orderId" label="table.field.taskItem.orderId" />
<NumberField source="orderType$" label="table.field.taskItem.orderType" />
+ <TextField source="sourceCode" label="table.field.taskItem.sourceCode" />
<NumberField source="orderItemId" label="table.field.taskItem.orderItemId" />
<NumberField source="matnrId" label="table.field.taskItem.matnrId" />
<TextField source="maktx" label="table.field.taskItem.maktx" />
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java
index 0f6db5a..b6a9e2d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java
@@ -199,6 +199,9 @@
return R.error("鐗╂枡鐮佷负绌�");
}
Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, matnrCode));
+ if (null == matnr){
+ return R.error("鏈壘鍒扮紪鐮佸搴旂殑鏄庣粏");
+ }
CheckDiffItem checkDiffItem = new CheckDiffItem()
.setMatnrCode(matnr.getCode())
.setMaktx(matnr.getName())
--
Gitblit v1.9.1