浏览代码

update

master
CANCERYS\kw093 2 个月前
父节点
当前提交
4650d6d7fa
共有 4 个文件被更改,包括 9 次插入31 次删除
  1. +2
    -2
      src/app/api/pickOrder/actions.ts
  2. +1
    -1
      src/components/FinishedGoodSearch/FGPickOrderCard.tsx
  3. +5
    -27
      src/components/FinishedGoodSearch/GoodPickExecutionRecord.tsx
  4. +1
    -1
      src/components/Jodetail/FGPickOrderCard.tsx

+ 2
- 2
src/app/api/pickOrder/actions.ts 查看文件

@@ -259,7 +259,7 @@ export interface FGPickOrderResponse {
shopPoNo: string; shopPoNo: string;
numberOfCartons: number; numberOfCartons: number;
DepartureTime: string; DepartureTime: string;
truckNo: string;
truckLanceCode: string;
storeId: string; storeId: string;
qrCodeData: number; qrCodeData: number;
} }
@@ -291,7 +291,7 @@ export interface CompletedDoPickOrderResponse {
ticketNo: string; ticketNo: string;
shopPoNo: string; shopPoNo: string;
numberOfCartons: number; numberOfCartons: number;
truckNo: string;
truckLanceCode: string;
storeId: string; storeId: string;
completedDate: string; completedDate: string;
fgPickOrders: FGPickOrderResponse[]; fgPickOrders: FGPickOrderResponse[];


+ 1
- 1
src/components/FinishedGoodSearch/FGPickOrderCard.tsx 查看文件

@@ -84,7 +84,7 @@ const FGPickOrderCard: React.FC<Props> = ({ fgOrder, onQrCodeClick }) => {
label={t("Truck No.")} label={t("Truck No.")}
fullWidth fullWidth
disabled={true} disabled={true}
value={fgOrder.truckNo}
value={fgOrder.truckLanceCode}
/> />
</Grid> </Grid>
<Grid item xs={6}> <Grid item xs={6}>


+ 5
- 27
src/components/FinishedGoodSearch/GoodPickExecutionRecord.tsx 查看文件

@@ -66,28 +66,6 @@ interface Props {
filterArgs: Record<string, any>; filterArgs: Record<string, any>;
} }


// ✅ 新增:已完成的 DO Pick Order 接口
interface CompletedDoPickOrder {
id: number;
pickOrderId: number;
pickOrderCode: string;
pickOrderConsoCode: string;
pickOrderStatus: string;
deliveryOrderId: number;
deliveryNo: string;
deliveryDate: string;
shopId: number;
shopCode: string;
shopName: string;
shopAddress: string;
ticketNo: string;
shopPoNo: string;
numberOfCartons: number;
truckNo: string;
storeId: string;
completedDate: string;
fgPickOrders: FGPickOrderResponse[];
}


// ✅ 新增:Pick Order 数据接口 // ✅ 新增:Pick Order 数据接口
interface PickOrderData { interface PickOrderData {
@@ -107,18 +85,18 @@ const GoodPickExecutionRecord: React.FC<Props> = ({ filterArgs }) => {
const currentUserId = session?.id ? parseInt(session.id) : undefined; const currentUserId = session?.id ? parseInt(session.id) : undefined;
// ✅ 新增:已完成 DO Pick Orders 状态 // ✅ 新增:已完成 DO Pick Orders 状态
const [completedDoPickOrders, setCompletedDoPickOrders] = useState<CompletedDoPickOrder[]>([]);
const [completedDoPickOrders, setCompletedDoPickOrders] = useState<CompletedDoPickOrderResponse[]>([]);
const [completedDoPickOrdersLoading, setCompletedDoPickOrdersLoading] = useState(false); const [completedDoPickOrdersLoading, setCompletedDoPickOrdersLoading] = useState(false);
// ✅ 新增:详情视图状态 // ✅ 新增:详情视图状态
const [selectedDoPickOrder, setSelectedDoPickOrder] = useState<CompletedDoPickOrder | null>(null);
const [selectedDoPickOrder, setSelectedDoPickOrder] = useState<CompletedDoPickOrderResponse | null>(null);
const [showDetailView, setShowDetailView] = useState(false); const [showDetailView, setShowDetailView] = useState(false);
const [detailLotData, setDetailLotData] = useState<any[]>([]); const [detailLotData, setDetailLotData] = useState<any[]>([]);
// ✅ 新增:搜索状态 // ✅ 新增:搜索状态
const [searchQuery, setSearchQuery] = useState<Record<string, any>>({}); const [searchQuery, setSearchQuery] = useState<Record<string, any>>({});
const [filteredDoPickOrders, setFilteredDoPickOrders] = useState<CompletedDoPickOrder[]>([]);
const [filteredDoPickOrders, setFilteredDoPickOrders] = useState<CompletedDoPickOrderResponse[]>([]);
// ✅ 新增:分页状态 // ✅ 新增:分页状态
const [paginationController, setPaginationController] = useState({ const [paginationController, setPaginationController] = useState({
pageNum: 0, pageNum: 0,
@@ -221,7 +199,7 @@ const GoodPickExecutionRecord: React.FC<Props> = ({ filterArgs }) => {
} }
]; ];


const handleDetailClick = useCallback(async (doPickOrder: CompletedDoPickOrder) => {
const handleDetailClick = useCallback(async (doPickOrder: CompletedDoPickOrderResponse) => {
setSelectedDoPickOrder(doPickOrder); setSelectedDoPickOrder(doPickOrder);
setShowDetailView(true); setShowDetailView(true);


+ 1
- 1
src/components/Jodetail/FGPickOrderCard.tsx 查看文件

@@ -98,7 +98,7 @@ const FGPickOrderCard: React.FC<Props> = ({ fgOrder, onQrCodeClick }) => {
label={t("Truck No.")} label={t("Truck No.")}
fullWidth fullWidth
disabled={true} disabled={true}
value={fgOrder.truckNo}
value={fgOrder.truckLanceCode}
/> />
</Grid> </Grid>
<Grid item xs={6}> <Grid item xs={6}>


正在加载...
取消
保存