添加批量创建工单和批量取消工单的功能

services/om/SerialOrder.service.go

@@ -382,7 +382,7 @@ type SerialOrderService interface {
 	 * @Date                     : 2021-11-25
 	 *
 	 ******************************************************************************/
-	GenerateCraftData(user *global.User, serialOrderId string) error
+	//GenerateCraftData(user *global.User, serialOrderId string) error
 	/******************************************************************************
 	 *
 	 * @Function Name            : GenerateCraftDataByCustOrder
@@ -514,6 +514,7 @@ type SerialOrderService interface {
 	CreateBatchSerialOrder(user *global.User, productId string, projectId string, workLineId string, qty int, preSchKey int, priority int) error
 	TraceSubArticleBatch(user *global.User, barcode string, paging *grmi.Paging) (grmi.PagingResult, error)
 	ExportTraceSubArticleBatch(user *global.User, barcode string) (string, error)
+	CancelMultiSerialOrder(user *global.User, serialOrderIdLi []string) error
 }
 
 /******************************************************************************

web/controllers/om/SerialOrder.rest.go

@@ -1241,4 +1241,33 @@ func RegisterExportTraceArticleBatch(party router.Party, path string, method fun
 		}
 		supports.Ok(ctx, supports.OptionSuccess, result)
 	})
-}
+}
+
+// RegisterCancelMultiSerialOrder 批量取消工单
+func RegisterCancelMultiSerialOrder(party router.Party, path string, method func(user *global.User, serialOrderIdLi []string) error) {
+
+	party.Post(path, func(ctx iris.Context) {
+		user, ok := jwts.ParseToken(ctx)
+		if !ok {
+			return
+		}
+		type Req struct {
+			SerialOrderIdLi []string `json:"serialOrderIdLi"`
+		}
+		var data Req
+		if err := ctx.ReadJSON(&data); err != nil {
+			supports.Error(ctx, iris.StatusBadRequest, err.Error(), nil)
+			return
+		}
+		if len(data.SerialOrderIdLi) == 0 {
+			supports.Error(ctx, iris.StatusBadRequest, "未获取到工单条码", nil)
+			return
+		}
+		err := method(user, data.SerialOrderIdLi)
+		if err != nil {
+			supports.Error(ctx, iris.StatusBadRequest, err.Error(), nil)
+			return
+		}
+		supports.Ok(ctx, supports.OptionSuccess, nil)
+	})
+}

web/controllers/om/om.go

@@ -212,7 +212,7 @@ func RegisterRoutes() {
 		// SerialOrder 修改排序队列中内部订单的调用Key
 		RegisterChangeOrderSchedKey(serialorder, "/changeschedkey", serviceOfSerialOrder.ChangeOrderSchedKey)
 		// SerialOrder 生成serialOrder工艺数据
-		RegisterGenerateSerialOrderCraft(serialorder, "/generatecraft", serviceOfSerialOrder.GenerateCraftData)
+		//RegisterGenerateSerialOrderCraft(serialorder, "/generatecraft", serviceOfSerialOrder.GenerateCraftData)
 		// SerialOrder 派工已锁定的内部订单
 		RegisterReleaseSerialOrder(serialorder, "/release", serviceOfSerialOrder.ReleaseSerialOrder)
 		// SerialOrder 查询工单操作数据
@@ -229,6 +229,8 @@ func RegisterRoutes() {
 		RegisterTraceArticleBatch(serialorder, "/tracebatch", serviceOfSerialOrder.TraceSubArticleBatch)
 		// serialOrder 导出物料批次查询结果
 		RegisterExportTraceArticleBatch(serialorder, "/exporttracebatch", serviceOfSerialOrder.ExportTraceSubArticleBatch)
+		// serialOrder 批量取消工单
+		RegisterCancelMultiSerialOrder(serialorder, "/multicancel", serviceOfSerialOrder.CancelMultiSerialOrder)
 
 		// SerialOrderStatus的路由组
 		serialorderstatus := party.Party("/serialorderstatus")