diff --git a/src/main/java/com/ffii/fpsms/modules/productProcess/service/ProductProcessService.kt b/src/main/java/com/ffii/fpsms/modules/productProcess/service/ProductProcessService.kt
index 4a09d90..3bfe046 100644
--- a/src/main/java/com/ffii/fpsms/modules/productProcess/service/ProductProcessService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/productProcess/service/ProductProcessService.kt
@@ -1513,13 +1513,13 @@ val sufficientStockQty = bomMaterials
             productProcessLine.startTime = LocalDateTime.now()
             productProcessLineRepository.save(productProcessLine)
         }
-        if(allproductProcessLines.all { it.status == "Completed" }) {
+        if(allproductProcessLines.all { it.status == "Completed"|| it.status == "Pass"  }) {
         updateProductProcessEndTime(productProcessId)
         updateProductProcessStatus(productProcessId, ProductProcessStatus.COMPLETED)
         val productProcess = productProcessRepository.findById(productProcessId).orElse(null)
         val jobOrder = jobOrderRepository.findById(productProcess?.jobOrder?.id?:0L).orElse(null)
         if(jobOrder != null) {
-        jobOrder.status = JobOrderStatus.PENDING_QC
+        jobOrder.status = JobOrderStatus.STORING
         jobOrderRepository.save(jobOrder)
         
             stockInLineService.create(
@@ -1827,9 +1827,8 @@ val sufficientStockQty = bomMaterials
                     val line = lines[index]
 
                     // equipment.description + equipment_detail.name
-                    val equipmentDescription = line.equipment?.description
-                        ?: try { line.bomProcess?.equipment?.description } catch (_: jakarta.persistence.EntityNotFoundException) { null }
-                        ?: line.equipmentType
+                    val equipmentName =  try { line.bomProcess?.equipment?.name } catch (_: jakarta.persistence.EntityNotFoundException) { null }
+                
 
                     val equipmentDetailName = line.equipmentDetailId?.let { id ->
                         equipmentDetailRepository.findById(id).orElse(null)?.name
@@ -1837,7 +1836,7 @@ val sufficientStockQty = bomMaterials
 
                     ProcessStatusInfo(
                         processName = line.name,                       // ✅ 新增：工序名称
-                        equipmentDescription = equipmentDescription,   // ✅ 替代 equipmentCode
+                        equipmentName = equipmentName,   // ✅ 替代 equipmentCode
                         equipmentDetailName = equipmentDetailName,     // ✅ 新增
                         startTime = line.startTime,
                         endTime = line.endTime,
@@ -1849,7 +1848,7 @@ val sufficientStockQty = bomMaterials
                 } else {
                     ProcessStatusInfo(
                         processName = null,
-                        equipmentDescription = null,
+                        equipmentName = null,
                         equipmentDetailName = null,
                         startTime = null,
                         endTime = null,
diff --git a/src/main/java/com/ffii/fpsms/modules/productProcess/web/model/SaveProductProcessRequest.kt b/src/main/java/com/ffii/fpsms/modules/productProcess/web/model/SaveProductProcessRequest.kt
index 997982a..c7df76b 100644
--- a/src/main/java/com/ffii/fpsms/modules/productProcess/web/model/SaveProductProcessRequest.kt
+++ b/src/main/java/com/ffii/fpsms/modules/productProcess/web/model/SaveProductProcessRequest.kt
@@ -221,7 +221,7 @@ data class UpdateProductProcessLineProcessingTimeSetupTimeChangeoverTimeRequest(
 )
 data class ProcessStatusInfo(
     val processName: String?,
-    val equipmentDescription: String?,
+    val equipmentName: String?,
     val equipmentDetailName: String?,
     val startTime: LocalDateTime?,
     val endTime: LocalDateTime?,
diff --git a/src/main/java/com/ffii/fpsms/modules/stock/entity/projection/StockInLineInfo.kt b/src/main/java/com/ffii/fpsms/modules/stock/entity/projection/StockInLineInfo.kt
index 7218193..dddbddf 100644
--- a/src/main/java/com/ffii/fpsms/modules/stock/entity/projection/StockInLineInfo.kt
+++ b/src/main/java/com/ffii/fpsms/modules/stock/entity/projection/StockInLineInfo.kt
@@ -13,6 +13,8 @@ interface StockInLineInfo {
     val itemId: Long
     @get:Value("#{target.item?.name}")
     val itemName: String?
+    @get:Value("#{target.item?.LocationCode}")
+    val locationCode: String?
     val itemNo: String
     @get:Value("#{target.stockIn?.id}")
     val stockInId: Long
@@ -74,4 +76,5 @@ interface PutAwayLineForSil {
     val putawayDate: LocalDateTime?;
     @get:Value("#{target.createdBy}")
     val putawayUser: String?;
+
 }
\ No newline at end of file