mirror of
https://gitlab.com/mbugroup/lti-web-client.git
synced 2026-05-20 13:32:00 +00:00
fix: show product options from master instead of warehouse of migration mode
This commit is contained in:
@@ -31,12 +31,14 @@ import {
|
|||||||
RecordingApi,
|
RecordingApi,
|
||||||
ProjectFlockApi,
|
ProjectFlockApi,
|
||||||
} from '@/services/api/production';
|
} from '@/services/api/production';
|
||||||
import { ProductionStandardApi } from '@/services/api/master-data';
|
import { ProductionStandardApi, ProductApi } from '@/services/api/master-data';
|
||||||
import {
|
import {
|
||||||
ProductionStandard,
|
ProductionStandard,
|
||||||
StandardDetails,
|
StandardDetails,
|
||||||
} from '@/types/api/master-data/production-standard';
|
} from '@/types/api/master-data/production-standard';
|
||||||
|
import { Product } from '@/types/api/master-data/product';
|
||||||
import { LocationApi } from '@/services/api/master-data';
|
import { LocationApi } from '@/services/api/master-data';
|
||||||
|
import { SystemSettingsApi } from '@/services/api/system-settings';
|
||||||
import { ProductWarehouseApi } from '@/services/api/inventory';
|
import { ProductWarehouseApi } from '@/services/api/inventory';
|
||||||
import { ProductWarehouse } from '@/types/api/inventory/product-warehouse';
|
import { ProductWarehouse } from '@/types/api/inventory/product-warehouse';
|
||||||
|
|
||||||
@@ -499,6 +501,20 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
|
|||||||
type,
|
type,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
// ===== MIGRATION MODE =====
|
||||||
|
const { data: systemSettingsResponse } = useSWR(
|
||||||
|
SystemSettingsApi.basePath,
|
||||||
|
SystemSettingsApi.getAllFetcher
|
||||||
|
);
|
||||||
|
|
||||||
|
const isMigrationMode = useMemo(() => {
|
||||||
|
if (!isResponseSuccess(systemSettingsResponse)) return false;
|
||||||
|
const setting = systemSettingsResponse.data.find(
|
||||||
|
(s) => s.key === 'allow_negative_pakan_ovk'
|
||||||
|
);
|
||||||
|
return setting?.value === 'true';
|
||||||
|
}, [systemSettingsResponse]);
|
||||||
|
|
||||||
// ===== PAYLOAD CREATION HELPERS =====
|
// ===== PAYLOAD CREATION HELPERS =====
|
||||||
const createGrowingPayload = useCallback(
|
const createGrowingPayload = useCallback(
|
||||||
(values: RecordingGrowingFormValues) => {
|
(values: RecordingGrowingFormValues) => {
|
||||||
@@ -519,7 +535,11 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
|
|||||||
? (values.stocks ?? [])
|
? (values.stocks ?? [])
|
||||||
.filter((s) => s.product_warehouse_id && s.qty)
|
.filter((s) => s.product_warehouse_id && s.qty)
|
||||||
.map((stock) => ({
|
.map((stock) => ({
|
||||||
product_warehouse_id: stock.product_warehouse_id,
|
// In migration mode, product_warehouse_id field holds product.id;
|
||||||
|
// send it as product_id so the backend auto-creates the warehouse entry.
|
||||||
|
...(isMigrationMode
|
||||||
|
? { product_id: stock.product_warehouse_id }
|
||||||
|
: { product_warehouse_id: stock.product_warehouse_id }),
|
||||||
qty: Number(stock.qty) || 0,
|
qty: Number(stock.qty) || 0,
|
||||||
}))
|
}))
|
||||||
: [];
|
: [];
|
||||||
@@ -531,7 +551,11 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
|
|||||||
...(depletions.length > 0 && { depletions }),
|
...(depletions.length > 0 && { depletions }),
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
[recordingRestriction.canEditStock, recordingRestriction.canEditDepletion]
|
[
|
||||||
|
isMigrationMode,
|
||||||
|
recordingRestriction.canEditStock,
|
||||||
|
recordingRestriction.canEditDepletion,
|
||||||
|
]
|
||||||
);
|
);
|
||||||
|
|
||||||
const createLayingPayload = useCallback(
|
const createLayingPayload = useCallback(
|
||||||
@@ -561,7 +585,9 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
|
|||||||
? values.stocks
|
? values.stocks
|
||||||
.filter((s) => s.product_warehouse_id && s.qty)
|
.filter((s) => s.product_warehouse_id && s.qty)
|
||||||
.map((stock) => ({
|
.map((stock) => ({
|
||||||
product_warehouse_id: stock.product_warehouse_id,
|
...(isMigrationMode
|
||||||
|
? { product_id: stock.product_warehouse_id }
|
||||||
|
: { product_warehouse_id: stock.product_warehouse_id }),
|
||||||
qty: Number(stock.qty) || 0,
|
qty: Number(stock.qty) || 0,
|
||||||
}))
|
}))
|
||||||
: [];
|
: [];
|
||||||
@@ -574,7 +600,7 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
|
|||||||
...(eggs && eggs.length > 0 && { eggs }),
|
...(eggs && eggs.length > 0 && { eggs }),
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
[recordingRestriction.canEditStock]
|
[isMigrationMode, recordingRestriction.canEditStock]
|
||||||
);
|
);
|
||||||
|
|
||||||
const isRecordingEditable = useCallback((recording?: Recording) => {
|
const isRecordingEditable = useCallback((recording?: Recording) => {
|
||||||
@@ -603,18 +629,51 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
|
|||||||
return true;
|
return true;
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
|
// When migration mode ON: fetch all master PAKAN/OVK products (no warehouse entry needed).
|
||||||
|
// When migration mode OFF: fetch from product-warehouses as usual.
|
||||||
const {
|
const {
|
||||||
setInputValue: setStockProductInputValue,
|
setInputValue: setStockProductInputValue,
|
||||||
rawData: stockProducts,
|
rawData: stockProductsPW,
|
||||||
isLoadingOptions: isLoadingStockProducts,
|
isLoadingOptions: isLoadingStockProductsPW,
|
||||||
loadMore: loadMoreStockProducts,
|
loadMore: loadMoreStockProductsPW,
|
||||||
} = useSelect(ProductWarehouseApi.basePath, 'id', 'product.name', 'search', {
|
} = useSelect(
|
||||||
flags: 'PAKAN,OVK',
|
isMigrationMode ? null : ProductWarehouseApi.basePath,
|
||||||
limit: '100',
|
'id',
|
||||||
available_only: 'false',
|
'product.name',
|
||||||
location_id: stockProductsLocationId,
|
'search',
|
||||||
...(selectedKandangId ? { kandang_id: selectedKandangId.toString() } : {}),
|
{
|
||||||
});
|
flags: 'PAKAN,OVK',
|
||||||
|
limit: '100',
|
||||||
|
available_only: 'false',
|
||||||
|
location_id: stockProductsLocationId,
|
||||||
|
...(selectedKandangId
|
||||||
|
? { kandang_id: selectedKandangId.toString() }
|
||||||
|
: {}),
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
const {
|
||||||
|
setInputValue: setStockMasterInputValue,
|
||||||
|
rawData: stockProductsMaster,
|
||||||
|
isLoadingOptions: isLoadingStockProductsMaster,
|
||||||
|
loadMore: loadMoreStockProductsMaster,
|
||||||
|
} = useSelect(
|
||||||
|
isMigrationMode ? ProductApi.basePath : null,
|
||||||
|
'id',
|
||||||
|
'name',
|
||||||
|
'search',
|
||||||
|
{ flags: 'PAKAN,OVK', limit: '100' }
|
||||||
|
);
|
||||||
|
|
||||||
|
const isLoadingStockProducts = isMigrationMode
|
||||||
|
? isLoadingStockProductsMaster
|
||||||
|
: isLoadingStockProductsPW;
|
||||||
|
const loadMoreStockProducts = isMigrationMode
|
||||||
|
? loadMoreStockProductsMaster
|
||||||
|
: loadMoreStockProductsPW;
|
||||||
|
const setStockInputValue = isMigrationMode
|
||||||
|
? setStockMasterInputValue
|
||||||
|
: setStockProductInputValue;
|
||||||
|
|
||||||
const {
|
const {
|
||||||
rawData: depletionProductsData,
|
rawData: depletionProductsData,
|
||||||
@@ -999,9 +1058,9 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
|
|||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const items: Array<ProductWarehouse | null | undefined> = [];
|
const items: Array<ProductWarehouse | null | undefined> = [];
|
||||||
|
|
||||||
if (isResponseSuccess(stockProducts)) {
|
if (!isMigrationMode && isResponseSuccess(stockProductsPW)) {
|
||||||
items.push(
|
items.push(
|
||||||
...((stockProducts.data as unknown as ProductWarehouse[]) ?? [])
|
...((stockProductsPW.data as unknown as ProductWarehouse[]) ?? [])
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1035,7 +1094,8 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
|
|||||||
|
|
||||||
mergeKnownProductWarehouses(items);
|
mergeKnownProductWarehouses(items);
|
||||||
}, [
|
}, [
|
||||||
stockProducts,
|
isMigrationMode,
|
||||||
|
stockProductsPW,
|
||||||
depletionProductsData,
|
depletionProductsData,
|
||||||
eggProductsData,
|
eggProductsData,
|
||||||
initialValues,
|
initialValues,
|
||||||
@@ -1066,9 +1126,20 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
|
|||||||
);
|
);
|
||||||
|
|
||||||
const unifiedStockProducts = useMemo(() => {
|
const unifiedStockProducts = useMemo(() => {
|
||||||
const options = isResponseSuccess(stockProducts)
|
if (isMigrationMode) {
|
||||||
|
// In migration mode, show all master PAKAN/OVK products (no warehouse context).
|
||||||
|
// value = product.id; submission will send product_id to the backend.
|
||||||
|
const options: OptionType[] = isResponseSuccess(stockProductsMaster)
|
||||||
|
? (stockProductsMaster.data as unknown as Product[])
|
||||||
|
.map((p) => ({ value: p.id, label: p.name }))
|
||||||
|
.sort((a, b) => a.label.localeCompare(b.label))
|
||||||
|
: [];
|
||||||
|
return options;
|
||||||
|
}
|
||||||
|
|
||||||
|
const options = isResponseSuccess(stockProductsPW)
|
||||||
? buildProductWarehouseOptions(
|
? buildProductWarehouseOptions(
|
||||||
stockProducts.data as unknown as ProductWarehouse[]
|
stockProductsPW.data as unknown as ProductWarehouse[]
|
||||||
)
|
)
|
||||||
: [];
|
: [];
|
||||||
|
|
||||||
@@ -1085,7 +1156,9 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
|
|||||||
|
|
||||||
return options;
|
return options;
|
||||||
}, [
|
}, [
|
||||||
stockProducts,
|
isMigrationMode,
|
||||||
|
stockProductsMaster,
|
||||||
|
stockProductsPW,
|
||||||
buildProductWarehouseOptions,
|
buildProductWarehouseOptions,
|
||||||
initialValues,
|
initialValues,
|
||||||
type,
|
type,
|
||||||
@@ -2797,7 +2870,7 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
|
|||||||
product.value === stock.product_warehouse_id
|
product.value === stock.product_warehouse_id
|
||||||
) || null
|
) || null
|
||||||
}
|
}
|
||||||
onInputChange={setStockProductInputValue}
|
onInputChange={setStockInputValue}
|
||||||
onChange={(selectedOption) => {
|
onChange={(selectedOption) => {
|
||||||
const option =
|
const option =
|
||||||
selectedOption as OptionType | null;
|
selectedOption as OptionType | null;
|
||||||
|
|||||||
Reference in New Issue
Block a user