From e211113fb94de4b54577fbcf6986bd5297b1e19e Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 05 五月 2025 16:53:33 +0800
Subject: [PATCH] 收货单优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 6 +++---
rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx | 9 ++-------
rsf-admin/src/i18n/zh.js | 1 +
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 3 +++
rsf-admin/src/i18n/en.js | 1 +
rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx | 3 ++-
6 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 6181644..4406d71 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -349,6 +349,7 @@
flagMix: "flagMix",
},
warehouseAreasItem: {
+ asnCode: 'Order NO.',
areaId: "areaId",
areaName: "areaName",
matnrId: "matnrId",
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 9bd5378..5fad2bf 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -351,6 +351,7 @@
flagMix: "娣锋斁",
},
warehouseAreasItem: {
+ asnCode: '鍗曞彿',
areaId: "浠撳簱鍖哄煙",
areaName: "鍖哄煙鍚嶇О ",
matnrId: "鐗╂枡鏍囪瘑",
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
index e13a7cb..e35ba63 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
@@ -165,13 +165,8 @@
<TextField source="trackCode" label="table.field.asnOrderItem.barcode" />
<TextField source="packName" label="table.field.asnOrderItem.packName" />
<DateField source="updateTime" label="common.field.updateTime" showTime />
- <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
- <TextField source="nickname" />
- </ReferenceField>
- <DateField source="updateTime" label="common.field.updateTime" showTime />
- <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
- <TextField source="nickname" />
- </ReferenceField>
+ <TextField source="updateBy$" label="common.field.updateBy" />
+ <TextField source="createBy$" label="common.field.createBy" />
<DateField source="createTime" label="common.field.createTime" showTime />
<TextField source="memo" label="common.field.memo" sortable={false} />
</StyledDatagrid>
diff --git a/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx b/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx
index b953009..92ec77c 100644
--- a/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx
+++ b/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx
@@ -125,11 +125,12 @@
>
<StyledDatagrid
preferenceKey='warehouseAreasItem'
- bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
+ bulkActionButtons={false}
rowClick={(id, resource, record) => false}
omit={['id', 'createTime', 'memo', 'areaId', 'brand', 'createBy$', 'weight', 'matnrId', 'batch', 'shipperId', 'splrId']}
>
<NumberField source="id" />
+ <TextField source="asnCode" label="table.field.warehouseAreasItem.asnCode" />
<NumberField source="areaId" label="table.field.warehouseAreasItem.areaId" />
<TextField source="areaName" label="table.field.warehouseAreasItem.areaName" />
<NumberField source="matnrId" label="table.field.warehouseAreasItem.matnrId" />
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
index beae2ad..537556c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -808,6 +808,9 @@
*/
@Override
public R getItemByContainer(Map<String, Object> params) {
+ if (Objects.isNull(params.get("code"))) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
//鑾峰彇缁勬嫋鏈敓鎴愪换鍔＄殑缁勬嫋妗�
List<Short> asList = Arrays.asList(Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val), Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val));
Short flagDefect = 0;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
index a8be86f..c255752 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -212,8 +212,8 @@
/**瀵逛换鍔℃槑缁嗘寜浠诲姟涓诲崟杩涜鍒嗙粍*/
listMap.keySet().forEach(key -> {
List<TaskItem> items = listMap.get(key);
- //鏇存柊搴撲綅鏄庣粏
try {
+ //鏇存柊搴撲綅鏄庣粏
saveLocItem(items, key);
} catch (Exception e) {
throw new CoolException("搴撲綅鏄庣粏鏇存柊澶辫触锛侊紒");
@@ -231,10 +231,10 @@
throw new CoolException("鏁版嵁閿欒锛氱粍鎷栨暟鎹笉瀛樺湪锛岃鑱旂郴绠＄悊鍛橈紒锛�");
}
List<TaskItem> items = orderMap.get(key);
- //淇濆瓨搴撳瓨鏄庣粏
try {
+ //淇濆瓨搴撳瓨鏄庣粏
saveStockItems(items, pakinItem);
- //绉诲嚭鏀惰揣鍖哄簱瀛�
+ //绉诲嚭鏀惰揣鍖哄簱瀛橈紝 淇敼缁勬墭鐘舵��
removeReceiptStock(pakinItem);
} catch (Exception e) {
throw new CoolException("搴撳瓨绠＄悊淇濆瓨鏇存柊澶辫触锛侊紒");
--
Gitblit v1.9.1