瀏覽代碼

update

reset-do-picking-order
CANCERYS\kw093 2 週之前
父節點
當前提交
12179d17b0
共有 1 個文件被更改,包括 12 次插入0 次删除
  1. +12
    -0
      src/main/java/com/ffii/fpsms/modules/productProcess/service/ProductProcessService.kt

+ 12
- 0
src/main/java/com/ffii/fpsms/modules/productProcess/service/ProductProcessService.kt 查看文件

@@ -1027,6 +1027,7 @@ open class ProductProcessService(
val user = userRepository.findByStaffNo(request.staffNo ?: "").orElse(null)
val bomProcess = bomProcessRepository.findById(productProcessLine?.bomProcess?.id ?: 0L).orElse(null)
val bomProcessEquipment = bomProcess?.equipment
val requiresEquipment = bomProcessEquipment != null
// ===== 校验区 =====

// 情况:设备有 + 人空 → 不通过
@@ -1055,6 +1056,17 @@ open class ProductProcessService(
errorPosition = "equipmentId"
)
}
// *** 新增:这道工序需要设备,但是只扫了人、没扫设备码 → 不通过 ***
if (requiresEquipment && user != null && equipmentDetail == null) {
return MessageResponse(
id = request.productProcessLineId,
code = "400",
name = "Equipment Required",
type = "error",
message = "Equipment is required for this process",
errorPosition = "equipmentId"
)
}

// 情况:设备空 + 人空 → 不通过(如你不需要这个,可以去掉或改成通过)
if (equipmentDetail == null && user == null) {


Loading…
取消
儲存