From 421c70deed474da017e19511cd95bdc099ee7efb Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期三, 11 六月 2025 10:22:19 +0800 Subject: [PATCH] 下发执行显示优化 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 11 ++++++----- rsf-admin/src/page/orders/outStock/OutOrderModal.jsx | 1 - rsf-admin/src/page/orders/outStock/OutStockPublic.jsx | 8 +++++--- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx b/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx index 6ef3697..b8222e7 100644 --- a/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx +++ b/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx @@ -96,7 +96,6 @@ const [drawerVal, setDrawerVal] = useState(false); const refresh = useRefresh(); - const handleClose = (event, reason) => { if (reason !== "backdropClick") { setOpen(false); diff --git a/rsf-admin/src/page/orders/outStock/OutStockPublic.jsx b/rsf-admin/src/page/orders/outStock/OutStockPublic.jsx index 40e4607..6836a37 100644 --- a/rsf-admin/src/page/orders/outStock/OutStockPublic.jsx +++ b/rsf-admin/src/page/orders/outStock/OutStockPublic.jsx @@ -212,12 +212,13 @@ gridRef.current = useGridApiRef(); const columns = [ - { field: 'id', headerName: 'ID', width: 40 }, + // { field: 'id', headerName: 'ID', width: 40 }, { field: 'locCode', headerName: '搴撲綅', width: 110 }, { field: 'barcode', headerName: '瀹瑰櫒', width: 120 }, + { field: 'matnrCode', headerName: '鐗╂枡缂栫爜', width: 120 }, { field: 'batch', headerName: '鎵规', width: 90 }, - { field: 'unit', headerName: '鍗曚綅', width: 90 }, - { field: 'outQty', headerName: '鏈鍑哄簱鏁伴噺', width: 110 }, + { field: 'unit', headerName: '鍗曚綅', width: 60 }, + { field: 'outQty', headerName: '鍑哄簱鏁伴噺', width: 110 ,valueFormatter: (val) => val <= 0 ? '搴撳瓨涓嶈冻' : val,}, { field: 'siteNo', headerName: '鍑哄簱鍙�', @@ -357,6 +358,7 @@ }, }} checkboxSelection + disableRowSelectionOnClick pageSizeOptions={[15, 25, 35, 45]} onRowSelectionModelChange={(ids) => { setSelectedIds(ids) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java index 89e1690..ff095e0 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java @@ -622,13 +622,14 @@ } if (issued.doubleValue() > 0) { LocItem locItem = new LocItem() - .setLocCode("搴撳瓨涓嶈冻") + .setId(new Random().nextLong()) .setMatnrCode(asnOrderItem.getMatnrCode()) .setMaktx(asnOrderItem.getMaktx()) - .setAnfme(issued.doubleValue()) - .setWorkQty(issued.doubleValue()) - .setBatch(asnOrderItem.getBatch()) - ; + .setAnfme(0.00) + .setOutQty(0.00) + .setWorkQty(0.00) + .setUnit(asnOrderItem.getStockUnit()) + .setBatch(asnOrderItem.getSplrBatch()); OrderOutItemDto orderOutItemDto = new OrderOutItemDto(); orderOutItemDto.setLocItem(locItem); list.add(orderOutItemDto); -- Gitblit v1.9.1