Merge branch 'master' of https://git.2fi-solutions.com/derek/FPSMS-frontend

src/app/(main)/production/page.tsx

@@ -38,7 +38,7 @@ const production: React.FC = async () => {
           {t("Create Process")}
         </Button> */}
       </Stack>
-      <I18nProvider namespaces={["common", "production","purchaseOrder"]}>
+      <I18nProvider namespaces={["common", "production","purchaseOrder","jo"]}>
         <ProductionProcessPage printerCombo={printerCombo} />  {/* Use new component */}
       </I18nProvider>
     </>

src/app/api/jo/index.ts

@@ -62,6 +62,7 @@ export interface JoDetailPickLine {
   id: number;
   code: string;
   name: string;
+  type: string;
   pickedLotNo?: JoDetailPickedLotNo[];
   reqQty: number;
   uom: string;

src/components/JoSave/JoRelease.tsx

@@ -68,8 +68,11 @@ const JoRelease: React.FC<Props> = ({
 
     const stockCounts = useMemo(() => {
         const totalLines = pickLines.length;
-        const sufficientLines = pickLines.filter(pickLine => isStockSufficient(pickLine)).length;
-        const insufficientLines = totalLines - sufficientLines;
+        const nonMatAndNonItemLines = pickLines.filter(pickLine => 
+            pickLine.type !== 'mat' && pickLine.type !== 'item'
+        );
+        const sufficientLines = nonMatAndNonItemLines.filter(pickLine => isStockSufficient(pickLine)).length;
+        const insufficientLines = nonMatAndNonItemLines.length - sufficientLines;
 
         return {
             total: totalLines,