mom-pro2-after.git

			@@ -279,7 +279,17 @@
			feedback.getRouteId(), feedback.getProcessId());
			boolean keyFlag = routeProcess != null && Boolean.TRUE.equals(routeProcess.getKeyFlag());
			boolean checkFlag = routeProcess != null && Boolean.TRUE.equals(routeProcess.getCheckFlag());
			// 2.2 非质检工序：仍有待检数量时不能审批（质检工序的 uncheckQuantity > 0 是正常状态，不做拦截）
			// 2.2 非质检工序：合格品/不良品数量由质检确定；本工序不经过质检，报工未填写时默认全部为合格品
			if (!checkFlag
			&& feedback.getQualifiedQuantity() == null
			&& feedback.getUnqualifiedQuantity() == null) {
			feedback.setQualifiedQuantity(feedback.getFeedbackQuantity());
			feedback.setUnqualifiedQuantity(BigDecimal.ZERO);
			feedbackMapper.updateById(new MesProFeedbackDO().setId(feedback.getId())
			.setQualifiedQuantity(feedback.getFeedbackQuantity())
			.setUnqualifiedQuantity(BigDecimal.ZERO));
			}
			// 2.3 非质检工序：仍有待检数量时不能审批（质检工序的 uncheckQuantity > 0 是正常状态，不做拦截）
			if (!checkFlag
			&& feedback.getUncheckQuantity() != null
			&& feedback.getUncheckQuantity().compareTo(BigDecimal.ZERO) > 0) {
			@@ -361,6 +371,12 @@
			if (ObjUtil.equal(line.getQualityStatus(), MesWmQualityStatusEnum.PASS.getStatus())) {
			qualifiedQty = qualifiedQty.add(line.getQuantity());
			}
			}
			// 1.1 兜底：关键非质检工序审批时产出单行尚未生成，直接采用报工单上的合格/不良数量
			// （非质检工序默认全部为合格品；质检工序的合格/不良在质检回调后按产出行聚合）
			if (CollUtil.isEmpty(lines)) {
			qualifiedQty = ObjectUtil.defaultIfNull(feedback.getQualifiedQuantity(), BigDecimal.ZERO);
			unqualifiedQty = ObjectUtil.defaultIfNull(feedback.getUnqualifiedQuantity(), BigDecimal.ZERO);
			}

			// 2. 更新任务的已生产/合格/不合格数量
			@@ -461,21 +477,11 @@
			if (routeProcess == null) {
			throw exception(PRO_FEEDBACK_ROUTE_PROCESS_INVALID);
			}
			// 4.1 校验数量
			boolean checkFlag = Boolean.TRUE.equals(routeProcess.getCheckFlag());
			if (checkFlag) {
			// 需要检验：只需填报工数量，且必须 > 0
			// 4.1 校验数量：无论是否需要检验，报工只需填报工数量，且必须 > 0
			// 合格品/不良品数量由质检确定（非质检工序在审批时默认全部为合格品）
			if (reqVO.getFeedbackQuantity() == null
			\|\| reqVO.getFeedbackQuantity().compareTo(BigDecimal.ZERO) <= 0) {
			throw exception(PRO_FEEDBACK_QUANTITY_MUST_POSITIVE);
			}
			} else {
			// 不需检验：需填合格品 + 不良品数量，合计 > 0
			BigDecimal qualified = ObjectUtil.defaultIfNull(reqVO.getQualifiedQuantity(), BigDecimal.ZERO);
			BigDecimal unqualified = ObjectUtil.defaultIfNull(reqVO.getUnqualifiedQuantity(), BigDecimal.ZERO);
			if (qualified.add(unqualified).compareTo(BigDecimal.ZERO) <= 0) {
			throw exception(PRO_FEEDBACK_QUALIFIED_UNQUALIFIED_REQUIRED);
			}
			}

			return task;
			@@ -498,19 +504,10 @@
			if (routeProcess == null) {
			throw exception(PRO_FEEDBACK_ROUTE_PROCESS_INVALID);
			}
			// 3. 校验数量
			boolean checkFlag = Boolean.TRUE.equals(routeProcess.getCheckFlag());
			if (checkFlag) {
			// 3. 校验数量：只填报工数量，且必须 > 0（合格品/不良品数量由质检确定）
			if (reqVO.getFeedbackQuantity() == null
			\|\| reqVO.getFeedbackQuantity().compareTo(BigDecimal.ZERO) <= 0) {
			throw exception(PRO_FEEDBACK_QUANTITY_MUST_POSITIVE);
			}
			} else {
			BigDecimal qualified = ObjectUtil.defaultIfNull(reqVO.getQualifiedQuantity(), BigDecimal.ZERO);
			BigDecimal unqualified = ObjectUtil.defaultIfNull(reqVO.getUnqualifiedQuantity(), BigDecimal.ZERO);
			if (qualified.add(unqualified).compareTo(BigDecimal.ZERO) <= 0) {
			throw exception(PRO_FEEDBACK_QUALIFIED_UNQUALIFIED_REQUIRED);
			}
			}
			// 4. 构建报工DO
			MesProFeedbackDO feedback = new MesProFeedbackDO()
			@@ -523,8 +520,6 @@
			.setTaskId(reqVO.getTaskId())
			.setItemId(task.getItemId())
			.setFeedbackQuantity(reqVO.getFeedbackQuantity())
			.setQualifiedQuantity(reqVO.getQualifiedQuantity())
			.setUnqualifiedQuantity(reqVO.getUnqualifiedQuantity())
			.setScheduledQuantity(task.getQuantity())
			.setFeedbackTime(LocalDateTime.now())
			.setStatus(MesProFeedbackStatusEnum.APPROVING.getStatus())
			@@ -533,10 +528,21 @@
			saveParamValues(task.getId(), reqVO.getParamValues());
			// 5. 返回结果
			MesProWorkOrderDO workOrder = workOrderService.getWorkOrder(task.getWorkOrderId());
			// 5.1 报工后剩余可报工数量 = 排产 - 已生产 - 在途（含本次报工）
			BigDecimal reportable = task.getQuantity() == null ? BigDecimal.ZERO : task.getQuantity();
			BigDecimal produced = task.getProducedQuantity() == null ? BigDecimal.ZERO : task.getProducedQuantity();
			BigDecimal inTransit = BigDecimal.ZERO;
			for (MesProFeedbackDO fb : getFeedbackListByTaskId(task.getId())) {
			if (!ObjUtil.equal(fb.getStatus(), MesProFeedbackStatusEnum.FINISHED.getStatus())) {
			inTransit = inTransit.add(fb.getFeedbackQuantity() == null ? BigDecimal.ZERO : fb.getFeedbackQuantity());
			}
			}
			BigDecimal reportableQuantity = reportable.subtract(produced).subtract(inTransit).max(BigDecimal.ZERO);
			return new MesProFeedbackQuickCreateRespVO()
			.setFeedbackId(feedback.getId())
			.setTaskStatus(task.getStatus())
			.setWorkOrderStatus(workOrder != null ? workOrder.getStatus() : null);
			.setWorkOrderStatus(workOrder != null ? workOrder.getStatus() : null)
			.setReportableQuantity(reportableQuantity);
			}

			@Override
			@@ -550,8 +556,6 @@
			MesProFeedbackQuickCreateReqVO singleReq = new MesProFeedbackQuickCreateReqVO();
			singleReq.setTaskId(taskId);
			singleReq.setFeedbackQuantity(reqVO.getFeedbackQuantity());
			singleReq.setQualifiedQuantity(reqVO.getQualifiedQuantity());
			singleReq.setUnqualifiedQuantity(reqVO.getUnqualifiedQuantity());
			singleReq.setRemark(reqVO.getRemark());
			MesProFeedbackQuickCreateRespVO resp = quickCreateFeedback(singleReq);
			results.add(new MesProFeedbackBatchCreateRespVO.BatchResult()