feat(csmanualentry): 手动录单支持收号出号分组
- 录单记录新增组别(收号/出号),唯一约束放宽为编号+组别,同一编号两组各可登记一次 - 操作人选项支持组别标记,录单选中后自动带出组别 - 列表新增组别列与筛选,今日统计按收号/出号分列
This commit is contained in:
@@ -46,8 +46,9 @@ func (h *Handler) List(c *gin.Context) {
|
||||
}
|
||||
page, pageSize := parsePagination(c)
|
||||
query := ListQuery{
|
||||
EntryNo: strings.TrimSpace(c.Query("entry_no")),
|
||||
Keyword: strings.TrimSpace(c.Query("keyword")),
|
||||
EntryNo: strings.TrimSpace(c.Query("entry_no")),
|
||||
EntryGroup: strings.TrimSpace(c.Query("entry_group")),
|
||||
Keyword: strings.TrimSpace(c.Query("keyword")),
|
||||
StartDate: strings.TrimSpace(c.Query("start_date")),
|
||||
EndDate: strings.TrimSpace(c.Query("end_date")),
|
||||
Page: page,
|
||||
@@ -233,7 +234,9 @@ func writeManualEntryError(c *gin.Context, err error) {
|
||||
case errors.Is(err, ErrEntryNotFound):
|
||||
response.NotFound(c, "录单记录不存在")
|
||||
case errors.Is(err, ErrEntryNoExists):
|
||||
response.Error(c, http.StatusConflict, "entry_no_exists", "该编号已被登记")
|
||||
response.Error(c, http.StatusConflict, "entry_no_exists", "该编号在当前组别下已被登记")
|
||||
case errors.Is(err, ErrEntryGroupInvalid):
|
||||
response.BadRequest(c, "组别不正确,仅支持收号或出号")
|
||||
case errors.Is(err, ErrOptionTypeInvalid):
|
||||
response.BadRequest(c, "选项类型不正确")
|
||||
case errors.Is(err, ErrOptionNameInvalid):
|
||||
|
||||
Reference in New Issue
Block a user