From 42ee4a6d922816e4781e74dae1ada05236986c9d Mon Sep 17 00:00:00 2001
From: "CANCERYS\\kw093" <kw093a011@gmail.com>
Date: Tue, 24 Feb 2026 10:50:27 +0800
Subject: [PATCH] update

---
 src/app/api/stockIssue/actions.ts             |  3 ++
 src/components/General/LoadingComponent.tsx   |  2 +-
 .../InputDataGrid/InputDataGrid.tsx           |  2 +-
 .../Jodetail/FInishedJobOrderRecord.tsx       |  2 +
 .../Jodetail/JobPickExecutionForm.tsx         |  7 ++--
 .../Jodetail/newJobPickExecution.tsx          |  2 +-
 .../ProductionProcessList.tsx                 |  2 +-
 src/components/Qc/QcForm.tsx                  |  2 +-
 src/components/StockIssue/SearchPage.tsx      | 13 +++++++
 src/components/StockIssue/SubmitIssueForm.tsx | 39 +++++++++++++++++--
 src/i18n/zh/common.json                       |  2 +-
 src/i18n/zh/inventory.json                    |  7 ++++
 src/i18n/zh/jo.json                           |  2 +-
 13 files changed, 70 insertions(+), 15 deletions(-)

diff --git a/src/app/api/stockIssue/actions.ts b/src/app/api/stockIssue/actions.ts
index 790c4fe..5d52d32 100644
--- a/src/app/api/stockIssue/actions.ts
+++ b/src/app/api/stockIssue/actions.ts
@@ -25,6 +25,7 @@ export interface StockIssueResult {
   handleStatus: string;
   handleDate: string | null;
   handledBy: number | null;
+  uomDesc: string | null;
 }
 export interface ExpiryItemResult {
   id: number;
@@ -178,6 +179,8 @@ export async function submitMissItem(issueId: number, handler: number) {
     itemDescription: string | null;
     storeLocation: string | null;
     issues: IssueDetailItem[];
+    bookQty: number;
+    uomDesc: string | null;
   }
   
   export interface IssueDetailItem {
diff --git a/src/components/General/LoadingComponent.tsx b/src/components/General/LoadingComponent.tsx
index fc802b2..868d187 100644
--- a/src/components/General/LoadingComponent.tsx
+++ b/src/components/General/LoadingComponent.tsx
@@ -8,7 +8,7 @@ export const LoadingComponent: React.FC = () => {
                 display="flex"
                 justifyContent="center"
                 alignItems="center"
-                // autoheight="true"
+               
             >
                 <CircularProgress />
             </Box>
diff --git a/src/components/InputDataGrid/InputDataGrid.tsx b/src/components/InputDataGrid/InputDataGrid.tsx
index 51ebecf..bab891d 100644
--- a/src/components/InputDataGrid/InputDataGrid.tsx
+++ b/src/components/InputDataGrid/InputDataGrid.tsx
@@ -370,7 +370,7 @@ function InputDataGrid<T, V, E>({
       // columns={!checkboxSelection ? _columns : columns}
       columns={needActions ? _columns : columns}
       editMode="row"
-      // autoHeight
+    
       sx={{
         height: "30vh",
         "--DataGrid-overlayHeight": "100px",
diff --git a/src/components/Jodetail/FInishedJobOrderRecord.tsx b/src/components/Jodetail/FInishedJobOrderRecord.tsx
index e076661..5f5a0a8 100644
--- a/src/components/Jodetail/FInishedJobOrderRecord.tsx
+++ b/src/components/Jodetail/FInishedJobOrderRecord.tsx
@@ -509,9 +509,11 @@ const FInishedJobOrderRecord: React.FC<Props> = ({ filterArgs }) => {
                             size="small"
                             sx={{ mb: 1 }}
                           />
+                          {/*
                           <Typography variant="body2" color="text.secondary">
                             {jobOrderPickOrder.completedItems}/{jobOrderPickOrder.totalItems} {t("items completed")}
                           </Typography>
+                          */}
                           <Chip 
                             label={jobOrderPickOrder.secondScanCompleted ? t("Second Scan Completed") : t("Second Scan Pending")} 
                             color={jobOrderPickOrder.secondScanCompleted ? 'success' : 'warning'}
diff --git a/src/components/Jodetail/JobPickExecutionForm.tsx b/src/components/Jodetail/JobPickExecutionForm.tsx
index 42916c3..80b18e2 100644
--- a/src/components/Jodetail/JobPickExecutionForm.tsx
+++ b/src/components/Jodetail/JobPickExecutionForm.tsx
@@ -247,10 +247,9 @@ useEffect(() => {
     
     // 增加 badPackageQty 判断，确保有坏包装会走 issue 流程
     const badPackageQty = Number((formData as any).badPackageQty) || 0;
-    const isNormalPick = verifiedQty > 0 
-                        && formData.missQty == 0 
-                        && formData.badItemQty == 0
-                        && badPackageQty == 0;
+    const isNormalPick = (formData.missQty == null || formData.missQty === 0) 
+                    && (formData.badItemQty == null || formData.badItemQty === 0)
+                    && (badPackageQty === 0);
     
     if (isNormalPick) {
       if (onNormalPickSubmit) {
diff --git a/src/components/Jodetail/newJobPickExecution.tsx b/src/components/Jodetail/newJobPickExecution.tsx
index 4549061..3b9a9d8 100644
--- a/src/components/Jodetail/newJobPickExecution.tsx
+++ b/src/components/Jodetail/newJobPickExecution.tsx
@@ -1822,7 +1822,7 @@ const JobPickExecution: React.FC<Props> = ({ filterArgs, onBackToList }) => {
   }, [handleSubmitPickQtyWithQty]);
   const handleSubmitAllScanned = useCallback(async () => {
     const scannedLots = combinedLotData.filter(lot => 
-      lot.stockOutLineStatus === 'checked'
+      lot.stockOutLineStatus === 'checked' || lot.stockOutLineStatus === 'partially_completed'
     );
     
     if (scannedLots.length === 0) {
diff --git a/src/components/ProductionProcess/ProductionProcessList.tsx b/src/components/ProductionProcess/ProductionProcessList.tsx
index 2190567..956bdbd 100644
--- a/src/components/ProductionProcess/ProductionProcessList.tsx
+++ b/src/components/ProductionProcess/ProductionProcessList.tsx
@@ -306,7 +306,7 @@ const ProductProcessList: React.FC<ProductProcessListProps> = ({ onSelectProcess
                       </Button>
                       )}
                       {statusLower === "completed" && (
-                        <Button onClick={() => handleViewStockIn(process)}>
+                        <Button  variant="contained" size="small" onClick={() => handleViewStockIn(process)}>
                           {t("view stockin")}
                         </Button>
                       )}
diff --git a/src/components/Qc/QcForm.tsx b/src/components/Qc/QcForm.tsx
index 46a33a4..8fac0e4 100644
--- a/src/components/Qc/QcForm.tsx
+++ b/src/components/Qc/QcForm.tsx
@@ -232,7 +232,7 @@ const QcForm: React.FC<Props> = ({ rows, disabled = false }) => {
 
   return (
     <>
-        // autoHeight
+ 
       <StyledDataGrid
         columns={qcColumns}
         rows={rows}
diff --git a/src/components/StockIssue/SearchPage.tsx b/src/components/StockIssue/SearchPage.tsx
index d14b622..5a0836f 100644
--- a/src/components/StockIssue/SearchPage.tsx
+++ b/src/components/StockIssue/SearchPage.tsx
@@ -169,7 +169,17 @@ const SearchPage: React.FC<Props> = ({ dataList }) => {
       { name: "itemDescription", label: t("Item") },
       { name: "lotNo", label: t("Lot No.") },
       { name: "storeLocation", label: t("Location") },
+      {
+        name: "bookQty",
+        label: t("Book Qty"),
+        renderCell: (item) => (
+          <>{item.bookQty?.toFixed(2) ?? "0"} {item.uomDesc ?? ""}</>
+        ),
+      },
       { name: "issueQty", label: t("Miss Qty") },
+      { name: "uomDesc", label: t("UoM"), renderCell: (item) => (
+        <>{item.uomDesc ?? ""}</>
+      ) },
       {
         name: "id",
         label: t("Action"),
@@ -196,6 +206,9 @@ const SearchPage: React.FC<Props> = ({ dataList }) => {
       { name: "lotNo", label: t("Lot No.") },
       { name: "storeLocation", label: t("Location") },
       { name: "issueQty", label: t("Defective Qty") },
+      { name: "uomDesc", label: t("UoM"), renderCell: (item) => (
+        <>{item.uomDesc ?? ""}</>
+      ) },
       {
         name: "id",
         label: t("Action"),
diff --git a/src/components/StockIssue/SubmitIssueForm.tsx b/src/components/StockIssue/SubmitIssueForm.tsx
index 37d6bab..1a891fe 100644
--- a/src/components/StockIssue/SubmitIssueForm.tsx
+++ b/src/components/StockIssue/SubmitIssueForm.tsx
@@ -49,7 +49,10 @@ const SubmitIssueForm: React.FC<Props> = ({
   const [submitting, setSubmitting] = useState(false);
   const [details, setDetails] = useState<LotIssueDetailResponse | null>(null);
   const [submitQty, setSubmitQty] = useState<string>("");
-
+  const bookQty = details?.bookQty ?? 0;
+  const submitQtyNum = parseFloat(submitQty);
+  const submitQtyValid = !Number.isNaN(submitQtyNum) && submitQtyNum >= 0;
+  const remainAvailable = submitQtyValid ? Math.max(0, bookQty - submitQtyNum) : bookQty;
   useEffect(() => {
     if (open && lotId) {
       loadDetails();
@@ -121,9 +124,17 @@ const SubmitIssueForm: React.FC<Props> = ({
           <Typography variant="body2" sx={{ mb: 1 }}>
             <strong>{t("Lot No.")}:</strong> {details.lotNo}
           </Typography>
-          <Typography variant="body2" sx={{ mb: 2 }}>
+          <Typography variant="body2" sx={{ mb: 1 }}>
             <strong>{t("Location")}:</strong> {details.storeLocation}
           </Typography>
+          <Typography variant="body2" sx={{ mb: 1 }}>
+          <strong>{t("Book Qty")}:</strong>{" "}
+          {details.bookQty} 
+        </Typography>
+        <Typography variant="body2" sx={{ mb: 1 }}>
+          <strong>{t("UoM")}:</strong>{" "}
+          {details.uomDesc ?? ""}
+        </Typography>
         </Box>
 
         <TableContainer component={Paper} sx={{ mb: 2 }}>
@@ -146,8 +157,8 @@ const SubmitIssueForm: React.FC<Props> = ({
                   <TableCell>{issue.pickerName || "-"}</TableCell>
                   <TableCell align="right">
                     {issueType === "miss"
-                      ? issue.missQty?.toFixed(2) || "0"
-                      : issue.issueQty?.toFixed(2) || "0"}
+                      ? issue.missQty?.toFixed(0) || "0"
+                      : issue.issueQty?.toFixed(0) || "0"}
                   </TableCell>
                   <TableCell>{issue.pickOrderCode}</TableCell>
                   <TableCell>{issue.doOrderCode || "-"}</TableCell>
@@ -168,6 +179,26 @@ const SubmitIssueForm: React.FC<Props> = ({
           inputProps={{ min: 0, step: 0.01 }}
           sx={{ mt: 2 }}
         />
+        <TextField
+        fullWidth
+        label={t("Remain available Quantity")}
+        type="number"
+        value={remainAvailable}
+        onChange={(e) => {
+          const raw = e.target.value;
+          if (raw === "") {
+            setSubmitQty("");
+            return;
+          }
+          const remain = parseFloat(raw);
+          if (!Number.isNaN(remain) && remain >= 0) {
+            const newSubmit = Math.max(0, bookQty - remain);
+            setSubmitQty(newSubmit.toFixed(0));
+          }
+        }}
+        inputProps={{ min: 0, step: 0.01, readOnly: false }}
+        sx={{ mt: 2 }}
+      />
       </DialogContent>
       <DialogActions>
         <Button onClick={onClose} disabled={submitting}>
diff --git a/src/i18n/zh/common.json b/src/i18n/zh/common.json
index 342d8da..c09a6cb 100644
--- a/src/i18n/zh/common.json
+++ b/src/i18n/zh/common.json
@@ -13,7 +13,7 @@
     "Overall Time Remaining": "總剩餘時間",
     "Reset": "重置",
     "Search": "搜索",
-    "This lot is rejected, please scan another lot.": "此批次已封存，請掃描另一個批號。",
+    "This lot is rejected, please scan another lot.": "此批次發現問題，請掃描另一個批號。",
     "Process Start Time": "工序開始時間",
     "Stock Req. Qty": "需求數",
     "Staff No Required": "員工編號必填",
diff --git a/src/i18n/zh/inventory.json b/src/i18n/zh/inventory.json
index cd05554..a8eafd1 100644
--- a/src/i18n/zh/inventory.json
+++ b/src/i18n/zh/inventory.json
@@ -12,9 +12,16 @@
   "Record Status": "記錄狀態",
   "Stock take record status updated to not match": "盤點記錄狀態更新為數值不符",
   "available": "可用",
+  "Issue Qty": "問題數量",
+  "Submit Bad Item": "提交不良品",
+  "Remain available Quantity": "剩餘可用數量",
+  "Submitting...": "提交中...",
   "Item-lotNo-ExpiryDate": "貨品-批號-到期日",
+  "Submit Miss Item": "提交缺貨",
   "Item-lotNo-ExpiryDate": "貨品-批號-到期日",
   "not available": "不可用",
+  "Book Qty": "帳面庫存",
+  "Submit Quantity": "提交數量",
   "Batch Submit All": "批量提交所有",
   "Batch Save All": "批量保存所有",
   "Batch Submit All": "批量提交所有",
diff --git a/src/i18n/zh/jo.json b/src/i18n/zh/jo.json
index 4d964f5..ae2bb11 100644
--- a/src/i18n/zh/jo.json
+++ b/src/i18n/zh/jo.json
@@ -120,7 +120,7 @@
   "Pick Order Detail": "提料單細節",
   "Finished Job Order Record": "已完成工單記錄",
   "No. of Items to be Picked": "需提料數量",
-  "No. of Items with Issue During Pick": "提料過程中出現問題的數量",
+  "No. of Items with Issue During Pick": "問題數量",
   "Pick Start Time": "提料開始時間",
   "Pick End Time": "提料結束時間",
   "FG / WIP Item": "成品/半成品",