From 5718539e0cd67224e8c835f4b1f7cedf50d18cc0 Mon Sep 17 00:00:00 2001
From: "MSI\\derek" <abc@gmail.com>
Date: Fri, 23 May 2025 15:33:36 +0800
Subject: [PATCH] update po

---
 src/app/api/po/actions.ts                    |  4 +-
 src/app/api/po/index.ts                      |  7 ++-
 src/components/PoDetail/EscalationForm.tsx   | 41 ++++---------
 src/components/PoDetail/PoInputGrid.tsx      |  1 +
 src/components/PoDetail/PoQcStockInModal.tsx | 14 +++++
 src/components/PoDetail/PutawayForm.tsx      | 63 ++++++++++++++++++--
 6 files changed, 89 insertions(+), 41 deletions(-)

diff --git a/src/app/api/po/actions.ts b/src/app/api/po/actions.ts
index 73fcb9a..9ad00c2 100644
--- a/src/app/api/po/actions.ts
+++ b/src/app/api/po/actions.ts
@@ -50,8 +50,8 @@ export interface PurchaseQCInput {
 export interface EscalationInput {
   status: string
   handler: string
-  acceptedQty: number
-  rejectedQty: number
+  acceptedQty: number // this is the qty to be escalated
+  // escalationQty: number
 }
 export interface PutawayInput {
   status: string
diff --git a/src/app/api/po/index.ts b/src/app/api/po/index.ts
index 4fa6a6e..4e6a055 100644
--- a/src/app/api/po/index.ts
+++ b/src/app/api/po/index.ts
@@ -39,9 +39,12 @@ export interface StockInLine {
   acceptedQty: number
   price: number
   priceUnit: string
-  productDate: string
-  shelfLifeDate: string
+  productionDate: string
+  expiryDate: string
   status: string
+  supplier: string
+  lotNo: string
+  poCode: string
 }
 
   export const fetchPoList = cache(async () => {
diff --git a/src/components/PoDetail/EscalationForm.tsx b/src/components/PoDetail/EscalationForm.tsx
index 93626d6..98385ee 100644
--- a/src/components/PoDetail/EscalationForm.tsx
+++ b/src/components/PoDetail/EscalationForm.tsx
@@ -76,9 +76,12 @@ const EscalationForm: React.FC<Props> = ({
     }
   }, [itemDetail])
 
-  const acceptedQty = watch("acceptedQty")
-  const rejectedQty = watch("rejectedQty")
+  // const acceptedQty = watch("acceptedQty") || 0
+  const acceptedQty = watch("acceptedQty") || 0
 
+  // console.log(acceptedQty)
+  console.log(acceptedQty)
+  console.log(itemDetail.acceptedQty)
   useEffect(() => {
     console.log("triggered")
     setValue("status", status)
@@ -93,7 +96,7 @@ const EscalationForm: React.FC<Props> = ({
       </Grid>
       <Grid item xs={12}>
         <Typography variant="h6" display="block" marginBlockEnd={1}>
-          {t(`to be processed`)}: {itemDetail.acceptedQty - acceptedQty - rejectedQty}
+          {t(`to be processed`)}: {itemDetail.acceptedQty - acceptedQty}
         </Typography>
       </Grid>
       <Grid
@@ -103,17 +106,6 @@ const EscalationForm: React.FC<Props> = ({
         spacing={2}
         sx={{ mt: 0.5 }}
       >
-        {/* <Grid item xs={4}>
-          <TextField
-            label={t("handler")}
-            fullWidth
-            {...register("handler", {
-              required: "handler required!",
-            })}
-            error={Boolean(errors.handler)}
-            helperText={errors.handler?.message}
-          />
-        </Grid> */}
         <Grid item xs={6}>
           <TextField
             label={t("acceptedQty")}
@@ -122,24 +114,11 @@ const EscalationForm: React.FC<Props> = ({
               required: "acceptedQty required!",
               min: 0,
               valueAsNumber: true,
+              max: itemDetail.acceptedQty
             })}
-            // defaultValue={itemDetail.acceptedQty}
-            // error={Boolean(errors.handler)}
-            // helperText={errors.handler?.message}
-          />
-        </Grid>
-        <Grid item xs={6}>
-          <TextField
-            label={t("rejectedQty")}
-            fullWidth
-            {...register("rejectedQty", {
-              required: "rejectedQty required!",
-              min: 0,
-              valueAsNumber: true,
-            })}
-            defaultValue={0}
-            // error={Boolean(errors.handler)}
-            // helperText={errors.handler?.message}
+            defaultValue={itemDetail.acceptedQty}
+            error={Boolean(errors.acceptedQty)}
+            helperText={errors.acceptedQty?.message}
           />
         </Grid>
       </Grid>
diff --git a/src/components/PoDetail/PoInputGrid.tsx b/src/components/PoDetail/PoInputGrid.tsx
index f863d92..dd86171 100644
--- a/src/components/PoDetail/PoInputGrid.tsx
+++ b/src/components/PoDetail/PoInputGrid.tsx
@@ -98,6 +98,7 @@ function PoInputGrid({
   stockInLine,
   warehouse,
 }: Props) {
+  console.log(itemDetail)
   const { t } = useTranslation("home");
   const apiRef = useGridApiRef();
   const [rowModesModel, setRowModesModel] = useState<GridRowModesModel>({});
diff --git a/src/components/PoDetail/PoQcStockInModal.tsx b/src/components/PoDetail/PoQcStockInModal.tsx
index 9b57454..36c6d43 100644
--- a/src/components/PoDetail/PoQcStockInModal.tsx
+++ b/src/components/PoDetail/PoQcStockInModal.tsx
@@ -161,6 +161,20 @@ const PoQcStockInModal: React.FC<Props> = ({
     [t, itemDetail]
   );
   
+  const canSubmit = useMemo(() => {
+    if (type === "qc") {
+      // console.log(itemDetail.status)
+      return formProps.formState.isValid
+    }
+    if (type === "stockIn") {
+      return formProps.formState.isValid
+    }
+    if (type === "putaway") {
+      return formProps.formState.isValid
+    }
+    return true
+  }, [type, itemDetail])
+  console.log(canSubmit)
   return (
     <>
       <Modal open={open} onClose={closeHandler}>
diff --git a/src/components/PoDetail/PutawayForm.tsx b/src/components/PoDetail/PutawayForm.tsx
index 25262da..103fba2 100644
--- a/src/components/PoDetail/PutawayForm.tsx
+++ b/src/components/PoDetail/PutawayForm.tsx
@@ -113,7 +113,7 @@ const PutawayForm: React.FC<Props> = ({ itemDetail, warehouse }) => {
     <Grid container justifyContent="flex-start" alignItems="flex-start">
       <Grid item xs={12}>
         <Typography variant="h6" display="block" marginBlockEnd={1}>
-          {t("Qc Detail")}
+          {t("Putaway Detail")}
         </Typography>
       </Grid>
       <Grid
@@ -123,9 +123,49 @@ const PutawayForm: React.FC<Props> = ({ itemDetail, warehouse }) => {
         spacing={2}
         sx={{ mt: 0.5 }}
       >
+        <Grid item xs={12}>
+          <TextField
+            label={t("LotNo")}
+            fullWidth
+            value={itemDetail.lotNo}
+            disabled
+          />
+        </Grid>
+        <Grid item xs={6}>
+          <TextField
+            label={t("Supplier")}
+            fullWidth
+            value={itemDetail.supplier}
+            disabled
+          />
+        </Grid>
+        <Grid item xs={6}>
+          <TextField
+            label={t("Po Code")}
+            fullWidth
+            value={itemDetail.poCode}
+            disabled
+          />
+        </Grid>
+        <Grid item xs={6}>
+          <TextField
+            label={t("item name")}
+            fullWidth
+            value={itemDetail.itemName}
+            disabled
+          />
+        </Grid>
+        <Grid item xs={6}>
+          <TextField
+            label={t("item no")}
+            fullWidth
+            value={itemDetail.itemNo}
+            disabled
+          />
+        </Grid>
         <Grid item xs={6}>
           <TextField
-            label={t("Total qty")}
+            label={t("qty")}
             fullWidth
             value={itemDetail.acceptedQty}
             disabled
@@ -133,24 +173,35 @@ const PutawayForm: React.FC<Props> = ({ itemDetail, warehouse }) => {
         </Grid>
         <Grid item xs={6}>
           <TextField
-            label={t("Total record qty")}
+            label={t("productionDate")}
             fullWidth
-            value={recordQty}
+            value={itemDetail.productionDate}
             disabled
           />
         </Grid>
-        <Grid item xs={4}>
+        <Grid item xs={12}>
+          <TextField
+            label={t("expiryDate")}
+            fullWidth
+            value={itemDetail.expiryDate}
+            disabled
+          />
+        </Grid>
+        <Grid item xs={6}>
           <TextField
             label={t("acceptedQty")}
             fullWidth
             {...register("acceptedQty", {
               required: "acceptedQty required!",
+              min: 1,
+              max: itemDetail.acceptedQty,
+              valueAsNumber: true,
             })}
             error={Boolean(errors.acceptedQty)}
             helperText={errors.acceptedQty?.message}
           />
         </Grid>
-        <Grid item xs={4}>
+        <Grid item xs={6}>
           <FormControl fullWidth>
             <Autocomplete
               noOptionsText={t("No Warehouse")}