Procházet zdrojové kódy

order: 工单调整

ping před 7 měsíci
rodič
revize
f889dca633

+ 2 - 2
http/handler/goods/drugs.go

@@ -16,7 +16,7 @@ import (
 func DrugsList(c *gin.Context) {
 	var req pasturePb.SearchDrugsRequest
 	if err := ginutil.BindProto(c, &req); err != nil {
-		apierr.AbortBadRequest(c, http.StatusOK, err)
+		apierr.AbortBadRequest(c, http.StatusBadRequest, err)
 		return
 	}
 
@@ -71,7 +71,7 @@ func DrugsCreateOrUpdate(c *gin.Context) {
 func MedicalEquipmentList(c *gin.Context) {
 	var req pasturePb.SearchMedicalEquipmentRequest
 	if err := ginutil.BindProto(c, &req); err != nil {
-		apierr.AbortBadRequest(c, http.StatusOK, err)
+		apierr.AbortBadRequest(c, http.StatusBadRequest, err)
 		return
 	}
 

+ 1 - 1
http/handler/system/dept.go

@@ -18,7 +18,7 @@ import (
 func DeptList(c *gin.Context) {
 	var req pasturePb.SearchDeptRequest
 	if err := ginutil.BindProto(c, &req); err != nil {
-		apierr.AbortBadRequest(c, http.StatusOK, err)
+		apierr.AbortBadRequest(c, http.StatusBadRequest, err)
 		return
 	}
 

+ 47 - 1
http/handler/work/order.go

@@ -1,10 +1,14 @@
 package work
 
 import (
+	"encoding/json"
+	"fmt"
 	"kpt-pasture/http/middleware"
 	"net/http"
+	"time"
 
 	pasturePb "gitee.com/xuyiping_admin/go_proto/proto/go/backend/cow"
+	operationPb "gitee.com/xuyiping_admin/go_proto/proto/go/backend/operation"
 	"gitee.com/xuyiping_admin/pkg/apierr"
 	"gitee.com/xuyiping_admin/pkg/ginutil"
 	"github.com/gin-gonic/gin"
@@ -13,7 +17,7 @@ import (
 func OrderList(c *gin.Context) {
 	var req pasturePb.SearchWorkOrderRequest
 	if err := ginutil.BindProto(c, &req); err != nil {
-		apierr.AbortBadRequest(c, http.StatusOK, err)
+		apierr.AbortBadRequest(c, http.StatusBadRequest, err)
 		return
 	}
 
@@ -30,3 +34,45 @@ func OrderList(c *gin.Context) {
 	}
 	ginutil.JSONResp(c, res)
 }
+
+func OrderCreateOrUpdate(c *gin.Context) {
+	files, err := c.MultipartForm()
+	if err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "MultipartForm"})
+		return
+	}
+	b, _ := json.Marshal(files.Value)
+	fmt.Println("===Value====", string(b))
+	fileHeaders := files.File["photos"] // 注意这里使用 "files[]" 作为 key,与前端匹配
+	// 验证文件数量
+	if len(fileHeaders) == 0 {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "No files selected"})
+		return
+	}
+
+	// 处理每个文件
+	for i, file := range fileHeaders {
+		if err = c.SaveUploadedFile(file, fmt.Sprintf("%d_%d_%s", i+1, time.Now().Unix(), file.Filename)); err != nil {
+			fmt.Println("===SaveUploadedFile==", err, i)
+		}
+	}
+
+	/*if err := valid.ValidateStruct(&req,
+		valid.Field(&req.Name, valid.Required),
+		valid.Field(&req.CategoryId, valid.Required),
+	); err != nil {
+		apierr.AbortBadRequest(c, http.StatusBadRequest, err)
+		return
+	}
+
+	if err := middleware.BackendOperation(c).OpsService.OrderCreateOrUpdate(c, &req); err != nil {
+		apierr.ClassifiedAbort(c, err)
+		return
+	}*/
+
+	ginutil.JSONResp(c, &operationPb.CommonOK{
+		Code: http.StatusOK,
+		Msg:  "ok",
+		Data: &operationPb.Success{Success: true},
+	})
+}

+ 1 - 2
http/route/work_order.go

@@ -1,7 +1,6 @@
 package route
 
 import (
-	"kpt-pasture/http/handler/goods"
 	"kpt-pasture/http/handler/work"
 
 	"github.com/gin-gonic/gin"
@@ -15,6 +14,6 @@ func WorkOrderAPI(opts ...func(engine *gin.Engine)) func(s *gin.Engine) {
 		// goods API 组  物品管理
 		workRoute := authRouteGroup(s, "/api/v1/work/")
 		workRoute.POST("/order/list", work.OrderList)
-		workRoute.POST("/order/createOrUpdate", goods.DrugsCreateOrUpdate)
+		workRoute.POST("/order/createOrUpdate", work.OrderCreateOrUpdate)
 	}
 }

+ 1 - 0
module/backend/interface.go

@@ -191,4 +191,5 @@ type DashboardService interface {
 //go:generate mockgen -destination mock/WorkService.go -package kptservicemock kpt-pasture/module/backend WorkService
 type WorkService interface {
 	OrderList(ctx context.Context, req *pasturePb.SearchWorkOrderRequest, pagination *pasturePb.PaginationModel) (*pasturePb.SearchWorkOrderResponse, error)
+	OrderCreateOrUpdate(ctx context.Context, req *pasturePb.WorkOrderList) error
 }

+ 4 - 0
module/backend/work.go

@@ -21,3 +21,7 @@ func (s *StoreEntry) OrderList(ctx context.Context, req *pasturePb.SearchWorkOrd
 		},
 	}, nil
 }
+
+func (s *StoreEntry) OrderCreateOrUpdate(ctx context.Context, req *pasturePb.WorkOrderList) error {
+	return nil
+}