Merge branch '20240407'

zhangqian

2024-04-16 c6db2fc2c1822b97aa475db871ae460e0fb1b431

 controllers/operation.go

@@ -1103,7 +1103,10 @@
   }

   db := mysqlx.GetDB().Table("wms_operation").
      Select("wms_operation.id as operation_id,wms_operation.number,wms_operation.base_operation_type,material.id AS product_id,material.`name` AS product_name,wms_operation_details.amount,material.unit,wms_operation_details.from_location_id,from_location.`name` AS from_location,wms_operation_details.to_location_id,to_location.`name` AS to_location,wms_operation.operation_date as date,wms_operation.`status`").
      Select("wms_operation.id as operation_id,wms_operation.number,wms_operation.base_operation_type,material.id AS product_id," +
         "material.`name` AS product_name,wms_operation_details.amount,material.unit,wms_operation_details.from_location_id," +
         "from_location.`name` AS from_location,wms_operation_details.to_location_id,to_location.`name` AS to_location," +
         "wms_operation.operation_date as date,wms_operation.`status`,material.weight,wms_operation.operation_type_name").
      InnerJoins("inner join wms_operation_details ON wms_operation_details.operation_id = wms_operation.id").
      InnerJoins("INNER JOIN material ON material.id = wms_operation_details.product_id").
      InnerJoins("INNER JOIN wms_location AS from_location ON from_location.id = wms_operation_details.from_location_id").
@@ -1127,3 +1130,21 @@
   }
   util.ResponseFormatListWithPage(c, code.Success, records, int(total), params.Page, params.PageSize)
}

// GetPersonnelList
// @Tags      入库/出库
// @Summary   获取人员列表
// @Produce   application/json
// @Param     object  body  request.OperationCondition true  "参数"
// @Success   200 {object} util.ResponseList{data=[]inventory_order.WorkerInfo} "成功"
// @Router    /api-wms/v1/operation/getPersonnelList [get]
func (slf OperationController) GetPersonnelList(c *gin.Context) {
   cli := inventory_order.NewInventoryOrderServiceClient(init_client.ApsConn)
   list, err := cli.GetWorkerList(context.Background(), &inventory_order.GetWorkerListRequest{})
   if err != nil {
      util.ResponseFormat(c, code.RequestParamError, "内部错误")
      logx.Error("grpc调用失败, GetPersonnelList err : " + err.Error())
      return
   }
   util.ResponseFormat(c, code.Success, list.List)
}