sync: 同步 v1.0.4 并脱敏配置与镜像

server/internal/logic/iot/simcardbatch/outbound/async.go

@@ -2,6 +2,7 @@ package outbound
 
 import (
 	"context"
+	"errors"
 	"git.5iot.com/iotlcm-public/iotlcm-admin-svr/internal/library/batchmetadata"
 	"strings"
 
@@ -26,6 +27,10 @@ type AsyncMessage struct {
 	BatchNo string `json:"batchNo"`
 }
 
+var errOutboundValidationRejected = errors.New("存在不满足出库条件的卡，本次未执行")
+
+const outboundNotExecutedReason = "校验通过，但本批次存在失败明细，整批未执行出库"
+
 func SubmitExcelAsync(ctx context.Context, file *ghttp.UploadFile, in *model.TSimCardOutboundExcelSubmitParam) (*batchimport.Result, error) {
 	operator := batchimport.OperatorContext{TenantId: contexts.GetTenantId(ctx), DeptId: contexts.GetDeptId(ctx), UserId: contexts.GetUserId(ctx)}
 	processor := NewProcessor(PreviewOptions{DeptId: operator.DeptId})
@@ -119,8 +124,9 @@ func handleAsyncMessage(ctx context.Context, message AsyncMessage) error {
 		requiredSource = strings.TrimSpace(main.BatchInfo.Get("inboundBatchNo").String())
 	}
 	var (
-		claimed bool
-		output  *CompleteOutput
+		claimed            bool
+		output             *CompleteOutput
+		validationRejected bool
 	)
 	err = g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) error {
 		claimResult, claimErr := tx.Ctx(ctx).Model(dao.BatchMain.Table()).
@@ -153,6 +159,7 @@ func handleAsyncMessage(ctx context.Context, message AsyncMessage) error {
 		var executeErr error
 		output, executeErr = processor.ExecutePending(ctx, tx, message.BatchNo, param, rows, operator, requiredSource)
 		if executeErr != nil {
+			validationRejected = errors.Is(executeErr, errOutboundValidationRejected)
 			return executeErr
 		}
 		if _, updateErr := tx.Ctx(ctx).Model(dao.BatchMain.Table()).Where(dao.BatchMain.Columns().BatchNo, message.BatchNo).Data(do.BatchMain{
@@ -169,6 +176,9 @@ func handleAsyncMessage(ctx context.Context, message AsyncMessage) error {
 		return nil
 	})
 	if err != nil {
+		if validationRejected {
+			return markAsyncValidationFailed(ctx, message.BatchNo, main.TenantId, rows, err)
+		}
 		return markAsyncFailed(ctx, message.BatchNo, err)
 	}
 	if !claimed {
@@ -186,6 +196,43 @@ func handleAsyncMessage(ctx context.Context, message AsyncMessage) error {
 	return nil
 }
 
+func markAsyncValidationFailed(ctx context.Context, batchNo, tenantID string, rows []*Row, cause error) error {
+	validCount, failCount := 0, 0
+	for _, row := range rows {
+		if row == nil {
+			continue
+		}
+		if row.Reason == outboundNotExecutedReason {
+			validCount++
+		} else {
+			failCount++
+		}
+	}
+	return g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) error {
+		for _, row := range rows {
+			if row == nil {
+				continue
+			}
+			status := consts.BatchDetailStatusFailed
+			if row.Reason == outboundNotExecutedReason {
+				status = consts.BatchDetailStatusNotExecuted
+			}
+			if _, err := tx.Ctx(ctx).Model(dao.BatchDetail.Table()).
+				Where(dao.BatchDetail.Columns().BatchNo, batchNo).
+				Where(dao.BatchDetail.Columns().TenantId, tenantID).
+				Where(dao.BatchDetail.Columns().RowNo, row.RowNo).
+				Data(do.BatchDetail{DetailStatus: status, ErrorReason: row.Reason}).Update(); err != nil {
+				return gerror.Wrap(err, "保存出库校验明细失败")
+			}
+		}
+		_, err := tx.Ctx(ctx).Model(dao.BatchMain.Table()).
+			Where(dao.BatchMain.Columns().BatchNo, batchNo).
+			Where(dao.BatchMain.Columns().TenantId, tenantID).
+			Data(do.BatchMain{BatchAsyncStatus: consts.BatchAsyncStatusFailed, RunResult: consts.BatchRunResultFailed, ValidCount: validCount, SuccessCount: 0, FailCount: failCount, FailReason: asyncFailureReason(cause), EndTime: gtime.Now()}).Update()
+		return gerror.Wrap(err, "保存出库校验结果失败")
+	})
+}
+
 func markAsyncFailed(ctx context.Context, batchNo string, err error) error {
 	reason := asyncFailureReason(err)
 	if _, updateErr := g.DB().Model(dao.BatchMain.Table()).Ctx(ctx).Where(dao.BatchMain.Columns().BatchNo, batchNo).Data(do.BatchMain{