feat: 大屏多订单改为同屏并列展示,物料申请新增跨工位借料来源并移除工单完成日期
This commit is contained in:
@@ -31,8 +31,6 @@ type WorkOrderReq struct {
|
||||
ContractNo string `json:"contractNo"`
|
||||
OwnershipType string `json:"ownershipType"` // workorder=合同号/project=科技项目号/other=其他
|
||||
ProductSerial string `json:"productSerial"`
|
||||
// 完成日期(必填,前端强制;yyyy-MM-dd)
|
||||
DueDate string `json:"dueDate"`
|
||||
// 工艺组合(唯一路线源头):[{flowId,stationNo}],工位号即顺序号,按工位号升序执行、可跳过未选工位
|
||||
FlowCombination []map[string]int `json:"flowCombination"`
|
||||
// 来源产品工艺(2026-10-09):建单选产品时带出默认产品工艺并自动填组合;
|
||||
@@ -125,12 +123,6 @@ func (s *Service) CreateWorkOrder(ctx context.Context, req WorkOrderReq, operato
|
||||
wo, _ = client.WorkOrder.UpdateOneID(wo.ID).SetPlanEnd(t).Save(ctx)
|
||||
}
|
||||
}
|
||||
// 完成日期(Item M):前端必填,后端有值即落库
|
||||
if req.DueDate != "" {
|
||||
if t, err := parseDate(req.DueDate); err == nil {
|
||||
wo, _ = client.WorkOrder.UpdateOneID(wo.ID).SetDueDate(t).Save(ctx)
|
||||
}
|
||||
}
|
||||
// 工艺组合(唯一路线源头):收集式校验已通过,此处直接写入
|
||||
if len(comboItems) > 0 {
|
||||
if _, err := client.WorkOrder.UpdateOneID(wo.ID).SetFlowCombination(flowItemsToMaps(comboItems)).Save(ctx); err != nil {
|
||||
@@ -308,11 +300,6 @@ func (s *Service) UpdateWorkOrder(ctx context.Context, req WorkOrderReq, operato
|
||||
u.SetPlanEnd(t)
|
||||
}
|
||||
}
|
||||
if req.DueDate != "" {
|
||||
if t, err := parseDate(req.DueDate); err == nil {
|
||||
u.SetDueDate(t)
|
||||
}
|
||||
}
|
||||
if err := u.Exec(ctx); err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -328,7 +315,7 @@ func (s *Service) UpdateWorkOrder(ctx context.Context, req WorkOrderReq, operato
|
||||
// 工程编号查询已随编号体系改造移除,字段保留仅防历史迁移)。
|
||||
// keyword:跨字段模糊(工单号/产品编码/产品名称/合同号 任一命中),供下拉远程搜索用;
|
||||
// limit:>0 时启用截断(封顶 200),仅下拉搜索场景传参,列表页不传=全量,行为向后兼容。
|
||||
func (s *Service) ListWorkOrders(ctx context.Context, orderNo, status, productCode, productName, contractNo, ownershipType, dueFrom, dueTo, keyword string, limit int) ([]*ent.WorkOrder, error) {
|
||||
func (s *Service) ListWorkOrders(ctx context.Context, orderNo, status, productCode, productName, contractNo, ownershipType, keyword string, limit int) ([]*ent.WorkOrder, error) {
|
||||
q := s.ctx.EntClient.WorkOrder.Query()
|
||||
if orderNo != "" {
|
||||
q = q.Where(workorder.WorkOrderNoContainsFold(orderNo))
|
||||
@@ -348,17 +335,6 @@ func (s *Service) ListWorkOrders(ctx context.Context, orderNo, status, productCo
|
||||
if ownershipType != "" {
|
||||
q = q.Where(workorder.OwnershipType(ownershipType))
|
||||
}
|
||||
// 完成日期范围(Item M)
|
||||
if dueFrom != "" {
|
||||
if t, err := parseDate(dueFrom); err == nil {
|
||||
q = q.Where(workorder.DueDateGTE(t))
|
||||
}
|
||||
}
|
||||
if dueTo != "" {
|
||||
if t, err := parseDate(dueTo); err == nil {
|
||||
q = q.Where(workorder.DueDateLTE(t))
|
||||
}
|
||||
}
|
||||
// keyword 跨字段模糊(下拉远程搜索):工单号/产品编码/产品名称/合同号 任一命中
|
||||
if keyword != "" {
|
||||
kw := workorder.Or(
|
||||
|
||||
Reference in New Issue
Block a user