From a40ecf9cc55abc8dafbd19391d82040b70b590c2 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期二, 24 二月 2026 15:55:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop_jdxaj' into devlop_jdxaj
---
rsf-admin/src/page/work/outBound/OutBoundList.jsx | 44 +++++++++++++++++++++++++-------------------
1 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/rsf-admin/src/page/work/outBound/OutBoundList.jsx b/rsf-admin/src/page/work/outBound/OutBoundList.jsx
index 9fd898b..dc70f67 100644
--- a/rsf-admin/src/page/work/outBound/OutBoundList.jsx
+++ b/rsf-admin/src/page/work/outBound/OutBoundList.jsx
@@ -49,6 +49,7 @@
Card,
} from '@mui/material';
import { EDIT_MODE, REFERENCE_INPUT_PAGESIZE } from '@/config/setting';
+import _ from 'lodash';
import ConfirmButton from "../../components/ConfirmButton";
import TreeSelectInput from "@/page/components/TreeSelectInput";
import { DataGrid, useGridApiRef } from '@mui/x-data-grid';
@@ -56,15 +57,14 @@
import AddIcon from '@mui/icons-material/Add';
import DeleteIcon from '@mui/icons-material/Delete';
import request from '@/utils/request';
+import { formatQuantity } from '@/utils/common';
import LocItemInfoModal from "../components/locItemInfoModal";
import { Delete } from '@mui/icons-material';
-import _, { set } from 'lodash';
import StaSelect from "../components/StaSelect";
import { redirect } from "react-router";
import { number } from "prop-types";
const OutBoundList = () => {
-
const [createDialog, setCreateDialog] = useState(false);
const [tabelData, setTableData] = useState([]);
const [selectedRows, setSelectedRows] = useState([]);
@@ -128,7 +128,6 @@
label={translate("table.field.outBound.outSta")}
onChange={(e) => {
setSta(e.target.value);
- console.log("绔欑偣宸查�夋嫨:", e.target.value);
}}
size="small"
type="[101,103]"
@@ -182,13 +181,12 @@
http(sta, data);
}
const http = async (sta, items) => {
- console.log(items);
-
- const filter = items.filter(item => (item.outQty + item.workQty) > item.anfme);
- if (filter.length > 0) {
- notify(translate('toolbar.request.error.out_stock_qty'))
- return
- }
+ // const filZores = items.filter(item => item.outQty <= 0.0);
+ // const filter = items.filter(item => (item.outQty + item.workQty) > item.anfme);
+ // if (filter.length > 0 || filZores.length > 0) {
+ // notify(translate('toolbar.request.error.out_stock_qty'))
+ // return
+ // }
const { data: { code, data, msg } } = await request.post(`/locItem/generate/task`, { siteNo: sta, items: items });
if (code === 200) {
notify(msg);
@@ -223,6 +221,7 @@
type: 'number',
editable: true,
headerClassName: "custom",
+ valueFormatter: (v) => formatQuantity(v),
},
{
field: 'anfme',
@@ -230,14 +229,15 @@
type: 'number',
width: 100,
editable: false,
+ valueFormatter: (v) => formatQuantity(v),
},
- {
- field: 'workQty',
- headerName: translate('table.field.locItem.workQty'),
- width: 100,
- type: 'number',
- editable: false,
- },
+ // {
+ // field: 'workQty',
+ // headerName: translate('table.field.locItem.workQty'),
+ // width: 100,
+ // type: 'number',
+ // editable: false,
+ // },
{
field: 'locCode',
headerName: translate('table.field.locItem.locCode'),
@@ -315,6 +315,12 @@
const processRowUpdate = (newRow, oldRow) => {
+ // 纭繚outQty涓嶅皬浜�0
+ if (newRow.outQty <= 0) {
+ notify(translate('request.error.qty_not_negative'), { type: 'error', messageArgs: { _: translate('request.error.qty_not_negative') } });
+ return oldRow; // 濡傛灉灏忎簬0锛屼繚鎸佸師鍊间笉鍙�
+ }
+
const rows = tabelData.map((r) =>
r.id === newRow.id ? { ...newRow } : r
)
@@ -348,9 +354,9 @@
},
},
}}
- pageSizeOptions={[10, 25, 50, 100]}
+ pageSizeOptions={[15, 25, 50, 100]}
editMode="row"
- checkboxSelection
+ checkboxSelection = {false}
onRowSelectionModelChange={handleSelectionChange}
selectionModel={selectedRows}
sx={{
--
Gitblit v1.9.1